Remove more global_loadparm instances, fix syntax errors.

3 files changed, 9 insertions, 9 deletions

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index f8b3f65548..21fc20b8c3 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -124,7 +124,7 @@ ssize_t convert_string(charset_t from, charset_t to,
 
 extern struct smb_iconv_convenience *global_iconv_convenience;
 
-_PUBLIC_ codepoint_t next_codepoint(const char *str, size_t *size);
+codepoint_t next_codepoint(const char *str, size_t *size);
 
 /* codepoints */
 codepoint_t next_codepoint_convenience(struct smb_iconv_convenience *ic, 
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index c90b675ded..86a76f831e 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -133,7 +133,7 @@ _PUBLIC_ int strncasecmp_m(const char *s1, const char *s2, size_t n)
 		n--;
 
 		c1 = next_codepoint_convenience(iconv_convenience, s1, &size1);
-		c2 = next_codepoint_convenienceconv_convenience, s2, &size2);
+		c2 = next_codepoint_convenience(iconv_convenience, s2, &size2);
 
 		s1 += size1;
 		s2 += size2;
@@ -272,7 +272,7 @@ _PUBLIC_ size_t strlen_m(const char *s)
 
 	while (*s) {
 		size_t c_size;
-		codepoint_t c = next_codepoint(ic, s, &c_size);
+		codepoint_t c = next_codepoint_convenience(ic, s, &c_size);
 		if (c < 0x10000) {
 			count += 1;
 		} else {
@@ -344,7 +344,7 @@ _PUBLIC_ char *strrchr_m(const char *s, char c)
 
 	while (*s) {
 		size_t size;
-		codepoint_t c2 = next_codepoint(ic, s, &size);
+		codepoint_t c2 = next_codepoint_convenience(ic, s, &size);
 		if (c2 == c) {
 			ret = discard_const_p(char, s);
 		}
@@ -466,7 +466,7 @@ _PUBLIC_ char *strupper_talloc_n(TALLOC_CTX *ctx, const char *src, size_t n)
 
 	while (*src && n--) {
 		size_t c_size;
-		codepoint_t c = next_codepoint(iconv_convenience, src, &c_size);
+		codepoint_t c = next_codepoint_convenience(iconv_convenience, src, &c_size);
 		src += c_size;
 
 		c = toupper_m(c);
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index e49c1776a3..3200482491 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -20,9 +20,9 @@
 #include "includes.h"
 #include <Python.h>
 #include "libcli/util/pyerrors.h"
+#include "scripting/python/modules.h"
 #include "../libcli/nbt/libnbt.h"
 #include "lib/events/events.h"
-#include "param/param.h"
 
 PyAPI_DATA(PyTypeObject) nbt_node_Type;
 
@@ -229,7 +229,7 @@ static PyObject *py_nbt_name_status(PyObject *self, PyObject *args, PyObject *kw
 		return NULL;
 	PyTuple_SetItem(ret, 0, PyString_FromString(io.out.reply_from));
 
-	py_name = PyObject_FromNBTName(node->socket, lp_iconv_convenience(global_loadparm), &io.out.name);
+	py_name = PyObject_FromNBTName(node->socket, py_iconv_convenience(NULL), &io.out.name);
 	if (py_name == NULL)
 		return NULL;
 
@@ -292,7 +292,7 @@ static PyObject *py_nbt_name_register(PyObject *self, PyObject *args, PyObject *
 		return NULL;
 	PyTuple_SetItem(ret, 0, PyString_FromString(io.out.reply_from));
 
-	py_name = PyObject_FromNBTName(node->socket, lp_iconv_convenience(global_loadparm), &io.out.name);
+	py_name = PyObject_FromNBTName(node->socket, py_iconv_convenience(NULL), &io.out.name);
 	if (py_name == NULL)
 		return NULL;
 
@@ -347,7 +347,7 @@ static PyObject *py_nbt_name_refresh(PyObject *self, PyObject *args, PyObject *k
 		return NULL;
 	PyTuple_SetItem(ret, 0, PyString_FromString(io.out.reply_from));
 
-	py_name = PyObject_FromNBTName(node->socket, lp_iconv_convenience(global_loadparm), &io.out.name);
+	py_name = PyObject_FromNBTName(node->socket, py_iconv_convenience(NULL), &io.out.name);
 	if (py_name == NULL)
 		return NULL;