[Python-checkins] CVS: python/dist/src/Objects object.c,2.84,2.85
Fred L. Drake
python-dev@python.org
Sun, 9 Jul 2000 08:48:52 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv16646
Modified Files:
object.c
Log Message:
ANSI-fication of the sources.
Index: object.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v
retrieving revision 2.84
retrieving revision 2.85
diff -C2 -r2.84 -r2.85
*** object.c 2000年07月09日 03:09:56 2.84
--- object.c 2000年07月09日 15:48:49 2.85
***************
*** 34,38 ****
extern int null_strings, one_strings;
void
! dump_counts()
{
PyTypeObject *tp;
--- 34,38 ----
extern int null_strings, one_strings;
void
! dump_counts(void)
{
PyTypeObject *tp;
***************
*** 51,55 ****
PyObject *
! get_counts()
{
PyTypeObject *tp;
--- 51,55 ----
PyObject *
! get_counts(void)
{
PyTypeObject *tp;
***************
*** 78,83 ****
void
! inc_count(tp)
! PyTypeObject *tp;
{
if (tp->tp_alloc == 0) {
--- 78,82 ----
void
! inc_count(PyTypeObject *tp)
{
if (tp->tp_alloc == 0) {
***************
*** 95,101 ****
PyObject *
! PyObject_Init(op, tp)
! PyObject *op;
! PyTypeObject *tp;
{
if (op == NULL) {
--- 94,98 ----
PyObject *
! PyObject_Init(PyObject *op, PyTypeObject *tp)
{
if (op == NULL) {
***************
*** 115,122 ****
PyVarObject *
! PyObject_InitVar(op, tp, size)
! PyVarObject *op;
! PyTypeObject *tp;
! int size;
{
if (op == NULL) {
--- 112,116 ----
PyVarObject *
! PyObject_InitVar(PyVarObject *op, PyTypeObject *tp, int size)
{
if (op == NULL) {
***************
*** 137,142 ****
PyObject *
! _PyObject_New(tp)
! PyTypeObject *tp;
{
PyObject *op;
--- 131,135 ----
PyObject *
! _PyObject_New(PyTypeObject *tp)
{
PyObject *op;
***************
*** 152,158 ****
PyVarObject *
! _PyObject_NewVar(tp, size)
! PyTypeObject *tp;
! int size;
{
PyVarObject *op;
--- 145,149 ----
PyVarObject *
! _PyObject_NewVar(PyTypeObject *tp, int size)
{
PyVarObject *op;
***************
*** 168,173 ****
void
! _PyObject_Del(op)
! PyObject *op;
{
#ifdef WITH_CYCLE_GC
--- 159,163 ----
void
! _PyObject_Del(PyObject *op)
{
#ifdef WITH_CYCLE_GC
***************
*** 186,193 ****
int
! PyObject_Print(op, fp, flags)
! PyObject *op;
! FILE *fp;
! int flags;
{
int ret = 0;
--- 176,180 ----
int
! PyObject_Print(PyObject *op, FILE *fp, int flags)
{
int ret = 0;
***************
*** 242,247 ****
PyObject *
! PyObject_Repr(v)
! PyObject *v;
{
if (PyErr_CheckSignals())
--- 229,233 ----
PyObject *
! PyObject_Repr(PyObject *v)
{
if (PyErr_CheckSignals())
***************
*** 287,292 ****
PyObject *
! PyObject_Str(v)
! PyObject *v;
{
PyObject *res;
--- 273,277 ----
PyObject *
! PyObject_Str(PyObject *v)
{
PyObject *res;
***************
*** 332,337 ****
static PyObject *
! do_cmp(v, w)
! PyObject *v, *w;
{
long c;
--- 317,321 ----
static PyObject *
! do_cmp(PyObject *v, PyObject *w)
{
long c;
***************
*** 358,362 ****
static PyObject*
! get_inprogress_dict()
{
PyObject *tstate_dict, *inprogress;
--- 342,346 ----
static PyObject*
! get_inprogress_dict(void)
{
PyObject *tstate_dict, *inprogress;
***************
*** 384,389 ****
static PyObject *
! make_pair(v, w)
! PyObject *v, *w;
{
PyObject *pair;
--- 368,372 ----
static PyObject *
! make_pair(PyObject *v, PyObject *w)
{
PyObject *pair;
***************
*** 404,409 ****
int
! PyObject_Compare(v, w)
! PyObject *v, *w;
{
PyTypeObject *vtp, *wtp;
--- 387,391 ----
int
! PyObject_Compare(PyObject *v, PyObject *w)
{
PyTypeObject *vtp, *wtp;
***************
*** 542,547 ****
long
! _Py_HashDouble(v)
! double v;
{
/* Use frexp to get at the bits in the double.
--- 524,528 ----
long
! _Py_HashDouble(double v)
{
/* Use frexp to get at the bits in the double.
***************
*** 567,572 ****
long
! _Py_HashPointer(p)
! void *p;
{
#if SIZEOF_LONG >= SIZEOF_VOID_P
--- 548,552 ----
long
! _Py_HashPointer(void *p)
{
#if SIZEOF_LONG >= SIZEOF_VOID_P
***************
*** 591,596 ****
long
! PyObject_Hash(v)
! PyObject *v;
{
PyTypeObject *tp = v->ob_type;
--- 571,575 ----
long
! PyObject_Hash(PyObject *v)
{
PyTypeObject *tp = v->ob_type;
***************
*** 606,612 ****
PyObject *
! PyObject_GetAttrString(v, name)
! PyObject *v;
! char *name;
{
if (v->ob_type->tp_getattro != NULL) {
--- 585,589 ----
PyObject *
! PyObject_GetAttrString(PyObject *v, char *name)
{
if (v->ob_type->tp_getattro != NULL) {
***************
*** 633,639 ****
int
! PyObject_HasAttrString(v, name)
! PyObject *v;
! char *name;
{
PyObject *res = PyObject_GetAttrString(v, name);
--- 610,614 ----
int
! PyObject_HasAttrString(PyObject *v, char *name)
{
PyObject *res = PyObject_GetAttrString(v, name);
***************
*** 647,654 ****
int
! PyObject_SetAttrString(v, name, w)
! PyObject *v;
! char *name;
! PyObject *w;
{
if (v->ob_type->tp_setattro != NULL) {
--- 622,626 ----
int
! PyObject_SetAttrString(PyObject *v, char *name, PyObject *w)
{
if (v->ob_type->tp_setattro != NULL) {
***************
*** 678,684 ****
PyObject *
! PyObject_GetAttr(v, name)
! PyObject *v;
! PyObject *name;
{
if (v->ob_type->tp_getattro != NULL)
--- 650,654 ----
PyObject *
! PyObject_GetAttr(PyObject *v, PyObject *name)
{
if (v->ob_type->tp_getattro != NULL)
***************
*** 694,700 ****
int
! PyObject_HasAttr(v, name)
! PyObject *v;
! PyObject *name;
{
PyObject *res = PyObject_GetAttr(v, name);
--- 664,668 ----
int
! PyObject_HasAttr(PyObject *v, PyObject *name)
{
PyObject *res = PyObject_GetAttr(v, name);
***************
*** 708,715 ****
int
! PyObject_SetAttr(v, name, value)
! PyObject *v;
! PyObject *name;
! PyObject *value;
{
int err;
--- 676,680 ----
int
! PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value)
{
int err;
***************
*** 736,741 ****
int
! PyObject_IsTrue(v)
! PyObject *v;
{
int res;
--- 701,705 ----
int
! PyObject_IsTrue(PyObject *v)
{
int res;
***************
*** 762,767 ****
int
! PyObject_Not(v)
! PyObject *v;
{
int res;
--- 726,730 ----
int
! PyObject_Not(PyObject *v)
{
int res;
***************
*** 779,784 ****
int
! PyNumber_CoerceEx(pv, pw)
! PyObject **pv, **pw;
{
register PyObject *v = *pv;
--- 742,746 ----
int
! PyNumber_CoerceEx(PyObject **pv, PyObject **pw)
{
register PyObject *v = *pv;
***************
*** 805,810 ****
int
! PyNumber_Coerce(pv, pw)
! PyObject **pv, **pw;
{
int err = PyNumber_CoerceEx(pv, pw);
--- 767,771 ----
int
! PyNumber_Coerce(PyObject **pv, PyObject **pw)
{
int err = PyNumber_CoerceEx(pv, pw);
***************
*** 819,824 ****
int
! PyCallable_Check(x)
! PyObject *x;
{
if (x == NULL)
--- 780,784 ----
int
! PyCallable_Check(PyObject *x)
{
if (x == NULL)
***************
*** 853,858 ****
/* ARGSUSED */
static PyObject *
! none_repr(op)
! PyObject *op;
{
return PyString_FromString("None");
--- 813,817 ----
/* ARGSUSED */
static PyObject *
! none_repr(PyObject *op)
{
return PyString_FromString("None");
***************
*** 887,891 ****
void
! _Py_ResetReferences()
{
refchain._ob_prev = refchain._ob_next = &refchain;
--- 846,850 ----
void
! _Py_ResetReferences(void)
{
refchain._ob_prev = refchain._ob_next = &refchain;
***************
*** 894,899 ****
void
! _Py_NewReference(op)
! PyObject *op;
{
_Py_RefTotal++;
--- 853,857 ----
void
! _Py_NewReference(PyObject *op)
{
_Py_RefTotal++;
***************
*** 909,914 ****
void
! _Py_ForgetReference(op)
! register PyObject *op;
{
#ifdef SLOW_UNREF_CHECK
--- 867,871 ----
void
! _Py_ForgetReference(register PyObject *op)
{
#ifdef SLOW_UNREF_CHECK
***************
*** 937,942 ****
void
! _Py_Dealloc(op)
! PyObject *op;
{
destructor dealloc = op->ob_type->tp_dealloc;
--- 894,898 ----
void
! _Py_Dealloc(PyObject *op)
{
destructor dealloc = op->ob_type->tp_dealloc;
***************
*** 950,955 ****
void
! _Py_PrintReferences(fp)
! FILE *fp;
{
PyObject *op;
--- 906,910 ----
void
! _Py_PrintReferences(FILE *fp)
{
PyObject *op;
***************
*** 964,970 ****
PyObject *
! _Py_GetObjects(self, args)
! PyObject *self;
! PyObject *args;
{
int i, n;
--- 919,923 ----
PyObject *
! _Py_GetObjects(PyObject *self, PyObject *args)
{
int i, n;
***************
*** 1008,1013 ****
ANY *
! PyMem_Malloc(nbytes)
! size_t nbytes;
{
#if _PyMem_EXTRA > 0
--- 961,965 ----
ANY *
! PyMem_Malloc(size_t nbytes)
{
#if _PyMem_EXTRA > 0
***************
*** 1019,1025 ****
ANY *
! PyMem_Realloc(p, nbytes)
! ANY *p;
! size_t nbytes;
{
#if _PyMem_EXTRA > 0
--- 971,975 ----
ANY *
! PyMem_Realloc(ANY *p, size_t nbytes)
{
#if _PyMem_EXTRA > 0
***************
*** 1031,1036 ****
void
! PyMem_Free(p)
! ANY *p;
{
PyMem_FREE(p);
--- 981,985 ----
void
! PyMem_Free(ANY *p)
{
PyMem_FREE(p);
***************
*** 1041,1046 ****
ANY *
! PyObject_Malloc(nbytes)
! size_t nbytes;
{
return PyObject_MALLOC(nbytes);
--- 990,994 ----
ANY *
! PyObject_Malloc(size_t nbytes)
{
return PyObject_MALLOC(nbytes);
***************
*** 1048,1054 ****
ANY *
! PyObject_Realloc(p, nbytes)
! ANY *p;
! size_t nbytes;
{
return PyObject_REALLOC(p, nbytes);
--- 996,1000 ----
ANY *
! PyObject_Realloc(ANY *p, size_t nbytes)
{
return PyObject_REALLOC(p, nbytes);
***************
*** 1056,1061 ****
void
! PyObject_Free(p)
! ANY *p;
{
PyObject_FREE(p);
--- 1002,1006 ----
void
! PyObject_Free(ANY *p)
{
PyObject_FREE(p);
***************
*** 1078,1083 ****
int
! Py_ReprEnter(obj)
! PyObject *obj;
{
PyObject *dict;
--- 1023,1027 ----
int
! Py_ReprEnter(PyObject *obj)
{
PyObject *dict;
***************
*** 1107,1112 ****
void
! Py_ReprLeave(obj)
! PyObject *obj;
{
PyObject *dict;
--- 1051,1055 ----
void
! Py_ReprLeave(PyObject *obj)
{
PyObject *dict;
***************
*** 1166,1171 ****
void
! _PyTrash_deposit_object(op)
! PyObject *op;
{
int typecode;
--- 1109,1113 ----
void
! _PyTrash_deposit_object(PyObject *op)
{
int typecode;
***************
*** 1188,1192 ****
void
! _PyTrash_destroy_chain()
{
while (_PyTrash_delete_later) {
--- 1130,1134 ----
void
! _PyTrash_destroy_chain(void)
{
while (_PyTrash_delete_later) {
***************
*** 1218,1220 ****
}
}
-
--- 1160,1161 ----