[Python-checkins] CVS: python/dist/src/Objects fileobject.c,2.79,2.80 floatobject.c,2.62,2.63
Fred L. Drake
python-dev@python.org
Sat, 8 Jul 2000 22:02:21 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28114
Modified Files:
fileobject.c floatobject.c
Log Message:
ANSI-fication of the sources.
Index: fileobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.79
retrieving revision 2.80
diff -C2 -r2.79 -r2.80
*** fileobject.c 2000/07/09 03:09:56 2.79
--- fileobject.c 2000/07/09 05:02:18 2.80
***************
*** 77,82 ****
FILE *
! PyFile_AsFile(f)
! PyObject *f;
{
if (f == NULL || !PyFile_Check(f))
--- 77,81 ----
FILE *
! PyFile_AsFile(PyObject *f)
{
if (f == NULL || !PyFile_Check(f))
***************
*** 87,92 ****
PyObject *
! PyFile_Name(f)
! PyObject *f;
{
if (f == NULL || !PyFile_Check(f))
--- 86,90 ----
PyObject *
! PyFile_Name(PyObject *f)
{
if (f == NULL || !PyFile_Check(f))
***************
*** 97,105 ****
PyObject *
! PyFile_FromFile(fp, name, mode, close)
! FILE *fp;
! char *name;
! char *mode;
! int (*close)(FILE *);
{
PyFileObject *f = PyObject_NEW(PyFileObject, &PyFile_Type);
--- 95,99 ----
PyObject *
! PyFile_FromFile(FILE *fp, char *name, char *mode, int (*close)(FILE *))
{
PyFileObject *f = PyObject_NEW(PyFileObject, &PyFile_Type);
***************
*** 124,129 ****
PyObject *
! PyFile_FromString(name, mode)
! char *name, *mode;
{
extern int fclose(FILE *);
--- 118,122 ----
PyObject *
! PyFile_FromString(char *name, char *mode)
{
extern int fclose(FILE *);
***************
*** 161,167 ****
void
! PyFile_SetBufSize(f, bufsize)
! PyObject *f;
! int bufsize;
{
if (bufsize >= 0) {
--- 154,158 ----
void
! PyFile_SetBufSize(PyObject *f, int bufsize)
{
if (bufsize >= 0) {
***************
*** 189,193 ****
static PyObject *
! err_closed()
{
PyErr_SetString(PyExc_ValueError, "I/O operation on closed file");
--- 180,184 ----
static PyObject *
! err_closed(void)
{
PyErr_SetString(PyExc_ValueError, "I/O operation on closed file");
***************
*** 198,203 ****
static void
! file_dealloc(f)
! PyFileObject *f;
{
if (f->f_fp != NULL && f->f_close != NULL) {
--- 189,193 ----
static void
! file_dealloc(PyFileObject *f)
{
if (f->f_fp != NULL && f->f_close != NULL) {
***************
*** 216,221 ****
static PyObject *
! file_repr(f)
! PyFileObject *f;
{
char buf[300];
--- 206,210 ----
static PyObject *
! file_repr(PyFileObject *f)
{
char buf[300];
***************
*** 229,235 ****
static PyObject *
! file_close(f, args)
! PyFileObject *f;
! PyObject *args;
{
int sts = 0;
--- 218,222 ----
static PyObject *
! file_close(PyFileObject *f, PyObject *args)
{
int sts = 0;
***************
*** 254,260 ****
static PyObject *
! file_seek(f, args)
! PyFileObject *f;
! PyObject *args;
{
int whence;
--- 241,245 ----
static PyObject *
! file_seek(PyFileObject *f, PyObject *args)
{
int whence;
***************
*** 297,303 ****
#ifdef HAVE_FTRUNCATE
static PyObject *
! file_truncate(f, args)
! PyFileObject *f;
! PyObject *args;
{
int ret;
--- 282,286 ----
#ifdef HAVE_FTRUNCATE
static PyObject *
! file_truncate(PyFileObject *f, PyObject *args)
{
int ret;
***************
*** 359,365 ****
static PyObject *
! file_tell(f, args)
! PyFileObject *f;
! PyObject *args;
{
off_t offset;
--- 342,346 ----
static PyObject *
! file_tell(PyFileObject *f, PyObject *args)
{
off_t offset;
***************
*** 391,397 ****
static PyObject *
! file_fileno(f, args)
! PyFileObject *f;
! PyObject *args;
{
if (f->f_fp == NULL)
--- 372,376 ----
static PyObject *
! file_fileno(PyFileObject *f, PyObject *args)
{
if (f->f_fp == NULL)
***************
*** 403,409 ****
static PyObject *
! file_flush(f, args)
! PyFileObject *f;
! PyObject *args;
{
int res;
--- 382,386 ----
static PyObject *
! file_flush(PyFileObject *f, PyObject *args)
{
int res;
***************
*** 427,433 ****
static PyObject *
! file_isatty(f, args)
! PyFileObject *f;
! PyObject *args;
{
long res;
--- 404,408 ----
static PyObject *
! file_isatty(PyFileObject *f, PyObject *args)
{
long res;
***************
*** 456,462 ****
static size_t
! new_buffersize(f, currentsize)
! PyFileObject *f;
! size_t currentsize;
{
#ifdef HAVE_FSTAT
--- 431,435 ----
static size_t
! new_buffersize(PyFileObject *f, size_t currentsize)
{
#ifdef HAVE_FSTAT
***************
*** 496,502 ****
static PyObject *
! file_read(f, args)
! PyFileObject *f;
! PyObject *args;
{
long bytesrequested = -1;
--- 469,473 ----
static PyObject *
! file_read(PyFileObject *f, PyObject *args)
{
long bytesrequested = -1;
***************
*** 545,551 ****
static PyObject *
! file_readinto(f, args)
! PyFileObject *f;
! PyObject *args;
{
char *ptr;
--- 516,520 ----
static PyObject *
! file_readinto(PyFileObject *f, PyObject *args)
{
char *ptr;
***************
*** 584,590 ****
static PyObject *
! get_line(f, n)
! PyFileObject *f;
! int n;
{
register FILE *fp;
--- 553,557 ----
static PyObject *
! get_line(PyFileObject *f, int n)
{
register FILE *fp;
***************
*** 649,655 ****
PyObject *
! PyFile_GetLine(f, n)
! PyObject *f;
! int n;
{
if (f == NULL) {
--- 616,620 ----
PyObject *
! PyFile_GetLine(PyObject *f, int n)
{
if (f == NULL) {
***************
*** 712,718 ****
static PyObject *
! file_readline(f, args)
! PyFileObject *f;
! PyObject *args;
{
int n = -1;
--- 677,681 ----
static PyObject *
! file_readline(PyFileObject *f, PyObject *args)
{
int n = -1;
***************
*** 730,736 ****
static PyObject *
! file_readlines(f, args)
! PyFileObject *f;
! PyObject *args;
{
long sizehint = 0;
--- 693,697 ----
static PyObject *
! file_readlines(PyFileObject *f, PyObject *args)
{
long sizehint = 0;
***************
*** 843,849 ****
static PyObject *
! file_write(f, args)
! PyFileObject *f;
! PyObject *args;
{
char *s;
--- 804,808 ----
static PyObject *
! file_write(PyFileObject *f, PyObject *args)
{
char *s;
***************
*** 868,874 ****
static PyObject *
! file_writelines(f, args)
! PyFileObject *f;
! PyObject *args;
{
#define CHUNKSIZE 1000
--- 827,831 ----
static PyObject *
! file_writelines(PyFileObject *f, PyObject *args)
{
#define CHUNKSIZE 1000
***************
*** 993,999 ****
static PyObject *
! file_getattr(f, name)
! PyFileObject *f;
! char *name;
{
PyObject *res;
--- 950,954 ----
static PyObject *
! file_getattr(PyFileObject *f, char *name)
{
PyObject *res;
***************
*** 1009,1016 ****
static int
! file_setattr(f, name, v)
! PyFileObject *f;
! char *name;
! PyObject *v;
{
if (v == NULL) {
--- 964,968 ----
static int
! file_setattr(PyFileObject *f, char *name, PyObject *v)
{
if (v == NULL) {
***************
*** 1039,1045 ****
int
! PyFile_SoftSpace(f, newflag)
! PyObject *f;
! int newflag;
{
int oldflag = 0;
--- 991,995 ----
int
! PyFile_SoftSpace(PyObject *f, int newflag)
{
int oldflag = 0;
***************
*** 1076,1083 ****
int
! PyFile_WriteObject(v, f, flags)
! PyObject *v;
! PyObject *f;
! int flags;
{
PyObject *writer, *value, *args, *result;
--- 1026,1030 ----
int
! PyFile_WriteObject(PyObject *v, PyObject *f, int flags)
{
PyObject *writer, *value, *args, *result;
***************
*** 1122,1132 ****
int
! PyFile_WriteString(s, f)
! char *s;
! PyObject *f;
{
if (f == NULL) {
/* Should be caused by a pre-existing error */
! if(!PyErr_Occurred())
PyErr_SetString(PyExc_SystemError,
"null file for PyFile_WriteString");
--- 1069,1077 ----
int
! PyFile_WriteString(char *s, PyObject *f)
{
if (f == NULL) {
/* Should be caused by a pre-existing error */
! if (!PyErr_Occurred())
PyErr_SetString(PyExc_SystemError,
"null file for PyFile_WriteString");
Index: floatobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/floatobject.c,v
retrieving revision 2.62
retrieving revision 2.63
diff -C2 -r2.62 -r2.63
*** floatobject.c 2000/07/09 03:09:56 2.62
--- floatobject.c 2000/07/09 05:02:18 2.63
***************
*** 95,99 ****
static PyFloatObject *
! fill_free_list()
{
PyFloatObject *p, *q;
--- 95,99 ----
static PyFloatObject *
! fill_free_list(void)
{
PyFloatObject *p, *q;
***************
*** 134,140 ****
PyObject *
! PyFloat_FromString(v, pend)
! PyObject *v;
! char **pend;
{
extern double strtod(const char *, char **);
--- 134,138 ----
PyObject *
! PyFloat_FromString(PyObject *v, char **pend)
{
extern double strtod(const char *, char **);
***************
*** 208,213 ****
static void
! float_dealloc(op)
! PyFloatObject *op;
{
op->ob_type = (struct _typeobject *)free_list;
--- 206,210 ----
static void
! float_dealloc(PyFloatObject *op)
{
op->ob_type = (struct _typeobject *)free_list;
***************
*** 216,221 ****
double
! PyFloat_AsDouble(op)
! PyObject *op;
{
PyNumberMethods *nb;
--- 213,217 ----
double
! PyFloat_AsDouble(PyObject *op)
{
PyNumberMethods *nb;
***************
*** 250,257 ****
void
! PyFloat_AsStringEx(buf, v, precision)
! char *buf;
! PyFloatObject *v;
! int precision;
{
register char *cp;
--- 246,250 ----
void
! PyFloat_AsStringEx(char *buf, PyFloatObject *v, int precision)
{
register char *cp;
***************
*** 296,302 ****
void
! PyFloat_AsString(buf, v)
! char *buf;
! PyFloatObject *v;
{
PyFloat_AsStringEx(buf, v, PREC_STR);
--- 289,293 ----
void
! PyFloat_AsString(char *buf, PyFloatObject *v)
{
PyFloat_AsStringEx(buf, v, PREC_STR);
***************
*** 305,312 ****
/* ARGSUSED */
static int
! float_print(v, fp, flags)
! PyFloatObject *v;
! FILE *fp;
! int flags; /* Not used but required by interface */
{
char buf[100];
--- 296,301 ----
/* ARGSUSED */
static int
! float_print(PyFloatObject *v, FILE *fp, int flags)
! /* flags -- not used but required by interface */
{
char buf[100];
***************
*** 317,322 ****
static PyObject *
! float_repr(v)
! PyFloatObject *v;
{
char buf[100];
--- 306,310 ----
static PyObject *
! float_repr(PyFloatObject *v)
{
char buf[100];
***************
*** 326,331 ****
static PyObject *
! float_str(v)
! PyFloatObject *v;
{
char buf[100];
--- 314,318 ----
static PyObject *
! float_str(PyFloatObject *v)
{
char buf[100];
***************
*** 335,340 ****
static int
! float_compare(v, w)
! PyFloatObject *v, *w;
{
double i = v->ob_fval;
--- 322,326 ----
static int
! float_compare(PyFloatObject *v, PyFloatObject *w)
{
double i = v->ob_fval;
***************
*** 345,350 ****
static long
! float_hash(v)
! PyFloatObject *v;
{
double intpart, fractpart;
--- 331,335 ----
static long
! float_hash(PyFloatObject *v)
{
double intpart, fractpart;
***************
*** 389,395 ****
static PyObject *
! float_add(v, w)
! PyFloatObject *v;
! PyFloatObject *w;
{
double result;
--- 374,378 ----
static PyObject *
! float_add(PyFloatObject *v, PyFloatObject *w)
{
double result;
***************
*** 401,407 ****
static PyObject *
! float_sub(v, w)
! PyFloatObject *v;
! PyFloatObject *w;
{
double result;
--- 384,388 ----
static PyObject *
! float_sub(PyFloatObject *v, PyFloatObject *w)
{
double result;
***************
*** 413,419 ****
static PyObject *
! float_mul(v, w)
! PyFloatObject *v;
! PyFloatObject *w;
{
double result;
--- 394,398 ----
static PyObject *
! float_mul(PyFloatObject *v, PyFloatObject *w)
{
double result;
***************
*** 426,432 ****
static PyObject *
! float_div(v, w)
! PyFloatObject *v;
! PyFloatObject *w;
{
double result;
--- 405,409 ----
static PyObject *
! float_div(PyFloatObject *v, PyFloatObject *w)
{
double result;
***************
*** 442,448 ****
static PyObject *
! float_rem(v, w)
! PyFloatObject *v;
! PyFloatObject *w;
{
double vx, wx;
--- 419,423 ----
static PyObject *
! float_rem(PyFloatObject *v, PyFloatObject *w)
{
double vx, wx;
***************
*** 466,472 ****
static PyObject *
! float_divmod(v, w)
! PyFloatObject *v;
! PyFloatObject *w;
{
double vx, wx;
--- 441,445 ----
static PyObject *
! float_divmod(PyFloatObject *v, PyFloatObject *w)
{
double vx, wx;
***************
*** 501,507 ****
}
! static double powu(x, n)
! double x;
! long n;
{
double r = 1.;
--- 474,478 ----
}
! static double powu(double x, long n)
{
double r = 1.;
***************
*** 518,525 ****
static PyObject *
! float_pow(v, w, z)
! PyFloatObject *v;
! PyObject *w;
! PyFloatObject *z;
{
double iv, iw, ix;
--- 489,493 ----
static PyObject *
! float_pow(PyFloatObject *v, PyObject *w, PyFloatObject *z)
{
double iv, iw, ix;
***************
*** 592,597 ****
static PyObject *
! float_neg(v)
! PyFloatObject *v;
{
return PyFloat_FromDouble(-v->ob_fval);
--- 560,564 ----
static PyObject *
! float_neg(PyFloatObject *v)
{
return PyFloat_FromDouble(-v->ob_fval);
***************
*** 599,604 ****
static PyObject *
! float_pos(v)
! PyFloatObject *v;
{
Py_INCREF(v);
--- 566,570 ----
static PyObject *
! float_pos(PyFloatObject *v)
{
Py_INCREF(v);
***************
*** 607,612 ****
static PyObject *
! float_abs(v)
! PyFloatObject *v;
{
if (v->ob_fval < 0)
--- 573,577 ----
static PyObject *
! float_abs(PyFloatObject *v)
{
if (v->ob_fval < 0)
***************
*** 617,622 ****
static int
! float_nonzero(v)
! PyFloatObject *v;
{
return v->ob_fval != 0.0;
--- 582,586 ----
static int
! float_nonzero(PyFloatObject *v)
{
return v->ob_fval != 0.0;
***************
*** 624,630 ****
static int
! float_coerce(pv, pw)
! PyObject **pv;
! PyObject **pw;
{
if (PyInt_Check(*pw)) {
--- 588,592 ----
static int
! float_coerce(PyObject **pv, PyObject **pw)
{
if (PyInt_Check(*pw)) {
***************
*** 643,648 ****
static PyObject *
! float_int(v)
! PyObject *v;
{
double x = PyFloat_AsDouble(v);
--- 605,609 ----
static PyObject *
! float_int(PyObject *v)
{
double x = PyFloat_AsDouble(v);
***************
*** 657,662 ****
static PyObject *
! float_long(v)
! PyObject *v;
{
double x = PyFloat_AsDouble(v);
--- 618,622 ----
static PyObject *
! float_long(PyObject *v)
{
double x = PyFloat_AsDouble(v);
***************
*** 665,670 ****
static PyObject *
! float_float(v)
! PyObject *v;
{
Py_INCREF(v);
--- 625,629 ----
static PyObject *
! float_float(PyObject *v)
{
Py_INCREF(v);
***************
*** 720,724 ****
void
! PyFloat_Fini()
{
PyFloatObject *p;
--- 679,683 ----
void
! PyFloat_Fini(void)
{
PyFloatObject *p;