diff options
| author | Volker Lendecke <vl@samba.org> | 2010-09-25 14:59:42 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-09-25 15:01:29 -0700 |
| commit | a0d3ffbf924cf203fc8dc765954823375645f0b7 (patch) | |
| tree | 7c7301bdc2ac874921f64f83daf1c8bffae1b15b /source3/registry | |
| parent | 0a18f89e8a1599bae4ac96b6f3ab358797881ef7 (diff) | |
| download | samba-a0d3ffbf924cf203fc8dc765954823375645f0b7.tar.gz samba-a0d3ffbf924cf203fc8dc765954823375645f0b7.tar.bz2 samba-a0d3ffbf924cf203fc8dc765954823375645f0b7.zip | |
s3: Fix some 64-bit warnings
Diffstat (limited to 'source3/registry')
| -rw-r--r-- | source3/registry/reg_parse.c | 7 | ||||
| -rw-r--r-- | source3/registry/reg_parse_internal.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c index 388eecdce8..2fcdb41534 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 3d3cf472f4..4734662302 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; } |