1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00

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
This commit is contained in:
Stefan Metzmacher
2010-12-09 09:59:52 +01:00
parent e1485c70fc
commit 5fcbb16760
2 changed files with 6 additions and 6 deletions

View File

@ -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;
}

View File

@ -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);