summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 01:18:56 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 01:18:56 +0200
commit420781bf46a036bcf308eaa6390bd07ab18be7b1 (patch)
tree10cbc820a0440b4b9e9fd85170545a4a40686644
parent09a63accb8863a883ef8aba3a44776ac92ae5764 (diff)
downloadsamba-420781bf46a036bcf308eaa6390bd07ab18be7b1.tar.gz
samba-420781bf46a036bcf308eaa6390bd07ab18be7b1.tar.bz2
samba-420781bf46a036bcf308eaa6390bd07ab18be7b1.zip
Remove unnecessary include, improve function name.
-rw-r--r--lib/util/charset/charcnv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 3e384304cf..35119e5395 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -22,7 +22,6 @@
*/
#include "includes.h"
#include "system/iconv.h"
-#include "param/param.h"
/**
* @file
@@ -66,7 +65,7 @@ static const char *charset_name(struct smb_iconv_convenience *ic, charset_t ch)
/**
re-initialize iconv conversion descriptors
**/
-static int close_iconv(struct smb_iconv_convenience *data)
+static int close_iconv_convenience(struct smb_iconv_convenience *data)
{
unsigned c1, c2;
for (c1=0;c1<NUM_CHARSETS;c1++) {
@@ -95,7 +94,7 @@ _PUBLIC_ struct smb_iconv_convenience *smb_iconv_convenience_init(TALLOC_CTX *me
return NULL;
}
- talloc_set_destructor(ret, close_iconv);
+ talloc_set_destructor(ret, close_iconv_convenience);
ret->dos_charset = talloc_strdup(ret, dos_charset);
ret->unix_charset = talloc_strdup(ret, unix_charset);