summaryrefslogtreecommitdiff
path: root/source4/lib/charset
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-03 23:33:22 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:55 +0100
commit509e82e402d64c79f27c9a10d75b100a1ac5fefa (patch)
treea7770d609512848c17f413764e9dc0bd43acce5d /source4/lib/charset
parentda0f222f432c4fc8bf5da80baf849ca32b315ca0 (diff)
downloadsamba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.tar.gz
samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.tar.bz2
samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.zip
r26272: Remove global_loadparm in some more places.
(This used to be commit 1ab76ecc5311fa863e5d04899b6f110899818f55)
Diffstat (limited to 'source4/lib/charset')
-rw-r--r--source4/lib/charset/charcnv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c
index 804358d06b..6bb72af8e1 100644
--- a/source4/lib/charset/charcnv.c
+++ b/source4/lib/charset/charcnv.c
@@ -274,7 +274,8 @@ _PUBLIC_ ssize_t convert_string_talloc(TALLOC_CTX *ctx, charset_t from, charset_
if (descriptor == (smb_iconv_t)-1 || descriptor == (smb_iconv_t)0) {
/* conversion not supported, return -1*/
DEBUG(3, ("convert_string_talloc: conversion from %s to %s not supported!\n",
- charset_name(global_loadparm, from), charset_name(global_loadparm, to)));
+ charset_name(global_loadparm, from),
+ charset_name(global_loadparm, to)));
return -1;
}