summaryrefslogtreecommitdiff
path: root/lib/util/charset
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-09 10:49:49 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-10 16:45:11 +1100
commit983d205486d4f2c518fbe02ef92b8884f5c9f2dc (patch)
tree2bfd879023529795d4e1e312a1943116aeb1bf93 /lib/util/charset
parent88298f97aea570c4a6c976c8fc1a6c2f61a0f2fb (diff)
downloadsamba-983d205486d4f2c518fbe02ef92b8884f5c9f2dc.tar.gz
samba-983d205486d4f2c518fbe02ef92b8884f5c9f2dc.tar.bz2
samba-983d205486d4f2c518fbe02ef92b8884f5c9f2dc.zip
charset: Remove unused iconv_talloc()
Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html Andrew Bartlett
Diffstat (limited to 'lib/util/charset')
-rw-r--r--lib/util/charset/charcnv.c114
-rw-r--r--lib/util/charset/charset.h5
-rw-r--r--lib/util/charset/wscript_build2
3 files changed, 1 insertions, 120 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
deleted file mode 100644
index ba083102a3..0000000000
--- a/lib/util/charset/charcnv.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Character set conversion Extensions
- Copyright (C) Igor Vergeichik <iverg@mail.ru> 2001
- Copyright (C) Andrew Tridgell 2001
- Copyright (C) Simo Sorce 2001
- Copyright (C) Jelmer Vernooij 2007
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-*/
-#include "includes.h"
-#include "system/iconv.h"
-
-/**
- * @file
- *
- * @brief Character-set conversion routines built on our iconv.
- *
- * @note Samba's internal character set (at least in the 3.0 series)
- * is always the same as the one for the Unix filesystem. It is
- * <b>not</b> necessarily UTF-8 and may be different on machines that
- * need i18n filenames to be compatible with Unix software. It does
- * have to be a superset of ASCII. All multibyte sequences must start
- * with a byte with the high bit set.
- *
- * @sa lib/iconv.c
- */
-
-/**
- * Convert string from one encoding to another, making error checking etc
- *
- * @param mem_ctx Memory context
- * @param cd Iconv handle
- * @param src pointer to source string (multibyte or singlebyte)
- * @param srclen length of the source string in bytes
- * @param dest pointer to destination string (multibyte or singlebyte)
- * @param destlen maximal length allowed for string
- * @returns the number of bytes occupied in the destination
- **/
-_PUBLIC_ ssize_t iconv_talloc(TALLOC_CTX *ctx,
- smb_iconv_t cd,
- void const *src, size_t srclen,
- void *dst)
-{
- size_t i_len, o_len, destlen;
- void **dest = (void **)dst;
- size_t retval;
- const char *inbuf = (const char *)src;
- char *outbuf, *ob;
-
- *dest = NULL;
-
- /* it is _very_ rare that a conversion increases the size by
- more than 3x */
- destlen = srclen;
- outbuf = NULL;
-convert:
- destlen = 2 + (destlen*3);
- ob = talloc_realloc(ctx, outbuf, char, destlen);
- if (!ob) {
- DEBUG(0, ("iconv_talloc: realloc failed!\n"));
- talloc_free(outbuf);
- return (size_t)-1;
- } else {
- outbuf = ob;
- }
-
- /* we give iconv 2 less bytes to allow us to terminate at the
- end */
- i_len = srclen;
- o_len = destlen-2;
- retval = smb_iconv(cd,
- &inbuf, &i_len,
- &outbuf, &o_len);
- if(retval == (size_t)-1) {
- const char *reason="unknown error";
- switch(errno) {
- case EINVAL:
- reason="Incomplete multibyte sequence";
- break;
- case E2BIG:
- goto convert;
- case EILSEQ:
- reason="Illegal multibyte sequence";
- break;
- }
- DEBUG(0,("Conversion error: %s - ",reason));
- dump_data(0, (const uint8_t *) inbuf, i_len);
- talloc_free(ob);
- return (size_t)-1;
- }
-
- destlen = (destlen-2) - o_len;
-
- /* guarantee null termination in all charsets */
- SSVAL(ob, destlen, 0);
-
- *dest = ob;
-
- return destlen;
-
-}
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index d731ad1821..a2c4a82a73 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -161,11 +161,6 @@ bool convert_string_error(charset_t from, charset_t to,
void *dest, size_t destlen,
size_t *converted_size);
-ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
- smb_iconv_t cd,
- void const *src, size_t srclen,
- void *dest);
-
extern struct smb_iconv_handle *global_iconv_handle;
struct smb_iconv_handle *get_iconv_handle(void);
struct smb_iconv_handle *get_iconv_testing_handle(TALLOC_CTX *mem_ctx,
diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index 621fed6c0e..a3728f6a4b 100644
--- a/lib/util/charset/wscript_build
+++ b/lib/util/charset/wscript_build
@@ -6,6 +6,6 @@ bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER',
bld.SAMBA_SUBSYSTEM('charset',
public_headers='charset.h',
- source='codepoints.c convert_string.c util_str.c util_unistr_w.c charcnv.c pull_push.c util_unistr.c weird.c charset_macosxfs.c',
+ source='codepoints.c convert_string.c util_str.c util_unistr_w.c pull_push.c util_unistr.c weird.c charset_macosxfs.c',
deps='DYNCONFIG ICONV_WRAPPER',
public_deps='talloc')