[Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.74,2.75 tupleobject.c,2.42,2.43 xxobject.c,2.17,2.18
Fred L. Drake
python-dev@python.org
Sun, 9 Jul 2000 00:04:38 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv14044
Modified Files:
stringobject.c tupleobject.c xxobject.c
Log Message:
ANSI-fication of the sources.
Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.74
retrieving revision 2.75
diff -C2 -r2.74 -r2.75
*** stringobject.c 2000/07/06 11:29:01 2.74
--- stringobject.c 2000/07/09 07:04:36 2.75
***************
*** 49,55 ****
*/
PyObject *
! PyString_FromStringAndSize(str, size)
! const char *str;
! int size;
{
register PyStringObject *op;
--- 49,53 ----
*/
PyObject *
! PyString_FromStringAndSize(const char *str, int size)
{
register PyStringObject *op;
***************
*** 101,106 ****
PyObject *
! PyString_FromString(str)
! const char *str;
{
register size_t size = strlen(str);
--- 99,103 ----
PyObject *
! PyString_FromString(const char *str)
{
register size_t size = strlen(str);
***************
*** 248,253 ****
static void
! string_dealloc(op)
! PyObject *op;
{
PyObject_DEL(op);
--- 245,249 ----
static void
! string_dealloc(PyObject *op)
{
PyObject_DEL(op);
***************
*** 255,260 ****
int
! PyString_Size(op)
! register PyObject *op;
{
if (!PyString_Check(op)) {
--- 251,255 ----
int
! PyString_Size(register PyObject *op)
{
if (!PyString_Check(op)) {
***************
*** 266,271 ****
/*const*/ char *
! PyString_AsString(op)
! register PyObject *op;
{
if (!PyString_Check(op)) {
--- 261,265 ----
/*const*/ char *
! PyString_AsString(register PyObject *op)
{
if (!PyString_Check(op)) {
***************
*** 279,286 ****
static int
! string_print(op, fp, flags)
! PyStringObject *op;
! FILE *fp;
! int flags;
{
int i;
--- 273,277 ----
static int
! string_print(PyStringObject *op, FILE *fp, int flags)
{
int i;
***************
*** 313,318 ****
static PyObject *
! string_repr(op)
! register PyStringObject *op;
{
size_t newsize = 2 + 4 * op->ob_size * sizeof(char);
--- 304,308 ----
static PyObject *
! string_repr(register PyStringObject *op)
{
size_t newsize = 2 + 4 * op->ob_size * sizeof(char);
***************
*** 360,365 ****
static int
! string_length(a)
! PyStringObject *a;
{
return a->ob_size;
--- 350,354 ----
static int
! string_length(PyStringObject *a)
{
return a->ob_size;
***************
*** 367,373 ****
static PyObject *
! string_concat(a, bb)
! register PyStringObject *a;
! register PyObject *bb;
{
register unsigned int size;
--- 356,360 ----
static PyObject *
! string_concat(register PyStringObject *a, register PyObject *bb)
{
register unsigned int size;
***************
*** 412,418 ****
static PyObject *
! string_repeat(a, n)
! register PyStringObject *a;
! register int n;
{
register int i;
--- 399,403 ----
static PyObject *
! string_repeat(register PyStringObject *a, register int n)
{
register int i;
***************
*** 447,453 ****
static PyObject *
! string_slice(a, i, j)
! register PyStringObject *a;
! register int i, j; /* May be negative! */
{
if (i < 0)
--- 432,437 ----
static PyObject *
! string_slice(register PyStringObject *a, register int i, register int j)
! /* j -- may be negative! */
{
if (i < 0)
***************
*** 467,472 ****
static int
! string_contains(a, el)
! PyObject *a, *el;
{
register char *s, *end;
--- 451,455 ----
static int
! string_contains(PyObject *a, PyObject *el)
{
register char *s, *end;
***************
*** 490,496 ****
static PyObject *
! string_item(a, i)
! PyStringObject *a;
! register int i;
{
int c;
--- 473,477 ----
static PyObject *
! string_item(PyStringObject *a, register int i)
{
int c;
***************
*** 518,523 ****
static int
! string_compare(a, b)
! PyStringObject *a, *b;
{
int len_a = a->ob_size, len_b = b->ob_size;
--- 499,503 ----
static int
! string_compare(PyStringObject *a, PyStringObject *b)
{
int len_a = a->ob_size, len_b = b->ob_size;
***************
*** 535,540 ****
static long
! string_hash(a)
! PyStringObject *a;
{
register int len;
--- 515,519 ----
static long
! string_hash(PyStringObject *a)
{
register int len;
***************
*** 566,573 ****
static int
! string_buffer_getreadbuf(self, index, ptr)
! PyStringObject *self;
! int index;
! const void **ptr;
{
if ( index != 0 ) {
--- 545,549 ----
static int
! string_buffer_getreadbuf(PyStringObject *self, int index, const void **ptr)
{
if ( index != 0 ) {
***************
*** 581,588 ****
static int
! string_buffer_getwritebuf(self, index, ptr)
! PyStringObject *self;
! int index;
! const void **ptr;
{
PyErr_SetString(PyExc_TypeError,
--- 557,561 ----
static int
! string_buffer_getwritebuf(PyStringObject *self, int index, const void **ptr)
{
PyErr_SetString(PyExc_TypeError,
***************
*** 592,598 ****
static int
! string_buffer_getsegcount(self, lenp)
! PyStringObject *self;
! int *lenp;
{
if ( lenp )
--- 565,569 ----
static int
! string_buffer_getsegcount(PyStringObject *self, int *lenp)
{
if ( lenp )
***************
*** 602,609 ****
static int
! string_buffer_getcharbuf(self, index, ptr)
! PyStringObject *self;
! int index;
! const char **ptr;
{
if ( index != 0 ) {
--- 573,577 ----
static int
! string_buffer_getcharbuf(PyStringObject *self, int index, const char **ptr)
{
if ( index != 0 ) {
***************
*** 642,649 ****
static PyObject *
! split_whitespace(s, len, maxsplit)
! char *s;
! int len;
! int maxsplit;
{
int i, j, err;
--- 610,614 ----
static PyObject *
! split_whitespace(char *s, int len, int maxsplit)
{
int i, j, err;
***************
*** 700,706 ****
static PyObject *
! string_split(self, args)
! PyStringObject *self;
! PyObject *args;
{
int len = PyString_GET_SIZE(self), n, i, j, err;
--- 665,669 ----
static PyObject *
! string_split(PyStringObject *self, PyObject *args)
{
int len = PyString_GET_SIZE(self), n, i, j, err;
***************
*** 772,778 ****
static PyObject *
! string_join(self, args)
! PyStringObject *self;
! PyObject *args;
{
char *sep = PyString_AS_STRING(self);
--- 735,739 ----
static PyObject *
! string_join(PyStringObject *self, PyObject *args)
{
char *sep = PyString_AS_STRING(self);
***************
*** 897,904 ****
static long
! string_find_internal(self, args, dir)
! PyStringObject *self;
! PyObject *args;
! int dir;
{
const char *s = PyString_AS_STRING(self), *sub;
--- 858,862 ----
static long
! string_find_internal(PyStringObject *self, PyObject *args, int dir)
{
const char *s = PyString_AS_STRING(self), *sub;
***************
*** 962,968 ****
static PyObject *
! string_find(self, args)
! PyStringObject *self;
! PyObject *args;
{
long result = string_find_internal(self, args, +1);
--- 920,924 ----
static PyObject *
! string_find(PyStringObject *self, PyObject *args)
{
long result = string_find_internal(self, args, +1);
***************
*** 979,985 ****
static PyObject *
! string_index(self, args)
! PyStringObject *self;
! PyObject *args;
{
long result = string_find_internal(self, args, +1);
--- 935,939 ----
static PyObject *
! string_index(PyStringObject *self, PyObject *args)
{
long result = string_find_internal(self, args, +1);
***************
*** 1005,1011 ****
static PyObject *
! string_rfind(self, args)
! PyStringObject *self;
! PyObject *args;
{
long result = string_find_internal(self, args, -1);
--- 959,963 ----
static PyObject *
! string_rfind(PyStringObject *self, PyObject *args)
{
long result = string_find_internal(self, args, -1);
***************
*** 1022,1028 ****
static PyObject *
! string_rindex(self, args)
! PyStringObject *self;
! PyObject *args;
{
long result = string_find_internal(self, args, -1);
--- 974,978 ----
static PyObject *
! string_rindex(PyStringObject *self, PyObject *args)
{
long result = string_find_internal(self, args, -1);
***************
*** 1039,1046 ****
static PyObject *
! do_strip(self, args, striptype)
! PyStringObject *self;
! PyObject *args;
! int striptype;
{
char *s = PyString_AS_STRING(self);
--- 989,993 ----
static PyObject *
! do_strip(PyStringObject *self, PyObject *args, int striptype)
{
char *s = PyString_AS_STRING(self);
***************
*** 1081,1087 ****
static PyObject *
! string_strip(self, args)
! PyStringObject *self;
! PyObject *args;
{
return do_strip(self, args, BOTHSTRIP);
--- 1028,1032 ----
static PyObject *
! string_strip(PyStringObject *self, PyObject *args)
{
return do_strip(self, args, BOTHSTRIP);
***************
*** 1095,1101 ****
static PyObject *
! string_lstrip(self, args)
! PyStringObject *self;
! PyObject *args;
{
return do_strip(self, args, LEFTSTRIP);
--- 1040,1044 ----
static PyObject *
! string_lstrip(PyStringObject *self, PyObject *args)
{
return do_strip(self, args, LEFTSTRIP);
***************
*** 1109,1115 ****
static PyObject *
! string_rstrip(self, args)
! PyStringObject *self;
! PyObject *args;
{
return do_strip(self, args, RIGHTSTRIP);
--- 1052,1056 ----
static PyObject *
! string_rstrip(PyStringObject *self, PyObject *args)
{
return do_strip(self, args, RIGHTSTRIP);
***************
*** 1123,1129 ****
static PyObject *
! string_lower(self, args)
! PyStringObject *self;
! PyObject *args;
{
char *s = PyString_AS_STRING(self), *s_new;
--- 1064,1068 ----
static PyObject *
! string_lower(PyStringObject *self, PyObject *args)
{
char *s = PyString_AS_STRING(self), *s_new;
***************
*** 1155,1161 ****
static PyObject *
! string_upper(self, args)
! PyStringObject *self;
! PyObject *args;
{
char *s = PyString_AS_STRING(self), *s_new;
--- 1094,1098 ----
static PyObject *
! string_upper(PyStringObject *self, PyObject *args)
{
char *s = PyString_AS_STRING(self), *s_new;
***************
*** 1225,1231 ****
static PyObject *
! string_capitalize(self, args)
! PyStringObject *self;
! PyObject *args;
{
char *s = PyString_AS_STRING(self), *s_new;
--- 1162,1166 ----
static PyObject *
! string_capitalize(PyStringObject *self, PyObject *args)
{
char *s = PyString_AS_STRING(self), *s_new;
***************
*** 1267,1273 ****
static PyObject *
! string_count(self, args)
! PyStringObject *self;
! PyObject *args;
{
const char *s = PyString_AS_STRING(self), *sub;
--- 1202,1206 ----
static PyObject *
! string_count(PyStringObject *self, PyObject *args)
{
const char *s = PyString_AS_STRING(self), *sub;
***************
*** 1325,1331 ****
static PyObject *
! string_swapcase(self, args)
! PyStringObject *self;
! PyObject *args;
{
char *s = PyString_AS_STRING(self), *s_new;
--- 1258,1262 ----
static PyObject *
! string_swapcase(PyStringObject *self, PyObject *args)
{
char *s = PyString_AS_STRING(self), *s_new;
***************
*** 1364,1370 ****
static PyObject *
! string_translate(self, args)
! PyStringObject *self;
! PyObject *args;
{
register char *input, *output;
--- 1295,1299 ----
static PyObject *
! string_translate(PyStringObject *self, PyObject *args)
{
register char *input, *output;
***************
*** 1484,1492 ****
*/
static int
! mymemfind(mem, len, pat, pat_len)
! char *mem;
! int len;
! char *pat;
! int pat_len;
{
register int ii;
--- 1413,1417 ----
*/
static int
! mymemfind(char *mem, int len, char *pat, int pat_len)
{
register int ii;
***************
*** 1511,1519 ****
*/
static int
! mymemcnt(mem, len, pat, pat_len)
! char *mem;
! int len;
! char *pat;
! int pat_len;
{
register int offset = 0;
--- 1436,1440 ----
*/
static int
! mymemcnt(char *mem, int len, char *pat, int pat_len)
{
register int offset = 0;
***************
*** 1551,1564 ****
*/
static char *
! mymemreplace(str, len, pat, pat_len, sub, sub_len, count, out_len)
! char *str;
! int len; /* input string */
! char *pat;
! int pat_len; /* pattern string to find */
! char *sub;
! int sub_len; /* substitution string */
! int count; /* number of replacements */
! int *out_len;
!
{
char *out_s;
--- 1472,1480 ----
*/
static char *
! mymemreplace(char *str, int len, /* input string */
! char *pat, int pat_len, /* pattern string to find */
! char *sub, int sub_len, /* substitution string */
! int count, /* number of replacements */
! int *out_len)
{
char *out_s;
***************
*** 1623,1629 ****
static PyObject *
! string_replace(self, args)
! PyStringObject *self;
! PyObject *args;
{
const char *str = PyString_AS_STRING(self), *sub, *repl;
--- 1539,1543 ----
static PyObject *
! string_replace(PyStringObject *self, PyObject *args)
{
const char *str = PyString_AS_STRING(self), *sub, *repl;
***************
*** 1688,1694 ****
static PyObject *
! string_startswith(self, args)
! PyStringObject *self;
! PyObject *args;
{
const char* str = PyString_AS_STRING(self);
--- 1602,1606 ----
static PyObject *
! string_startswith(PyStringObject *self, PyObject *args)
{
const char* str = PyString_AS_STRING(self);
***************
*** 1742,1748 ****
static PyObject *
! string_endswith(self, args)
! PyStringObject *self;
! PyObject *args;
{
const char* str = PyString_AS_STRING(self);
--- 1654,1658 ----
static PyObject *
! string_endswith(PyStringObject *self, PyObject *args)
{
const char* str = PyString_AS_STRING(self);
***************
*** 2014,2018 ****
string_isspace(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
--- 1924,1929 ----
string_isspace(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p
! = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
***************
*** 2047,2051 ****
string_isalpha(PyUnicodeObject *self, PyObject *args)
{
! register const unsigned char *p = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
--- 1958,1963 ----
string_isalpha(PyUnicodeObject *self, PyObject *args)
{
! register const unsigned char *p
! = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
***************
*** 2080,2084 ****
string_isalnum(PyUnicodeObject *self, PyObject *args)
{
! register const unsigned char *p = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
--- 1992,1997 ----
string_isalnum(PyUnicodeObject *self, PyObject *args)
{
! register const unsigned char *p
! = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
***************
*** 2113,2117 ****
string_isdigit(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
--- 2026,2031 ----
string_isdigit(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p
! = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
***************
*** 2146,2150 ****
string_islower(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
int cased;
--- 2060,2065 ----
string_islower(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p
! = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
int cased;
***************
*** 2182,2186 ****
string_isupper(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
int cased;
--- 2097,2102 ----
string_isupper(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p
! = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
int cased;
***************
*** 2219,2223 ****
string_istitle(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
int cased, previous_is_cased;
--- 2135,2140 ----
string_istitle(PyStringObject *self, PyObject *args)
{
! register const unsigned char *p
! = (unsigned char *) PyString_AS_STRING(self);
register const unsigned char *e;
int cased, previous_is_cased;
***************
*** 2376,2382 ****
static PyObject *
! string_getattr(s, name)
! PyStringObject *s;
! char *name;
{
return Py_FindMethod(string_methods, (PyObject*)s, name);
--- 2293,2297 ----
static PyObject *
! string_getattr(PyStringObject *s, char *name)
{
return Py_FindMethod(string_methods, (PyObject*)s, name);
***************
*** 2410,2416 ****
void
! PyString_Concat(pv, w)
! register PyObject **pv;
! register PyObject *w;
{
register PyObject *v;
--- 2325,2329 ----
void
! PyString_Concat(register PyObject **pv, register PyObject *w)
{
register PyObject *v;
***************
*** 2428,2434 ****
void
! PyString_ConcatAndDel(pv, w)
! register PyObject **pv;
! register PyObject *w;
{
PyString_Concat(pv, w);
--- 2341,2345 ----
void
! PyString_ConcatAndDel(register PyObject **pv, register PyObject *w)
{
PyString_Concat(pv, w);
***************
*** 2445,2451 ****
int
! _PyString_Resize(pv, newsize)
! PyObject **pv;
! int newsize;
{
register PyObject *v;
--- 2356,2360 ----
int
! _PyString_Resize(PyObject **pv, int newsize)
{
register PyObject *v;
***************
*** 2481,2488 ****
static PyObject *
! getnextarg(args, arglen, p_argidx)
! PyObject *args;
! int arglen;
! int *p_argidx;
{
int argidx = *p_argidx;
--- 2390,2394 ----
static PyObject *
! getnextarg(PyObject *args, int arglen, int *p_argidx)
{
int argidx = *p_argidx;
***************
*** 2506,2516 ****
static int
! formatfloat(buf, buflen, flags, prec, type, v)
! char *buf;
! size_t buflen;
! int flags;
! int prec;
! int type;
! PyObject *v;
{
/* fmt = '%#.' + `prec` + `type`
--- 2412,2417 ----
static int
! formatfloat(char *buf, size_t buflen, int flags,
! int prec, int type, PyObject *v)
{
/* fmt = '%#.' + `prec` + `type`
***************
*** 2542,2552 ****
static int
! formatint(buf, buflen, flags, prec, type, v)
! char *buf;
! size_t buflen;
! int flags;
! int prec;
! int type;
! PyObject *v;
{
/* fmt = '%#.' + `prec` + 'l' + `type`
--- 2443,2448 ----
static int
! formatint(char *buf, size_t buflen, int flags,
! int prec, int type, PyObject *v)
{
/* fmt = '%#.' + `prec` + 'l' + `type`
***************
*** 2571,2578 ****
static int
! formatchar(buf, buflen, v)
! char *buf;
! size_t buflen;
! PyObject *v;
{
/* presume that the buffer is at least 2 characters long */
--- 2467,2471 ----
static int
! formatchar(char *buf, size_t buflen, PyObject *v)
{
/* presume that the buffer is at least 2 characters long */
***************
*** 2601,2607 ****
PyObject *
! PyString_Format(format, args)
! PyObject *format;
! PyObject *args;
{
char *fmt, *res;
--- 2494,2498 ----
PyObject *
! PyString_Format(PyObject *format, PyObject *args)
{
char *fmt, *res;
***************
*** 3002,3007 ****
void
! PyString_InternInPlace(p)
! PyObject **p;
{
register PyStringObject *s = (PyStringObject *)(*p);
--- 2893,2897 ----
void
! PyString_InternInPlace(PyObject **p)
{
register PyStringObject *s = (PyStringObject *)(*p);
***************
*** 3038,3043 ****
PyObject *
! PyString_InternFromString(cp)
! const char *cp;
{
PyObject *s = PyString_FromString(cp);
--- 2928,2932 ----
PyObject *
! PyString_InternFromString(const char *cp)
{
PyObject *s = PyString_FromString(cp);
***************
*** 3051,3055 ****
void
! PyString_Fini()
{
int i;
--- 2940,2944 ----
void
! PyString_Fini(void)
{
int i;
Index: tupleobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/tupleobject.c,v
retrieving revision 2.42
retrieving revision 2.43
diff -C2 -r2.42 -r2.43
*** tupleobject.c 2000/07/01 01:00:38 2.42
--- tupleobject.c 2000/07/09 07:04:36 2.43
***************
*** 34,39 ****
PyObject *
! PyTuple_New(size)
! register int size;
{
register int i;
--- 34,38 ----
PyObject *
! PyTuple_New(register int size)
{
register int i;
***************
*** 100,105 ****
int
! PyTuple_Size(op)
! register PyObject *op;
{
if (!PyTuple_Check(op)) {
--- 99,103 ----
int
! PyTuple_Size(register PyObject *op)
{
if (!PyTuple_Check(op)) {
***************
*** 112,118 ****
PyObject *
! PyTuple_GetItem(op, i)
! register PyObject *op;
! register int i;
{
if (!PyTuple_Check(op)) {
--- 110,114 ----
PyObject *
! PyTuple_GetItem(register PyObject *op, register int i)
{
if (!PyTuple_Check(op)) {
***************
*** 128,135 ****
int
! PyTuple_SetItem(op, i, newitem)
! register PyObject *op;
! register int i;
! PyObject *newitem;
{
register PyObject *olditem;
--- 124,128 ----
int
! PyTuple_SetItem(register PyObject *op, register int i, PyObject *newitem)
{
register PyObject *olditem;
***************
*** 156,161 ****
static void
! tupledealloc(op)
! register PyTupleObject *op;
{
register int i;
--- 149,153 ----
static void
! tupledealloc(register PyTupleObject *op)
{
register int i;
***************
*** 183,190 ****
static int
! tupleprint(op, fp, flags)
! PyTupleObject *op;
! FILE *fp;
! int flags;
{
int i;
--- 175,179 ----
static int
! tupleprint(PyTupleObject *op, FILE *fp, int flags)
{
int i;
***************
*** 203,208 ****
static PyObject *
! tuplerepr(v)
! PyTupleObject *v;
{
PyObject *s, *comma;
--- 192,196 ----
static PyObject *
! tuplerepr(PyTupleObject *v)
{
PyObject *s, *comma;
***************
*** 223,228 ****
static int
! tuplecompare(v, w)
! register PyTupleObject *v, *w;
{
register int len =
--- 211,215 ----
static int
! tuplecompare(register PyTupleObject *v, register PyTupleObject *w)
{
register int len =
***************
*** 238,243 ****
static long
! tuplehash(v)
! PyTupleObject *v;
{
register long x, y;
--- 225,229 ----
static long
! tuplehash(PyTupleObject *v)
{
register long x, y;
***************
*** 259,264 ****
static int
! tuplelength(a)
! PyTupleObject *a;
{
return a->ob_size;
--- 245,249 ----
static int
! tuplelength(PyTupleObject *a)
{
return a->ob_size;
***************
*** 266,272 ****
static int
! tuplecontains(a, el)
! PyTupleObject *a;
! PyObject *el;
{
int i, cmp;
--- 251,255 ----
static int
! tuplecontains(PyTupleObject *a, PyObject *el)
{
int i, cmp;
***************
*** 283,289 ****
static PyObject *
! tupleitem(a, i)
! register PyTupleObject *a;
! register int i;
{
if (i < 0 || i >= a->ob_size) {
--- 266,270 ----
static PyObject *
! tupleitem(register PyTupleObject *a, register int i)
{
if (i < 0 || i >= a->ob_size) {
***************
*** 296,302 ****
static PyObject *
! tupleslice(a, ilow, ihigh)
! register PyTupleObject *a;
! register int ilow, ihigh;
{
register PyTupleObject *np;
--- 277,281 ----
static PyObject *
! tupleslice(register PyTupleObject *a, register int ilow, register int ihigh)
{
register PyTupleObject *np;
***************
*** 325,331 ****
PyObject *
! PyTuple_GetSlice(op, i, j)
! PyObject *op;
! int i, j;
{
if (op == NULL || !PyTuple_Check(op)) {
--- 304,308 ----
PyObject *
! PyTuple_GetSlice(PyObject *op, int i, int j)
{
if (op == NULL || !PyTuple_Check(op)) {
***************
*** 337,343 ****
static PyObject *
! tupleconcat(a, bb)
! register PyTupleObject *a;
! register PyObject *bb;
{
register int size;
--- 314,318 ----
static PyObject *
! tupleconcat(register PyTupleObject *a, register PyObject *bb)
{
register int size;
***************
*** 371,377 ****
static PyObject *
! tuplerepeat(a, n)
! PyTupleObject *a;
! int n;
{
int i, j;
--- 346,350 ----
static PyObject *
! tuplerepeat(PyTupleObject *a, int n)
{
int i, j;
***************
*** 468,475 ****
int
! _PyTuple_Resize(pv, newsize, last_is_sticky)
! PyObject **pv;
! int newsize;
! int last_is_sticky;
{
register PyTupleObject *v;
--- 441,445 ----
int
! _PyTuple_Resize(PyObject **pv, int newsize, int last_is_sticky)
{
register PyTupleObject *v;
***************
*** 583,587 ****
void
! PyTuple_Fini()
{
#if MAXSAVESIZE > 0
--- 553,557 ----
void
! PyTuple_Fini(void)
{
#if MAXSAVESIZE > 0
Index: xxobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/xxobject.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** xxobject.c 2000/06/30 23:58:05 2.17
--- xxobject.c 2000/07/09 07:04:36 2.18
***************
*** 33,38 ****
static xxobject *
! newxxobject(arg)
! PyObject *arg;
{
xxobject *xp;
--- 33,37 ----
static xxobject *
! newxxobject(PyObject *arg)
{
xxobject *xp;
***************
*** 47,52 ****
static void
! xx_dealloc(xp)
! xxobject *xp;
{
Py_XDECREF(xp->x_attr);
--- 46,50 ----
static void
! xx_dealloc(xxobject *xp)
{
Py_XDECREF(xp->x_attr);
***************
*** 55,63 ****
static PyObject *
! xx_demo(self, args)
! xxobject *self;
! PyObject *args;
{
! if (!PyArg_NoArgs(args))
return NULL;
Py_INCREF(Py_None);
--- 53,59 ----
static PyObject *
! xx_demo(xxobject *self, PyObject *args)
{
! if (!PyArg_ParseTuple(args, ":demo"))
return NULL;
Py_INCREF(Py_None);
***************
*** 66,77 ****
static PyMethodDef xx_methods[] = {
! {"demo", (PyCFunction)xx_demo},
{NULL, NULL} /* sentinel */
};
static PyObject *
! xx_getattr(xp, name)
! xxobject *xp;
! char *name;
{
if (xp->x_attr != NULL) {
--- 62,71 ----
static PyMethodDef xx_methods[] = {
! {"demo", (PyCFunction)xx_demo, METH_VARARGS},
{NULL, NULL} /* sentinel */
};
static PyObject *
! xx_getattr(xxobject *xp, char *name)
{
if (xp->x_attr != NULL) {
***************
*** 86,93 ****
static int
! xx_setattr(xp, name, v)
! xxobject *xp;
! char *name;
! PyObject *v;
{
if (xp->x_attr == NULL) {
--- 80,84 ----
static int
! xx_setattr(xxobject *xp, char *name, PyObject *v)
{
if (xp->x_attr == NULL) {
***************
*** 100,104 ****
if (rv < 0)
PyErr_SetString(PyExc_AttributeError,
! "delete non-existing xx attribute");
return rv;
}
--- 91,95 ----
if (rv < 0)
PyErr_SetString(PyExc_AttributeError,
! "delete non-existing xx attribute");
return rv;
}