[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  a0d3ffb s3: Fix some 64-bit warnings
      from  0a18f89 pyteven: Fix build warnings.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a0d3ffbf924cf203fc8dc765954823375645f0b7
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Sep 25 14:59:42 2010 -0700

    s3: Fix some 64-bit warnings

-----------------------------------------------------------------------

Summary of changes:
 source3/registry/reg_parse.c          |    7 ++++---
 source3/registry/reg_parse_internal.c |    3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c
index 388eecd..2fcdb41 100644
--- a/source3/registry/reg_parse.c
+++ b/source3/registry/reg_parse.c
@@ -587,7 +587,7 @@ int reg_parse_line(struct reg_parse* parser, const char* line)
 			DEBUG(0, ("value \"%s\" parse error"
 				  "at line: %i pos: %li : %s",
 				  cbuf_gets(parser->valname, 0), parser->linenum,
-				  pos-line, pos));
+				  (long int)(pos-line), pos));
 			return -3;
 		}
 	}
@@ -602,7 +602,7 @@ done:
 
 	if (!srprs_skipws(&pos) || !srprs_eol(&pos, NULL)) {
 		DEBUG(0, ("trailing garbage at line: %i pos: %li : %s\n",
-			  parser->linenum, pos-line, pos));
+			  parser->linenum, (long int)(pos-line), pos));
 		return -1;
 	}
 	return 0;
@@ -789,7 +789,8 @@ handle_iconv_errno(int err, const char* obuf, size_t linenum,
 	if (pos == *optr) {
 		pos = MAX(obuf, *optr-60);
 	}
-	DEBUG(0, ("Illegal multibyte sequence at line %lu: %s", linenum+1, pos));
+	DEBUG(0, ("Illegal multibyte sequence at line %lu: %s",
+		  (long unsigned)(linenum+1), pos));
 
 	assert(ilen > 0);
 	do {
diff --git a/source3/registry/reg_parse_internal.c b/source3/registry/reg_parse_internal.c
index 3d3cf47..4734662 100644
--- a/source3/registry/reg_parse_internal.c
+++ b/source3/registry/reg_parse_internal.c
@@ -79,7 +79,8 @@ convert:
 			reason="Illegal multibyte sequence";
 			break;
 		}
-		DEBUG(0,("Conversion error: %s(%.80s) %li\n", reason, iptr, iptr-src));
+		DEBUG(0,("Conversion error: %s(%.80s) %li\n", reason, iptr,
+			 (long int)(iptr-src)));
 		talloc_free(dst);
 		return -1;
 	}


-- 
Samba Shared Repository