summaryrefslogtreecommitdiff
path: root/source4/librpc/rpc
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-12-09 09:59:52 +0100
committerStefan Metzmacher <metze@samba.org>2010-12-09 17:55:57 +0100
commit5fcbb1676009de9e384a8f76e0c4ab1b43ce3746 (patch)
tree9babbbc7687704c93c3bda7ab364eb9d5a83517a /source4/librpc/rpc
parente1485c70fc1de2472e54fc1aaa23469e70ec3428 (diff)
downloadsamba-5fcbb1676009de9e384a8f76e0c4ab1b43ce3746.tar.gz
samba-5fcbb1676009de9e384a8f76e0c4ab1b43ce3746.tar.bz2
samba-5fcbb1676009de9e384a8f76e0c4ab1b43ce3746.zip
s4:pyrpc_util: s/typename/type_name to avoid c++ warnings
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Thu Dec 9 17:55:57 CET 2010 on sn-devel-104
Diffstat (limited to 'source4/librpc/rpc')
-rw-r--r--source4/librpc/rpc/pyrpc_util.c10
-rw-r--r--source4/librpc/rpc/pyrpc_util.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c
index 5ad8d2f9e8..3821638fb3 100644
--- a/source4/librpc/rpc/pyrpc_util.c
+++ b/source4/librpc/rpc/pyrpc_util.c
@@ -31,7 +31,7 @@
#include "lib/messaging/messaging.h"
#include "lib/messaging/irpc.h"
-bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typename)
+bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *type_name)
{
PyObject *mod;
PyTypeObject *type;
@@ -41,15 +41,15 @@ bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typenam
if (mod == NULL) {
PyErr_Format(PyExc_RuntimeError, "Unable to import %s to check type %s",
- module, typename);
+ module, type_name);
return NULL;
}
- type = (PyTypeObject *)PyObject_GetAttrString(mod, typename);
+ type = (PyTypeObject *)PyObject_GetAttrString(mod, type_name);
Py_DECREF(mod);
if (type == NULL) {
PyErr_Format(PyExc_RuntimeError, "Unable to find type %s in module %s",
- module, typename);
+ module, type_name);
return NULL;
}
@@ -58,7 +58,7 @@ bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typenam
if (!ret)
PyErr_Format(PyExc_TypeError, "Expected type %s.%s, got %s",
- module, typename, Py_TYPE(obj)->tp_name);
+ module, type_name, Py_TYPE(obj)->tp_name);
return ret;
}
diff --git a/source4/librpc/rpc/pyrpc_util.h b/source4/librpc/rpc/pyrpc_util.h
index 445138b9b5..837a33be16 100644
--- a/source4/librpc/rpc/pyrpc_util.h
+++ b/source4/librpc/rpc/pyrpc_util.h
@@ -46,7 +46,7 @@ struct PyNdrRpcMethodDef {
const struct ndr_interface_table *table;
};
-bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typename);
+bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *type_name);
bool PyInterface_AddNdrRpcMethods(PyTypeObject *object, const struct PyNdrRpcMethodDef *mds);
PyObject *py_dcerpc_interface_init_helper(PyTypeObject *type, PyObject *args, PyObject *kwargs, const struct ndr_interface_table *table);