From: Thomas Heller Date: Sat, 19 Sep 2009 10:24:07 +0000 (+0000) Subject: Merged revisions 74949 via svnmerge from X-Git-Tag: v3.1.2rc1~512 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=313935ca7dd409d662b17fb9ac1e0ad9bbb04102;p=python Merged revisions 74949 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r74949 | thomas.heller | 2009-09-19 12:12:45 +0200 (Sa, 19 Sep 2009) | 9 lines Merged revisions 74948 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74948 | thomas.heller | 2009-09-19 12:04:54 +0200 (Sa, 19 Sep 2009) | 1 line Remove unused variable and static function to fix compiler warnings. ........ ................ --- diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 40cf480f7e..169585b47c 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3931,14 +3931,6 @@ PyTypeObject PyCFuncPtr_Type = { /* Struct_Type */ -static int -IBUG(char *msg) -{ - PyErr_Format(PyExc_RuntimeError, - "inconsistent state in CDataObject (%s)", msg); - return -1; -} - /* This function is called to initialize a Structure or Union with positional arguments. It calls itself recursively for all Structure or Union base @@ -4009,12 +4001,9 @@ _init_pos_args(PyObject *self, PyTypeObject *type, static int Struct_init(PyObject *self, PyObject *args, PyObject *kwds) { - StgDictObject *stgdict = PyObject_stgdict(self); - /* Optimization possible: Store the attribute names _fields_[x][0] * in C accessible fields somewhere ? */ - if (!PyTuple_Check(args)) { PyErr_SetString(PyExc_TypeError, "args not a tuple?");