summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-26 01:41:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:15 -0500
commit9cafc0d07ed339b511abf0f6fd41c289d2815974 (patch)
tree4a7581f2ac55c011d9e561957053157ccb956fa8
parent38aa97445769c6f1c54d59731b5a0edef91e41b0 (diff)
downloadsamba-9cafc0d07ed339b511abf0f6fd41c289d2815974.tar.gz
samba-9cafc0d07ed339b511abf0f6fd41c289d2815974.tar.bz2
samba-9cafc0d07ed339b511abf0f6fd41c289d2815974.zip
r2642: smb_iconv_t is a pointer, so checks against -1 errors should use a cast
(This used to be commit 28dcd2202948b003f8d13951395baa4a722593f4)
-rw-r--r--source4/lib/charcnv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/charcnv.c b/source4/lib/charcnv.c
index 3a3d470f99..2ee2bd9bae 100644
--- a/source4/lib/charcnv.c
+++ b/source4/lib/charcnv.c
@@ -97,7 +97,7 @@ void init_iconv(void)
for (c1=0;c1<NUM_CHARSETS;c1++) {
for (c2=0;c2<NUM_CHARSETS;c2++) {
if (conv_handles[c1][c2] != NULL) {
- if (conv_handles[c1][c2] != -1) {
+ if (conv_handles[c1][c2] != (smb_iconv_t)-1) {
smb_iconv_close(conv_handles[c1][c2]);
}
conv_handles[c1][c2] = NULL;