diff options
| author | Jeremy Allison <jra@samba.org> | 2008-02-15 09:35:18 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-02-15 09:35:18 -0800 |
| commit | 0e57795f86fafe541d826deb6d49e77e5644a024 (patch) | |
| tree | 9b663339dd634f0a6c6565422c2c1e5ccb06c3b8 /source3/torture/smbiconv.c | |
| parent | 4737a35ac81803275f2c1edc860a87f31d14f2eb (diff) | |
| parent | abdedc7940b187789ffc583dabc778f824039095 (diff) | |
| download | samba-0e57795f86fafe541d826deb6d49e77e5644a024.tar.gz samba-0e57795f86fafe541d826deb6d49e77e5644a024.tar.bz2 samba-0e57795f86fafe541d826deb6d49e77e5644a024.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 847874ca757ac8ca32082305c8caed5abc7fed1d)
Diffstat (limited to 'source3/torture/smbiconv.c')
| -rw-r--r-- | source3/torture/smbiconv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c index 05a8c3d815..72fbdc470f 100644 --- a/source3/torture/smbiconv.c +++ b/source3/torture/smbiconv.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#undef realloc static int process_block (smb_iconv_t cd, const char *addr, size_t len, FILE *output) @@ -85,7 +86,7 @@ incomplete character or shift sequence at end of buffer")); static int -process_fd (iconv_t cd, int fd, FILE *output) +process_fd (smb_iconv_t cd, int fd, FILE *output) { /* we have a problem with reading from a descriptor since we must not provide the iconv() function an incomplete character or shift @@ -167,8 +168,8 @@ process_fd (iconv_t cd, int fd, FILE *output) int main(int argc, char *argv[]) { const char *file = NULL; - char *from = ""; - char *to = ""; + const char *from = ""; + const char *to = ""; char *output = NULL; const char *preload_modules[] = {NULL, NULL}; FILE *out = stdout; @@ -213,7 +214,7 @@ int main(int argc, char *argv[]) } cd = smb_iconv_open(to, from); - if((int)cd == -1) { + if (cd == (smb_iconv_t)-1) { DEBUG(0,("unable to find from or to encoding, exiting...\n")); return 1; } |