summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-07-06 00:14:56 +0000
committerAndrew Tridgell <tridge@samba.org>2001-07-06 00:14:56 +0000
commit9a0397cf698496cfbad42201eef96de21ecb7804 (patch)
tree1277a9033cf1e0fa088372c84da478a8dbfcea0b
parentaa91def29f54a466c7c7efbc8cf442b7a9759afa (diff)
downloadsamba-9a0397cf698496cfbad42201eef96de21ecb7804.tar.gz
samba-9a0397cf698496cfbad42201eef96de21ecb7804.tar.bz2
samba-9a0397cf698496cfbad42201eef96de21ecb7804.zip
added some comments and removed an unnecessary check
(This used to be commit 25c4b3f19315bdef57041da79c12271b72015701)
-rw-r--r--source3/lib/iconv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 07d42eed8f..0c722e71dd 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -75,8 +75,6 @@ size_t smb_iconv(smb_iconv_t cd,
}
#endif
- if (!inbuf || ! *inbuf || !outbuf || ! *outbuf) return 0;
-
/* in most cases we can go direct */
if (cd->direct) {
return cd->direct(inbuf, inbytesleft, outbuf, outbytesleft);
@@ -117,6 +115,7 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
if (!charsets[from].name || !charsets[to].name) {
#ifdef HAVE_NATIVE_ICONV
+ /* its not builtin - see if iconv() has it */
cd = iconv_open(tocode, fromcode);
if (!cd)
#endif
@@ -134,7 +133,7 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
memset(ret, 0, sizeof(*ret));
#ifdef HAVE_NATIVE_ICONV
- /* see if we wil be using the native iconv */
+ /* see if we will be using the native iconv */
if (cd) {
ret->cd = cd;
return ret;