[Python-checkins] r74951 - in python/branches/release31-maint: Modules/_ctypes/_ctypes.c

[thomas.heller]

Author: thomas.heller
Date: Sat Sep 19 12:24:07 2009
New Revision: 74951

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/_ctypes/_ctypes.c

Modified: python/branches/release31-maint/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/branches/release31-maint/Modules/_ctypes/_ctypes.c	(original)
+++ python/branches/release31-maint/Modules/_ctypes/_ctypes.c	Sat Sep 19 12:24:07 2009
@@ -3931,14 +3931,6 @@
 /*
   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 @@
 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?");