[Python-checkins] CVS: python/dist/src/Modules mpzmodule.c,2.28,2.29
Peter Schneider-Kamp
python-dev@python.org
Mon, 10 Jul 2000 10:14:02 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv8265
Modified Files:
mpzmodule.c
Log Message:
ANSI-fication, added #ifdef construction in mpz_coerce
Index: mpzmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -r2.28 -r2.29
*** mpzmodule.c 2000/07/09 03:09:55 2.28
--- mpzmodule.c 2000/07/10 17:14:00 2.29
***************
*** 116,123 ****
static PyObject *
! mpz_format(objp, base, withname)
! PyObject *objp;
! int base;
! unsigned char withname;
{
mpzobject *mpzp = (mpzobject *)objp;
--- 116,120 ----
static PyObject *
! mpz_format(PyObject *objp, int base, unsigned char withname)
{
mpzobject *mpzp = (mpzobject *)objp;
***************
*** 258,263 ****
static void
! mpz_dealloc(mpzp)
! mpzobject *mpzp;
{
#ifdef MPZ_DEBUG
--- 255,259 ----
static void
! mpz_dealloc(mpzobject *mpzp)
{
#ifdef MPZ_DEBUG
***************
*** 273,278 ****
static int
! mpz_compare(a, b)
! mpzobject *a, *b;
{
int cmpres;
--- 269,273 ----
static int
! mpz_compare(mpzobject *a, mpzobject *b)
{
int cmpres;
***************
*** 285,291 ****
static PyObject *
! mpz_addition(a, b)
! mpzobject *a;
! mpzobject *b;
{
mpzobject *z;
--- 280,284 ----
static PyObject *
! mpz_addition(mpzobject *a, mpzobject *b)
{
mpzobject *z;
***************
*** 312,318 ****
static PyObject *
! mpz_substract(a, b)
! mpzobject *a;
! mpzobject *b;
{
mpzobject *z;
--- 305,309 ----
static PyObject *
! mpz_substract(mpzobject *a, mpzobject *b)
{
mpzobject *z;
***************
*** 334,340 ****
static PyObject *
! mpz_multiply(a, b)
! mpzobject *a;
! mpzobject *b;
{
#ifdef MPZ_SPARE_MALLOC
--- 325,329 ----
static PyObject *
! mpz_multiply(mpzobject *a, mpzobject *b)
{
#ifdef MPZ_SPARE_MALLOC
***************
*** 373,379 ****
static PyObject *
! mpz_divide(a, b)
! mpzobject *a;
! mpzobject *b;
{
#ifdef MPZ_SPARE_MALLOC
--- 362,366 ----
static PyObject *
! mpz_divide(mpzobject *a, mpzobject *b)
{
#ifdef MPZ_SPARE_MALLOC
***************
*** 444,450 ****
static PyObject *
! mpz_remainder(a, b)
! mpzobject *a;
! mpzobject *b;
{
#ifdef MPZ_SPARE_MALLOC
--- 431,435 ----
static PyObject *
! mpz_remainder(mpzobject *a, mpzobject *b)
{
#ifdef MPZ_SPARE_MALLOC
***************
*** 515,521 ****
static PyObject *
! mpz_div_and_mod(a, b)
! mpzobject *a;
! mpzobject *b;
{
PyObject *z = NULL;
--- 500,504 ----
static PyObject *
! mpz_div_and_mod(mpzobject *a, mpzobject *b)
{
PyObject *z = NULL;
***************
*** 575,582 ****
static PyObject *
! mpz_power(a, b, m)
! mpzobject *a;
! mpzobject *b;
! mpzobject *m;
{
mpzobject *z;
--- 558,562 ----
static PyObject *
! mpz_power(mpzobject *a, mpzobject *b, mpzobject *m)
{
mpzobject *z;
***************
*** 669,674 ****
static PyObject *
! mpz_negative(v)
! mpzobject *v;
{
mpzobject *z;
--- 649,653 ----
static PyObject *
! mpz_negative(mpzobject *v)
{
mpzobject *z;
***************
*** 692,697 ****
static PyObject *
! mpz_positive(v)
! mpzobject *v;
{
Py_INCREF(v);
--- 671,675 ----
static PyObject *
! mpz_positive(mpzobject *v)
{
Py_INCREF(v);
***************
*** 701,706 ****
static PyObject *
! mpz_absolute(v)
! mpzobject *v;
{
mpzobject *z;
--- 679,683 ----
static PyObject *
! mpz_absolute(mpzobject *v)
{
mpzobject *z;
***************
*** 720,725 ****
static int
! mpz_nonzero(v)
! mpzobject *v;
{
return mpz_cmp_ui(&v->mpz, (unsigned long int)0) != 0;
--- 697,701 ----
static int
! mpz_nonzero(mpzobject *v)
{
return mpz_cmp_ui(&v->mpz, (unsigned long int)0) != 0;
***************
*** 727,732 ****
static PyObject *
! py_mpz_invert(v)
! mpzobject *v;
{
mpzobject *z;
--- 703,707 ----
static PyObject *
! py_mpz_invert(mpzobject *v)
{
mpzobject *z;
***************
*** 742,748 ****
static PyObject *
! mpz_lshift(a, b)
! mpzobject *a;
! mpzobject *b;
{
int cmpres;
--- 717,721 ----
static PyObject *
! mpz_lshift(mpzobject *a, mpzobject *b)
{
int cmpres;
***************
*** 782,788 ****
static PyObject *
! mpz_rshift(a, b)
! mpzobject *a;
! mpzobject *b;
{
int cmpres;
--- 755,759 ----
static PyObject *
! mpz_rshift(mpzobject *a, mpzobject *b)
{
int cmpres;
***************
*** 813,819 ****
static PyObject *
! mpz_andfunc(a, b)
! mpzobject *a;
! mpzobject *b;
{
mpzobject *z;
--- 784,788 ----
static PyObject *
! mpz_andfunc(mpzobject *a, mpzobject *b)
{
mpzobject *z;
***************
*** 829,836 ****
/* hack Hack HAck HACk HACK, XXX this code is dead slow */
void
! mpz_xor(res, op1, op2)
! MP_INT *res;
! const MP_INT *op1;
! const MP_INT *op2;
{
MP_INT tmpmpz;
--- 798,802 ----
/* hack Hack HAck HACk HACK, XXX this code is dead slow */
void
! mpz_xor(MP_INT *res, const MP_INT *op1, const MP_INT *op2)
{
MP_INT tmpmpz;
***************
*** 847,853 ****
static PyObject *
! mpz_xorfunc(a, b)
! mpzobject *a;
! mpzobject *b;
{
mpzobject *z;
--- 813,817 ----
static PyObject *
! mpz_xorfunc(mpzobject *a, mpzobject *b)
{
mpzobject *z;
***************
*** 862,868 ****
static PyObject *
! mpz_orfunc(a, b)
! mpzobject *a;
! mpzobject *b;
{
mpzobject *z;
--- 826,830 ----
static PyObject *
! mpz_orfunc(mpzobject *a, mpzobject *b)
{
mpzobject *z;
***************
*** 881,887 ****
static PyObject *
! MPZ_mpz(self, args)
! PyObject *self;
! PyObject *args;
{
mpzobject *mpzp;
--- 843,847 ----
static PyObject *
! MPZ_mpz(PyObject *self, PyObject *args)
{
mpzobject *mpzp;
***************
*** 994,999 ****
static mpzobject *
! mpz_mpzcoerce(z)
! PyObject *z;
{
/* shortcut: 9 out of 10 times the type is already ok */
--- 954,958 ----
static mpzobject *
! mpz_mpzcoerce(PyObject *z)
{
/* shortcut: 9 out of 10 times the type is already ok */
***************
*** 1017,1023 ****
static PyObject *
! MPZ_powm(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *base, *exp, *mod;
--- 976,980 ----
static PyObject *
! MPZ_powm(PyObject *self, PyObject *args)
{
PyObject *base, *exp, *mod;
***************
*** 1070,1076 ****
static PyObject *
! MPZ_gcd(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *op1, *op2;
--- 1027,1031 ----
static PyObject *
! MPZ_gcd(PyObject *self, PyObject *args)
{
PyObject *op1, *op2;
***************
*** 1101,1107 ****
static PyObject *
! MPZ_gcdext(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *op1, *op2, *z = NULL;
--- 1056,1060 ----
static PyObject *
! MPZ_gcdext(PyObject *self, PyObject *args)
{
PyObject *op1, *op2, *z = NULL;
***************
*** 1142,1148 ****
static PyObject *
! MPZ_sqrt(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *op;
--- 1095,1099 ----
static PyObject *
! MPZ_sqrt(PyObject *self, PyObject *args)
{
PyObject *op;
***************
*** 1169,1175 ****
static PyObject *
! MPZ_sqrtrem(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *op, *z = NULL;
--- 1120,1124 ----
static PyObject *
! MPZ_sqrtrem(PyObject *self, PyObject *args)
{
PyObject *op, *z = NULL;
***************
*** 1204,1216 ****
static void
- #if __STDC__
mpz_divm(MP_INT *res, const MP_INT *num, const MP_INT *den, const MP_INT *mod)
- #else
- mpz_divm(res, num, den, mod)
- MP_INT *res;
- const MP_INT *num;
- const MP_INT *den;
- const MP_INT *mod;
- #endif
{
MP_INT s0, s1, q, r, x, d0, d1;
--- 1153,1157 ----
***************
*** 1275,1281 ****
static PyObject *
! MPZ_divm(self, args)
! PyObject *self;
! PyObject *args;
{
PyObject *num, *den, *mod;
--- 1216,1220 ----
static PyObject *
! MPZ_divm(PyObject *self, PyObject *args)
{
PyObject *num, *den, *mod;
***************
*** 1317,1327 ****
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_int(self, args)
! mpzobject *self;
! PyObject *args;
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_int(self)
! mpzobject *self;
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
--- 1256,1263 ----
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_int(mpzobject *self, PyObject *args)
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_int(mpzobject *self)
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
***************
*** 1349,1358 ****
static PyObject *
#ifdef MPZ_CONVERSIONS_AS_METHODS
! mpz_long(self, args)
! mpzobject *self;
! PyObject *args;
#else /* def MPZ_CONVERSIONS_AS_METHODS */
! mpz_long(self)
! mpzobject *self;
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
--- 1285,1291 ----
static PyObject *
#ifdef MPZ_CONVERSIONS_AS_METHODS
! mpz_long(mpzobject *self, PyObject *args)
#else /* def MPZ_CONVERSIONS_AS_METHODS */
! mpz_long(mpzobject *self)
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
***************
*** 1432,1442 ****
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_float(self, args)
! mpzobject *self;
! PyObject *args;
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_float(self)
! mpzobject *self;
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
--- 1365,1372 ----
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_float(mpzobject *self, PyObject *args)
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_float(mpzobject *self)
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
***************
*** 1489,1499 ****
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_hex(self, args)
! mpzobject *self;
! PyObject *args;
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_hex(self)
! mpzobject *self;
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
--- 1419,1426 ----
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_hex(mpzobject *self, PyObject *args)
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_hex(mpzobject *self)
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
***************
*** 1503,1518 ****
#endif /* def MPZ_CONVERSIONS_AS_METHODS */
! return mpz_format(self, 16, (unsigned char)1);
} /* mpz_hex() */
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_oct(self, args)
! mpzobject *self;
! PyObject *args;
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_oct(self)
! mpzobject *self;
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
--- 1430,1442 ----
#endif /* def MPZ_CONVERSIONS_AS_METHODS */
! return mpz_format((PyObject *)self, 16, (unsigned char)1);
} /* mpz_hex() */
#ifdef MPZ_CONVERSIONS_AS_METHODS
static PyObject *
! mpz_oct(mpzobject *self, PyObject *args)
#else /* def MPZ_CONVERSIONS_AS_METHODS */
static PyObject *
! mpz_oct(mpzobject *self)
#endif /* def MPZ_CONVERSIONS_AS_METHODS else */
{
***************
*** 1522,1532 ****
#endif /* def MPZ_CONVERSIONS_AS_METHODS */
! return mpz_format(self, 8, (unsigned char)1);
} /* mpz_oct() */
static PyObject *
! mpz_binary(self, args)
! mpzobject *self;
! PyObject *args;
{
int size;
--- 1446,1454 ----
#endif /* def MPZ_CONVERSIONS_AS_METHODS */
! return mpz_format((PyObject *)self, 8, (unsigned char)1);
} /* mpz_oct() */
static PyObject *
! mpz_binary(mpzobject *self, PyObject *args)
{
int size;
***************
*** 1587,1593 ****
static PyObject *
! mpz_getattr(self, name)
! mpzobject *self;
! char *name;
{
return Py_FindMethod(mpz_methods, (PyObject *)self, name);
--- 1509,1513 ----
static PyObject *
! mpz_getattr(mpzobject *self, char *name)
{
return Py_FindMethod(mpz_methods, (PyObject *)self, name);
***************
*** 1596,1602 ****
static int
! mpz_coerce(pv, pw)
! PyObject **pv;
! PyObject **pw;
{
PyObject *z;
--- 1516,1520 ----
static int
! mpz_coerce(PyObject **pv, PyObject **pw)
{
PyObject *z;
***************
*** 1617,1622 ****
}
else {
! if ((z = mpz_float(*pv, NULL)) == NULL)
return -1;
Py_INCREF(*pw);
--- 1535,1545 ----
}
else {
! #ifdef MPZ_CONVERSIONS_AS_METHODS
! if ((z = mpz_float((mpzobject *)(*pv), NULL)) == NULL)
! return -1;
! #else /* def MPZ_CONVERSIONS_AS_METHODS */
! if ((z = mpz_float((mpzobject *)(*pv))) == NULL)
return -1;
+ #endif /* def MPZ_CONVERSIONS_AS_METHODS else */
Py_INCREF(*pw);
***************
*** 1629,1634 ****
static PyObject *
! mpz_repr(v)
! PyObject *v;
{
return mpz_format(v, 10, (unsigned char)1);
--- 1552,1556 ----
static PyObject *
! mpz_repr(PyObject *v)
{
return mpz_format(v, 10, (unsigned char)1);
***************
*** 1731,1736 ****
#endif /* def MP_TEST_ALLOC else */
! void *mp_allocate( alloc_size )
! size_t alloc_size;
{
void *res;
--- 1653,1657 ----
#endif /* def MP_TEST_ALLOC else */
! void *mp_allocate(size_t alloc_size)
{
void *res;
***************
*** 1754,1761 ****
! void *mp_reallocate( ptr, old_size, new_size )
! void *ptr;
! size_t old_size;
! size_t new_size;
{
void *res;
--- 1675,1679 ----
! void *mp_reallocate(void *ptr, size_t old_size, size_t new_size)
{
void *res;
***************
*** 1782,1788 ****
! void mp_free( ptr, size )
! void *ptr;
! size_t size;
{
--- 1700,1704 ----
! void mp_free(void *ptr, size_t size)
{