diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-28 13:40:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:55 -0500 |
| commit | ba6d5fcb97b9831dddf7dfe09fb02fbb23d864b4 (patch) | |
| tree | d0c75ce4b6f66580bbabdcc82e4d930bd05d9a0a /source4/torture/local/iconv.c | |
| parent | a6ae640313a47ac2950c0948e4385fa934a5ef09 (diff) | |
| download | samba-ba6d5fcb97b9831dddf7dfe09fb02fbb23d864b4.tar.gz samba-ba6d5fcb97b9831dddf7dfe09fb02fbb23d864b4.tar.bz2 samba-ba6d5fcb97b9831dddf7dfe09fb02fbb23d864b4.zip | |
r3324: made the smbtorture code completely warning free
(This used to be commit 7067bb9b52223cafa28470f264f0b60646a07a01)
Diffstat (limited to 'source4/torture/local/iconv.c')
| -rw-r--r-- | source4/torture/local/iconv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c index 606ac3da5d..2c2a9564bf 100644 --- a/source4/torture/local/iconv.c +++ b/source4/torture/local/iconv.c @@ -158,7 +158,7 @@ static int test_buffer(uint8_t *inbuf, size_t size, const char *charset) memset(ptr_out, 0, outsize2); errno = 0; - ret2 = iconv(cd, &ptr_in, &size_in2, &ptr_out, &outsize2); + ret2 = iconv(cd, discard_const_p(char *, &ptr_in), &size_in2, &ptr_out, &outsize2); errno2 = errno; len1 = sizeof(buf1) - outsize1; @@ -293,7 +293,7 @@ static int test_codepoint(unsigned int codepoint) return 1; } -BOOL torture_local_iconv(int dummy) +BOOL torture_local_iconv(void) { size_t size; unsigned char inbuf[1000]; @@ -351,7 +351,7 @@ BOOL torture_local_iconv(int dummy) #else -BOOL torture_local_iconv(int dummy) +BOOL torture_local_iconv(void) { printf("No native iconv library - can't run iconv test\n"); return True; |