Author: thomas.heller
Date: Fri Jan 25 20:44:41 2008
New Revision: 60295
Modified:
python/branches/py3k-ctypes-pep3118/Modules/_ctypes/_ctypes.c
python/branches/py3k-ctypes-pep3118/Modules/_ctypes/stgdict.c
Log:
Fixed a few XXX markers.
Modified: python/branches/py3k-ctypes-pep3118/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/branches/py3k-ctypes-pep3118/Modules/_ctypes/_ctypes.c
(original)
+++ python/branches/py3k-ctypes-pep3118/Modules/_ctypes/_ctypes.c Fri Jan
25 20:44:41 2008
@@ -263,20 +263,10 @@
size_t len;
char *result;
-#if 1
-/* XXX fix later */
- if (suffix == NULL) {
- if (PyErr_Occurred())
- return NULL;
- /* use default format character if not set */
- suffix = "B";
- }
-#else
if (suffix == NULL) {
assert(PyErr_Occurred());
return NULL;
}
-#endif
len = strlen(suffix);
if (prefix)
len += strlen(prefix);
@@ -2330,13 +2320,8 @@
view->buf = self->b_ptr;
view->len = self->b_size;
view->readonly = 0;
-#if 1
- /* XXX fix later */
/* use default format character if not set */
view->format = dict->format ? dict->format : "B";
-#else
- view->format = dict->format;
-#endif
view->ndim = dict->ndim;
view->shape = dict->shape;
view->itemsize = self->b_size;
Modified: python/branches/py3k-ctypes-pep3118/Modules/_ctypes/stgdict.c
==============================================================================
--- python/branches/py3k-ctypes-pep3118/Modules/_ctypes/stgdict.c
(original)
+++ python/branches/py3k-ctypes-pep3118/Modules/_ctypes/stgdict.c Fri Jan
25 20:44:41 2008
@@ -476,7 +476,7 @@
} else
bitsize = 0;
if (isStruct && !isPacked) {
- char *fieldfmt = dict->format ? dict->format : "XXX";
+ char *fieldfmt = dict->format ? dict->format : "B";
char *fieldname = PyUnicode_AsString(name);
char *ptr;
Py_ssize_t len = strlen(fieldname) + strlen(fieldfmt);
_______________________________________________
Python-3000-checkins mailing list
Python-3000-checkins@python.org
http://mail.python.org/mailman/listinfo/python-3000-checkins
