[Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.47,2.48
Peter Schneider-Kamp
python-dev@python.org
Thu, 13 Jul 2000 14:11:00 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv3739
Modified Files:
arraymodule.c
Log Message:
ANSI-fication (got lost in the deep seas of source forge <wink>)
Index: arraymodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/arraymodule.c,v
retrieving revision 2.47
retrieving revision 2.48
diff -C2 -r2.47 -r2.48
*** arraymodule.c 2000/07/09 03:09:55 2.47
--- arraymodule.c 2000/07/13 21:10:57 2.48
***************
*** 59,65 ****
static PyObject *
! c_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyString_FromStringAndSize(&((char *)ap->ob_item)[i], 1);
--- 59,63 ----
static PyObject *
! c_getitem(arrayobject *ap, int i)
{
return PyString_FromStringAndSize(&((char *)ap->ob_item)[i], 1);
***************
*** 67,74 ****
static int
! c_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
char x;
--- 65,69 ----
static int
! c_setitem(arrayobject *ap, int i, PyObject *v)
{
char x;
***************
*** 81,87 ****
static PyObject *
! b_getitem(ap, i)
! arrayobject *ap;
! int i;
{
long x = ((char *)ap->ob_item)[i];
--- 76,80 ----
static PyObject *
! b_getitem(arrayobject *ap, int i)
{
long x = ((char *)ap->ob_item)[i];
***************
*** 92,99 ****
static int
! b_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
short x;
--- 85,89 ----
static int
! b_setitem(arrayobject *ap, int i, PyObject *v)
{
short x;
***************
*** 119,125 ****
static PyObject *
! BB_getitem(ap, i)
! arrayobject *ap;
! int i;
{
long x = ((unsigned char *)ap->ob_item)[i];
--- 109,113 ----
static PyObject *
! BB_getitem(arrayobject *ap, int i)
{
long x = ((unsigned char *)ap->ob_item)[i];
***************
*** 128,135 ****
static int
! BB_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
unsigned char x;
--- 116,120 ----
static int
! BB_setitem(arrayobject *ap, int i, PyObject *v)
{
unsigned char x;
***************
*** 143,149 ****
static PyObject *
! h_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyInt_FromLong((long) ((short *)ap->ob_item)[i]);
--- 128,132 ----
static PyObject *
! h_getitem(arrayobject *ap, int i)
{
return PyInt_FromLong((long) ((short *)ap->ob_item)[i]);
***************
*** 151,158 ****
static int
! h_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
short x;
--- 134,138 ----
static int
! h_setitem(arrayobject *ap, int i, PyObject *v)
{
short x;
***************
*** 166,172 ****
static PyObject *
! HH_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyInt_FromLong((long) ((unsigned short *)ap->ob_item)[i]);
--- 146,150 ----
static PyObject *
! HH_getitem(arrayobject *ap, int i)
{
return PyInt_FromLong((long) ((unsigned short *)ap->ob_item)[i]);
***************
*** 174,181 ****
static int
! HH_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
int x;
--- 152,156 ----
static int
! HH_setitem(arrayobject *ap, int i, PyObject *v)
{
int x;
***************
*** 200,206 ****
static PyObject *
! i_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyInt_FromLong((long) ((int *)ap->ob_item)[i]);
--- 175,179 ----
static PyObject *
! i_getitem(arrayobject *ap, int i)
{
return PyInt_FromLong((long) ((int *)ap->ob_item)[i]);
***************
*** 208,215 ****
static int
! i_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
int x;
--- 181,185 ----
static int
! i_setitem(arrayobject *ap, int i, PyObject *v)
{
int x;
***************
*** 223,229 ****
static PyObject *
! II_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyLong_FromUnsignedLong(
--- 193,197 ----
static PyObject *
! II_getitem(arrayobject *ap, int i)
{
return PyLong_FromUnsignedLong(
***************
*** 232,239 ****
static int
! II_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
unsigned long x;
--- 200,204 ----
static int
! II_setitem(arrayobject *ap, int i, PyObject *v)
{
unsigned long x;
***************
*** 267,273 ****
static PyObject *
! l_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyInt_FromLong(((long *)ap->ob_item)[i]);
--- 232,236 ----
static PyObject *
! l_getitem(arrayobject *ap, int i)
{
return PyInt_FromLong(((long *)ap->ob_item)[i]);
***************
*** 275,282 ****
static int
! l_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
long x;
--- 238,242 ----
static int
! l_setitem(arrayobject *ap, int i, PyObject *v)
{
long x;
***************
*** 289,295 ****
static PyObject *
! LL_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyLong_FromUnsignedLong(((unsigned long *)ap->ob_item)[i]);
--- 249,253 ----
static PyObject *
! LL_getitem(arrayobject *ap, int i)
{
return PyLong_FromUnsignedLong(((unsigned long *)ap->ob_item)[i]);
***************
*** 297,304 ****
static int
! LL_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
unsigned long x;
--- 255,259 ----
static int
! LL_setitem(arrayobject *ap, int i, PyObject *v)
{
unsigned long x;
***************
*** 332,338 ****
static PyObject *
! f_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyFloat_FromDouble((double) ((float *)ap->ob_item)[i]);
--- 287,291 ----
static PyObject *
! f_getitem(arrayobject *ap, int i)
{
return PyFloat_FromDouble((double) ((float *)ap->ob_item)[i]);
***************
*** 340,347 ****
static int
! f_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
float x;
--- 293,297 ----
static int
! f_setitem(arrayobject *ap, int i, PyObject *v)
{
float x;
***************
*** 354,360 ****
static PyObject *
! d_getitem(ap, i)
! arrayobject *ap;
! int i;
{
return PyFloat_FromDouble(((double *)ap->ob_item)[i]);
--- 304,308 ----
static PyObject *
! d_getitem(arrayobject *ap, int i)
{
return PyFloat_FromDouble(((double *)ap->ob_item)[i]);
***************
*** 362,369 ****
static int
! d_setitem(ap, i, v)
! arrayobject *ap;
! int i;
! PyObject *v;
{
double x;
--- 310,314 ----
static int
! d_setitem(arrayobject *ap, int i, PyObject *v)
{
double x;
***************
*** 394,400 ****
static PyObject *
! newarrayobject(size, descr)
! int size;
! struct arraydescr *descr;
{
arrayobject *op;
--- 339,343 ----
static PyObject *
! newarrayobject(int size, struct arraydescr *descr)
{
arrayobject *op;
***************
*** 429,434 ****
#if 0
static int
! getarraysize(op)
! PyObject *op;
{
if (!is_arrayobject(op)) {
--- 372,376 ----
#if 0
static int
! getarraysize(PyObject *op)
{
if (!is_arrayobject(op)) {
***************
*** 441,447 ****
static PyObject *
! getarrayitem(op, i)
! PyObject *op;
! int i;
{
register arrayobject *ap;
--- 383,387 ----
static PyObject *
! getarrayitem(PyObject *op, int i)
{
register arrayobject *ap;
***************
*** 459,466 ****
static int
! ins1(self, where, v)
! arrayobject *self;
! int where;
! PyObject *v;
{
char *items;
--- 399,403 ----
static int
! ins1(arrayobject *self, int where, PyObject *v)
{
char *items;
***************
*** 492,499 ****
#if 0
static int
! insarrayitem(op, where, newitem)
! PyObject *op;
! int where;
! PyObject *newitem;
{
if (!is_arrayobject(op)) {
--- 429,433 ----
#if 0
static int
! insarrayitem(PyObject *op, int where, PyObject *newitem)
{
if (!is_arrayobject(op)) {
***************
*** 505,511 ****
static int
! addarrayitem(op, newitem)
! PyObject *op;
! PyObject *newitem;
{
if (!is_arrayobject(op)) {
--- 439,443 ----
static int
! addarrayitem(PyObject *op, PyObject *newitem)
{
if (!is_arrayobject(op)) {
***************
*** 521,526 ****
static void
! array_dealloc(op)
! arrayobject *op;
{
if (op->ob_item != NULL)
--- 453,457 ----
static void
! array_dealloc(arrayobject *op)
{
if (op->ob_item != NULL)
***************
*** 530,535 ****
static int
! array_compare(v, w)
! arrayobject *v, *w;
{
int len = (v->ob_size < w->ob_size) ? v->ob_size : w->ob_size;
--- 461,465 ----
static int
! array_compare(arrayobject *v, arrayobject *w)
{
int len = (v->ob_size < w->ob_size) ? v->ob_size : w->ob_size;
***************
*** 553,558 ****
static int
! array_length(a)
! arrayobject *a;
{
return a->ob_size;
--- 483,487 ----
static int
! array_length(arrayobject *a)
{
return a->ob_size;
***************
*** 560,566 ****
static PyObject *
! array_item(a, i)
! arrayobject *a;
! int i;
{
if (i < 0 || i >= a->ob_size) {
--- 489,493 ----
static PyObject *
! array_item(arrayobject *a, int i)
{
if (i < 0 || i >= a->ob_size) {
***************
*** 572,578 ****
static PyObject *
! array_slice(a, ilow, ihigh)
! arrayobject *a;
! int ilow, ihigh;
{
arrayobject *np;
--- 499,503 ----
static PyObject *
! array_slice(arrayobject *a, int ilow, int ihigh)
{
arrayobject *np;
***************
*** 596,602 ****
static PyObject *
! array_concat(a, bb)
! arrayobject *a;
! PyObject *bb;
{
int size;
--- 521,525 ----
static PyObject *
! array_concat(arrayobject *a, PyObject *bb)
{
int size;
***************
*** 626,632 ****
static PyObject *
! array_repeat(a, n)
! arrayobject *a;
! int n;
{
int i;
--- 549,553 ----
static PyObject *
! array_repeat(arrayobject *a, int n)
{
int i;
***************
*** 651,658 ****
static int
! array_ass_slice(a, ilow, ihigh, v)
! arrayobject *a;
! int ilow, ihigh;
! PyObject *v;
{
char *item;
--- 572,576 ----
static int
! array_ass_slice(arrayobject *a, int ilow, int ihigh, PyObject *v)
{
char *item;
***************
*** 725,732 ****
static int
! array_ass_item(a, i, v)
! arrayobject *a;
! int i;
! PyObject *v;
{
if (i < 0 || i >= a->ob_size) {
--- 643,647 ----
static int
! array_ass_item(arrayobject *a, int i, PyObject *v)
{
if (i < 0 || i >= a->ob_size) {
***************
*** 741,748 ****
static int
! setarrayitem(a, i, v)
! PyObject *a;
! int i;
! PyObject *v;
{
if (!is_arrayobject(a)) {
--- 656,660 ----
static int
! setarrayitem(PyObject *a, int i, PyObject *v)
{
if (!is_arrayobject(a)) {
***************
*** 754,761 ****
static PyObject *
! ins(self, where, v)
! arrayobject *self;
! int where;
! PyObject *v;
{
if (ins1(self, where, v) != 0)
--- 666,670 ----
static PyObject *
! ins(arrayobject *self, int where, PyObject *v)
{
if (ins1(self, where, v) != 0)
***************
*** 766,772 ****
static PyObject *
! array_insert(self, args)
! arrayobject *self;
! PyObject *args;
{
int i;
--- 675,679 ----
static PyObject *
! array_insert(arrayobject *self, PyObject *args)
{
int i;
***************
*** 784,790 ****
static PyObject *
! array_buffer_info(self, args)
! arrayobject *self;
! PyObject *args;
{
PyObject* retval = PyTuple_New(2);
--- 691,695 ----
static PyObject *
! array_buffer_info(arrayobject *self, PyObject *args)
{
PyObject* retval = PyTuple_New(2);
***************
*** 805,811 ****
static PyObject *
! array_append(self, args)
! arrayobject *self;
! PyObject *args;
{
PyObject *v;
--- 710,714 ----
static PyObject *
! array_append(arrayobject *self, PyObject *args)
{
PyObject *v;
***************
*** 822,828 ****
static PyObject *
! array_byteswap(self, args)
! arrayobject *self;
! PyObject *args;
{
char *p;
--- 725,729 ----
static PyObject *
! array_byteswap(arrayobject *self, PyObject *args)
{
char *p;
***************
*** 884,890 ****
static PyObject *
! array_reverse(self, args)
! arrayobject *self;
! PyObject *args;
{
register int itemsize = self->ob_descr->itemsize;
--- 785,789 ----
static PyObject *
! array_reverse(arrayobject *self, PyObject *args)
{
register int itemsize = self->ob_descr->itemsize;
***************
*** 923,929 ****
#if 0
static PyObject *
! array_index(self, args)
! arrayobject *self;
! PyObject *args;
{
int i;
--- 822,826 ----
#if 0
static PyObject *
! array_index(arrayobject *self, PyObject *args)
{
int i;
***************
*** 945,951 ****
#if 0
static PyObject *
! array_count(self, args)
! arrayobject *self;
! PyObject *args;
{
int count = 0;
--- 842,846 ----
#if 0
static PyObject *
! array_count(arrayobject *self, PyObject *args)
{
int count = 0;
***************
*** 967,973 ****
#if 0
static PyObject *
! array_remove(self, args)
! arrayobject *self;
! PyObject *args;
{
int i;
--- 862,866 ----
#if 0
static PyObject *
! array_remove(arrayobject *self, PyObject *args)
{
int i;
***************
*** 993,999 ****
static PyObject *
! array_fromfile(self, args)
! arrayobject *self;
! PyObject *args;
{
PyObject *f;
--- 886,890 ----
static PyObject *
! array_fromfile(arrayobject *self, PyObject *args)
{
PyObject *f;
***************
*** 1049,1055 ****
static PyObject *
! array_tofile(self, args)
! arrayobject *self;
! PyObject *args;
{
PyObject *f;
--- 940,944 ----
static PyObject *
! array_tofile(arrayobject *self, PyObject *args)
{
PyObject *f;
***************
*** 1082,1088 ****
static PyObject *
! array_fromlist(self, args)
! arrayobject *self;
! PyObject *args;
{
int n;
--- 971,975 ----
static PyObject *
! array_fromlist(arrayobject *self, PyObject *args)
{
int n;
***************
*** 1129,1135 ****
static PyObject *
! array_tolist(self, args)
! arrayobject *self;
! PyObject *args;
{
PyObject *list = PyList_New(self->ob_size);
--- 1016,1020 ----
static PyObject *
! array_tolist(arrayobject *self, PyObject *args)
{
PyObject *list = PyList_New(self->ob_size);
***************
*** 1155,1161 ****
static PyObject *
! array_fromstring(self, args)
! arrayobject *self;
! PyObject *args;
{
char *str;
--- 1040,1044 ----
static PyObject *
! array_fromstring(arrayobject *self, PyObject *args)
{
char *str;
***************
*** 1194,1200 ****
static PyObject *
! array_tostring(self, args)
! arrayobject *self;
! PyObject *args;
{
if (!PyArg_Parse(args, ""))
--- 1077,1081 ----
static PyObject *
! array_tostring(arrayobject *self, PyObject *args)
{
if (!PyArg_Parse(args, ""))
***************
*** 1233,1239 ****
static PyObject *
! array_getattr(a, name)
! arrayobject *a;
! char *name;
{
if (strcmp(name, "typecode") == 0) {
--- 1114,1118 ----
static PyObject *
! array_getattr(arrayobject *a, char *name)
{
if (strcmp(name, "typecode") == 0) {
***************
*** 1262,1269 ****
static int
! array_print(a, fp, flags)
! arrayobject *a;
! FILE *fp;
! int flags;
{
int ok = 0;
--- 1141,1145 ----
static int
! array_print(arrayobject *a, FILE *fp, int flags)
{
int ok = 0;
***************
*** 1296,1301 ****
static PyObject *
! array_repr(a)
! arrayobject *a;
{
char buf[256];
--- 1172,1176 ----
static PyObject *
! array_repr(arrayobject *a)
{
char buf[256];
***************
*** 1334,1341 ****
static int
! array_buffer_getreadbuf(self, index, ptr)
! arrayobject *self;
! int index;
! const void **ptr;
{
if ( index != 0 ) {
--- 1209,1213 ----
static int
! array_buffer_getreadbuf(arrayobject *self, int index, const void **ptr)
{
if ( index != 0 ) {
***************
*** 1349,1356 ****
static int
! array_buffer_getwritebuf(self, index, ptr)
! arrayobject *self;
! int index;
! const void **ptr;
{
if ( index != 0 ) {
--- 1221,1225 ----
static int
! array_buffer_getwritebuf(arrayobject *self, int index, const void **ptr)
{
if ( index != 0 ) {
***************
*** 1364,1370 ****
static int
! array_buffer_getsegcount(self, lenp)
! arrayobject *self;
! int *lenp;
{
if ( lenp )
--- 1233,1237 ----
static int
! array_buffer_getsegcount(arrayobject *self, int *lenp)
{
if ( lenp )
***************
*** 1393,1399 ****
static PyObject *
! a_array(self, args)
! PyObject *self;
! PyObject *args;
{
char c;
--- 1260,1264 ----
static PyObject *
! a_array(PyObject *self, PyObject *args)
{
char c;