s3/s4 build: Fix Py_RETURN_NONE to work with python versions < 2.4

[gd/samba-autobuild/.git] / libcli / nbt / pynbt.c

diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index e49c1776a3379c5124d1d258ba23b237588ef47f..99eff94bda3ade4bf8f331fca3df38608cafb83a 100644 (file)
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -18,11 +18,11 @@
 */
 
 #include "includes.h"
-#include <Python.h>
+#include "../lib/util/python_util.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;
 
@@ -40,7 +40,7 @@ static void py_nbt_node_dealloc(PyObject *obj)
 
 static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *kwargs)
 {
-       struct event_context *ev;
+       struct tevent_context *ev;
        nbt_node_Object *ret = PyObject_New(nbt_node_Object, &nbt_node_Type);
 
        ret->mem_ctx = talloc_new(NULL);
@@ -48,7 +48,8 @@ static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *
                return NULL;
 
        ev = s4_event_context_init(ret->mem_ctx);
-       ret->socket = nbt_name_socket_init(ret->mem_ctx, ev, lp_iconv_convenience(global_loadparm));
+       ret->socket = nbt_name_socket_init(ret->mem_ctx, ev, 
+                                                                          py_iconv_convenience(ret->mem_ctx));
        return (PyObject *)ret;
 }
 
@@ -89,7 +90,7 @@ static bool PyObject_AsDestinationTuple(PyObject *obj, const char **dest_addr, u
        return false;
 }
 
-static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *socket, struct nbt_name *name)
+static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socket, struct nbt_name *name)
 {
        if (PyTuple_Check(obj)) {
                if (PyTuple_Size(obj) == 2) {
@@ -120,7 +121,7 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *socket, st
        return false;
 }
 
-static PyObject *PyObject_FromNBTName(struct nbt_name_socket *socket, struct smb_iconv_convenience *ic,
+static PyObject *PyObject_FromNBTName(struct nbt_name_socket *name_socket, struct smb_iconv_convenience *ic,
                                      struct nbt_name *name)
 {
        if (name->scope) {
@@ -171,7 +172,7 @@ static PyObject *py_nbt_name_query(PyObject *self, PyObject *args, PyObject *kwa
                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(node->socket), &io.out.name);
        if (py_name == NULL)
                return NULL;
 
@@ -229,7 +230,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 +293,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 +348,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;
 
@@ -362,7 +363,7 @@ static PyObject *py_nbt_name_refresh(PyObject *self, PyObject *args, PyObject *k
 
 static PyObject *py_nbt_name_release(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       return Py_None; /* FIXME */
+       Py_RETURN_NONE; /* FIXME */
 }
 
 static PyMethodDef py_nbt_methods[] = {