mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-22 00:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 79751 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79751 | mark.dickinson | 2010-04-04 22:19:35 +0100 (Sun, 04 Apr 2010) | 1 line

  A handful of whitespace fixes in Modules/_struct.c.
........
This commit is contained in:
Mark Dickinson 2010-04-04 21:23:57 +00:00
parent e9493a1872
commit 414e737628
1 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Modules/_struct.c
View file

@ -153,7 +153,7 @@ get_ulong(PyObject *v, unsigned long *p)
return -1; return -1;
assert(PyLong_Check(v)); assert(PyLong_Check(v));
x = PyLong_AsUnsignedLong(v); x = PyLong_AsUnsignedLong(v);
Py_DECREF(v); Py_DECREF(v);
if (x == (unsigned long)-1 && PyErr_Occurred()) { if (x == (unsigned long)-1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) if (PyErr_ExceptionMatches(PyExc_OverflowError))
PyErr_SetString(StructError, PyErr_SetString(StructError,
@ -178,7 +178,7 @@ get_longlong(PyObject *v, PY_LONG_LONG *p)
return -1; return -1;
assert(PyLong_Check(v)); assert(PyLong_Check(v));
x = PyLong_AsLongLong(v); x = PyLong_AsLongLong(v);
Py_DECREF(v); Py_DECREF(v);
if (x == (PY_LONG_LONG)-1 && PyErr_Occurred()) { if (x == (PY_LONG_LONG)-1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) if (PyErr_ExceptionMatches(PyExc_OverflowError))
PyErr_SetString(StructError, PyErr_SetString(StructError,
@ -201,7 +201,7 @@ get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p)
return -1; return -1;
assert(PyLong_Check(v)); assert(PyLong_Check(v));
x = PyLong_AsUnsignedLongLong(v); x = PyLong_AsUnsignedLongLong(v);
Py_DECREF(v); Py_DECREF(v);
if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) { if (x == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) if (PyErr_ExceptionMatches(PyExc_OverflowError))
PyErr_SetString(StructError, PyErr_SetString(StructError,
@ -222,7 +222,7 @@ get_ulonglong(PyObject *v, unsigned PY_LONG_LONG *p)
static PyObject * static PyObject *
unpack_float(const char *p, /* start of 4-byte string */ unpack_float(const char *p, /* start of 4-byte string */
int le) /* true for little-endian, false for big-endian */ int le) /* true for little-endian, false for big-endian */
{ {
double x; double x;
@ -234,7 +234,7 @@ unpack_float(const char *p, /* start of 4-byte string */
static PyObject * static PyObject *
unpack_double(const char *p, /* start of 8-byte string */ unpack_double(const char *p, /* start of 8-byte string */
int le) /* true for little-endian, false for big-endian */ int le) /* true for little-endian, false for big-endian */
{ {
double x; double x;
@ -591,7 +591,7 @@ np_ulonglong(char *p, PyObject *v, const formatdef *f)
static int static int
np_bool(char *p, PyObject *v, const formatdef *f) np_bool(char *p, PyObject *v, const formatdef *f)
{ {
BOOL_TYPE y; BOOL_TYPE y;
y = PyObject_IsTrue(v); y = PyObject_IsTrue(v);
memcpy(p, (char *)&y, sizeof y); memcpy(p, (char *)&y, sizeof y);
return 0; return 0;
@ -812,7 +812,7 @@ bp_longlong(char *p, PyObject *v, const formatdef *f)
if (v == NULL) if (v == NULL)
return -1; return -1;
res = _PyLong_AsByteArray((PyLongObject *)v, res = _PyLong_AsByteArray((PyLongObject *)v,
(unsigned char *)p, (unsigned char *)p,
8, 8,
0, /* little_endian */ 0, /* little_endian */
1 /* signed */); 1 /* signed */);
@ -828,7 +828,7 @@ bp_ulonglong(char *p, PyObject *v, const formatdef *f)
if (v == NULL) if (v == NULL)
return -1; return -1;
res = _PyLong_AsByteArray((PyLongObject *)v, res = _PyLong_AsByteArray((PyLongObject *)v,
(unsigned char *)p, (unsigned char *)p,
8, 8,
0, /* little_endian */ 0, /* little_endian */
0 /* signed */); 0 /* signed */);
@ -863,7 +863,7 @@ bp_double(char *p, PyObject *v, const formatdef *f)
static int static int
bp_bool(char *p, PyObject *v, const formatdef *f) bp_bool(char *p, PyObject *v, const formatdef *f)
{ {
char y; char y;
y = PyObject_IsTrue(v); y = PyObject_IsTrue(v);
memcpy(p, (char *)&y, sizeof y); memcpy(p, (char *)&y, sizeof y);
return 0; return 0;
@ -1030,7 +1030,7 @@ lp_longlong(char *p, PyObject *v, const formatdef *f)
if (v == NULL) if (v == NULL)
return -1; return -1;
res = _PyLong_AsByteArray((PyLongObject*)v, res = _PyLong_AsByteArray((PyLongObject*)v,
(unsigned char *)p, (unsigned char *)p,
8, 8,
1, /* little_endian */ 1, /* little_endian */
1 /* signed */); 1 /* signed */);
@ -1046,7 +1046,7 @@ lp_ulonglong(char *p, PyObject *v, const formatdef *f)
if (v == NULL) if (v == NULL)
return -1; return -1;
res = _PyLong_AsByteArray((PyLongObject*)v, res = _PyLong_AsByteArray((PyLongObject*)v,
(unsigned char *)p, (unsigned char *)p,
8, 8,
1, /* little_endian */ 1, /* little_endian */
0 /* signed */); 0 /* signed */);
@ -1407,7 +1407,7 @@ s_unpack(PyObject *self, PyObject *input)
PyErr_Format(StructError, PyErr_Format(StructError,
"unpack requires a bytes argument of length %zd", "unpack requires a bytes argument of length %zd",
soself->s_size); soself->s_size);
PyBuffer_Release(&vbuf); PyBuffer_Release(&vbuf);
return NULL; return NULL;
} }
result = s_unpack_internal(soself, vbuf.buf); result = s_unpack_internal(soself, vbuf.buf);
@ -1449,7 +1449,7 @@ s_unpack_from(PyObject *self, PyObject *args, PyObject *kwds)
PyErr_Format(StructError, PyErr_Format(StructError,
"unpack_from requires a buffer of at least %zd bytes", "unpack_from requires a buffer of at least %zd bytes",
soself->s_size); soself->s_size);
PyBuffer_Release(&vbuf); PyBuffer_Release(&vbuf);
return NULL; return NULL;
} }
result = s_unpack_internal(soself, (char*)vbuf.buf + offset); result = s_unpack_internal(soself, (char*)vbuf.buf + offset);
@ -1782,7 +1782,7 @@ calcsize(PyObject *self, PyObject *fmt)
return NULL; return NULL;
n = ((PyStructObject *)s_object)->s_size; n = ((PyStructObject *)s_object)->s_size;
Py_DECREF(s_object); Py_DECREF(s_object);
return PyLong_FromSsize_t(n); return PyLong_FromSsize_t(n);
} }
PyDoc_STRVAR(pack_doc, PyDoc_STRVAR(pack_doc,
@ -1808,7 +1808,7 @@ pack(PyObject *self, PyObject *args)
Py_DECREF(newargs); Py_DECREF(newargs);
return NULL; return NULL;
} }
result = s_pack(s_object, newargs); result = s_pack(s_object, newargs);
Py_DECREF(newargs); Py_DECREF(newargs);
Py_DECREF(s_object); Py_DECREF(s_object);
return result; return result;
@ -1838,7 +1838,7 @@ pack_into(PyObject *self, PyObject *args)
Py_DECREF(newargs); Py_DECREF(newargs);
return NULL; return NULL;
} }
result = s_pack_into(s_object, newargs); result = s_pack_into(s_object, newargs);
Py_DECREF(newargs); Py_DECREF(newargs);
Py_DECREF(s_object); Py_DECREF(s_object);
return result; return result;
@ -1859,7 +1859,7 @@ unpack(PyObject *self, PyObject *args)
s_object = cache_struct(fmt); s_object = cache_struct(fmt);
if (s_object == NULL) if (s_object == NULL)
return NULL; return NULL;
result = s_unpack(s_object, inputstr); result = s_unpack(s_object, inputstr);
Py_DECREF(s_object); Py_DECREF(s_object);
return result; return result;
} }
@ -1888,20 +1888,20 @@ unpack_from(PyObject *self, PyObject *args, PyObject *kwds)
Py_DECREF(newargs); Py_DECREF(newargs);
return NULL; return NULL;
} }
result = s_unpack_from(s_object, newargs, kwds); result = s_unpack_from(s_object, newargs, kwds);
Py_DECREF(newargs); Py_DECREF(newargs);
Py_DECREF(s_object); Py_DECREF(s_object);
return result; return result;
} }
static struct PyMethodDef module_functions[] = { static struct PyMethodDef module_functions[] = {
{"_clearcache", (PyCFunction)clearcache, METH_NOARGS, clearcache_doc}, {"_clearcache", (PyCFunction)clearcache, METH_NOARGS, clearcache_doc},
{"calcsize", calcsize, METH_O, calcsize_doc}, {"calcsize", calcsize, METH_O, calcsize_doc},
{"pack", pack, METH_VARARGS, pack_doc}, {"pack", pack, METH_VARARGS, pack_doc},
{"pack_into", pack_into, METH_VARARGS, pack_into_doc}, {"pack_into", pack_into, METH_VARARGS, pack_into_doc},
{"unpack", unpack, METH_VARARGS, unpack_doc}, {"unpack", unpack, METH_VARARGS, unpack_doc},
{"unpack_from", (PyCFunction)unpack_from, {"unpack_from", (PyCFunction)unpack_from,
METH_VARARGS|METH_KEYWORDS, unpack_from_doc}, METH_VARARGS|METH_KEYWORDS, unpack_from_doc},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };