diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 16:12:14 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 16:12:14 +0200 |
| commit | f7692d16e3dc5e580364852c709c6c4a371dd32e (patch) | |
| tree | 0001b4dd1efb01850740b4ef0038fe5d2b5a92c5 /libcli | |
| parent | ea474647f80e145996155ff74c3b8918b6f45e21 (diff) | |
| download | samba-f7692d16e3dc5e580364852c709c6c4a371dd32e.tar.gz samba-f7692d16e3dc5e580364852c709c6c4a371dd32e.tar.bz2 samba-f7692d16e3dc5e580364852c709c6c4a371dd32e.zip | |
Remove more global_loadparm instances, fix syntax errors.
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/nbt/pynbt.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; |