summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2006-12-12 20:30:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:27 -0500
commit8b4669c3c512484d456f8e0a16e2fd8e7499b026 (patch)
treede745f55dbb942af1b5d3afb2f0e5e1cf60132dd /source3/lib
parentdc06fda6c7b87a3e2a8521269f4fca3f70969281 (diff)
downloadsamba-8b4669c3c512484d456f8e0a16e2fd8e7499b026.tar.gz
samba-8b4669c3c512484d456f8e0a16e2fd8e7499b026.tar.bz2
samba-8b4669c3c512484d456f8e0a16e2fd8e7499b026.zip
r20133: get rid of defined but not used warning - static function only used
inside the #ifdef HAVE_NATIVE_ICONV (This used to be commit 43ab1d2ba5eb24fc22f8d53c650bf39e95fb133b)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/iconv.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index c96243633f..6e040b77f1 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -128,6 +128,7 @@ static void lazy_initialize_iconv(void)
}
}
+#ifdef HAVE_NATIVE_ICONV
/* if there was an error then reset the internal state,
this ensures that we don't have a shift state remaining for
character sets like SJIS */
@@ -135,7 +136,6 @@ static size_t sys_iconv(void *cd,
const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
-#ifdef HAVE_NATIVE_ICONV
size_t ret = iconv((iconv_t)cd,
(char **)inbuf, inbytesleft,
outbuf, outbytesleft);
@@ -145,11 +145,8 @@ static size_t sys_iconv(void *cd,
errno = saved_errno;
}
return ret;
-#else
- errno = EINVAL;
- return -1;
-#endif
}
+#endif
/**
* This is a simple portable iconv() implementaion.