[Python-checkins] CVS: python/dist/src/Modules selectmodule.c,2.35,2.36 sgimodule.c,1.13,1.14 structmodule.c,2.34,2.35 syslogmodule.c,2.13,2.14

Peter Schneider-Kamp python-dev@python.org
Mon, 10 Jul 2000 05:29:32 -0700


Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv21042

Modified Files:
	selectmodule.c sgimodule.c structmodule.c syslogmodule.c 
Log Message:


ANSI-fication


Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -r2.35 -r2.36
*** selectmodule.c	2000/06/30 23:58:05	2.35
--- selectmodule.c	2000/07/10 12:29:26	2.36
***************
*** 59,64 ****
  
  static void
! reap_obj(fd2obj)
! 	pylist fd2obj[FD_SETSIZE + 3];
  {
  	int i;
--- 59,63 ----
  
  static void
! reap_obj(pylist fd2obj[FD_SETSIZE + 3])
  {
  	int i;
***************
*** 75,82 ****
  */
  static int
! list2set(list, set, fd2obj)
! 	PyObject *list;
! 	fd_set *set;
! 	pylist fd2obj[FD_SETSIZE + 3];
  {
  	int i;
--- 74,78 ----
  */
  static int
! list2set(PyObject *list, fd_set *set, pylist fd2obj[FD_SETSIZE + 3])
  {
  	int i;
***************
*** 156,162 ****
  /* returns NULL and sets the Python exception if an error occurred */
  static PyObject *
! set2list(set, fd2obj)
! 	fd_set *set;
! 	pylist fd2obj[FD_SETSIZE + 3];
  {
  	int i, j, count=0;
--- 152,156 ----
  /* returns NULL and sets the Python exception if an error occurred */
  static PyObject *
! set2list(fd_set *set, pylist fd2obj[FD_SETSIZE + 3])
  {
  	int i, j, count=0;
***************
*** 200,206 ****
      
  static PyObject *
! select_select(self, args)
! 	PyObject *self;
! 	PyObject *args;
  {
  #ifdef MS_WINDOWS
--- 194,198 ----
      
  static PyObject *
! select_select(PyObject *self, PyObject *args)
  {
  #ifdef MS_WINDOWS

Index: sgimodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/sgimodule.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** sgimodule.c	2000/06/30 23:58:05	1.13
--- sgimodule.c	2000/07/10 12:29:26	1.14
***************
*** 19,25 ****
  
  static PyObject *
! sgi_nap(self, args)
! 	PyObject *self;
! 	PyObject *args;
  {
  	long ticks;
--- 19,23 ----
  
  static PyObject *
! sgi_nap(PyObject *self, PyObject *args)
  {
  	long ticks;
***************
*** 36,42 ****
  
  static PyObject *
! sgi__getpty(self, args)
! 	PyObject *self;
! 	PyObject *args;
  {
  	int oflag;
--- 34,38 ----
  
  static PyObject *
! sgi__getpty(PyObject *self, PyObject *args)
  {
  	int oflag;

Index: structmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/structmodule.c,v
retrieving revision 2.34
retrieving revision 2.35
diff -C2 -r2.34 -r2.35
*** structmodule.c	2000/07/09 03:09:56	2.34
--- structmodule.c	2000/07/10 12:29:26	2.35
***************
*** 85,91 ****
  
  static int
! get_long(v, p)
! 	PyObject *v;
! 	long *p;
  {
  	long x = PyInt_AsLong(v);
--- 85,89 ----
  
  static int
! get_long(PyObject *v, long *p)
  {
  	long x = PyInt_AsLong(v);
***************
*** 104,110 ****
  
  static int
! get_ulong(v, p)
! 	PyObject *v;
! 	unsigned long *p;
  {
  	if (PyLong_Check(v)) {
--- 102,106 ----
  
  static int
! get_ulong(PyObject *v, unsigned long *p)
  {
  	if (PyLong_Check(v)) {
***************
*** 130,137 ****
  
  static int
! pack_float(x, p, incr)
! 	double x; /* The number to pack */
! 	char *p;  /* Where to pack the high order byte */
! 	int incr; /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
--- 126,132 ----
  
  static int
! pack_float(double x, /* The number to pack */
!            char *p,  /* Where to pack the high order byte */
!            int incr) /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
***************
*** 202,209 ****
  
  static int
! pack_double(x, p, incr)
! 	double x; /* The number to pack */
! 	char *p;  /* Where to pack the high order byte */
! 	int incr; /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
--- 197,203 ----
  
  static int
! pack_double(double x, /* The number to pack */
!             char *p,  /* Where to pack the high order byte */
!             int incr) /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
***************
*** 295,301 ****
  
  static PyObject *
! unpack_float(p, incr)
! 	char *p;  /* Where the high order byte is */
! 	int incr; /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
--- 289,294 ----
  
  static PyObject *
! unpack_float(const char *p,  /* Where the high order byte is */
!              int incr)       /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
***************
*** 339,345 ****
  
  static PyObject *
! unpack_double(p, incr)
! 	char *p;  /* Where the high order byte is */
! 	int incr; /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
--- 332,337 ----
  
  static PyObject *
! unpack_double(const char *p,  /* Where the high order byte is */
!               int incr)       /* 1 for big-endian; -1 for little-endian */
  {
  	int s;
***************
*** 414,420 ****
  
  static PyObject *
! nu_char(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyString_FromStringAndSize(p, 1);
--- 406,410 ----
  
  static PyObject *
! nu_char(const char *p, const formatdef *f)
  {
  	return PyString_FromStringAndSize(p, 1);
***************
*** 422,428 ****
  
  static PyObject *
! nu_byte(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyInt_FromLong((long) *(signed char *)p);
--- 412,416 ----
  
  static PyObject *
! nu_byte(const char *p, const formatdef *f)
  {
  	return PyInt_FromLong((long) *(signed char *)p);
***************
*** 430,436 ****
  
  static PyObject *
! nu_ubyte(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyInt_FromLong((long) *(unsigned char *)p);
--- 418,422 ----
  
  static PyObject *
! nu_ubyte(const char *p, const formatdef *f)
  {
  	return PyInt_FromLong((long) *(unsigned char *)p);
***************
*** 438,444 ****
  
  static PyObject *
! nu_short(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyInt_FromLong((long) *(short *)p);
--- 424,428 ----
  
  static PyObject *
! nu_short(const char *p, const formatdef *f)
  {
  	return PyInt_FromLong((long) *(short *)p);
***************
*** 446,452 ****
  
  static PyObject *
! nu_ushort(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyInt_FromLong((long) *(unsigned short *)p);
--- 430,434 ----
  
  static PyObject *
! nu_ushort(const char *p, const formatdef *f)
  {
  	return PyInt_FromLong((long) *(unsigned short *)p);
***************
*** 454,460 ****
  
  static PyObject *
! nu_int(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyInt_FromLong((long) *(int *)p);
--- 436,440 ----
  
  static PyObject *
! nu_int(const char *p, const formatdef *f)
  {
  	return PyInt_FromLong((long) *(int *)p);
***************
*** 462,468 ****
  
  static PyObject *
! nu_uint(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	unsigned int x = *(unsigned int *)p;
--- 442,446 ----
  
  static PyObject *
! nu_uint(const char *p, const formatdef *f)
  {
  	unsigned int x = *(unsigned int *)p;
***************
*** 471,477 ****
  
  static PyObject *
! nu_long(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyInt_FromLong(*(long *)p);
--- 449,453 ----
  
  static PyObject *
! nu_long(const char *p, const formatdef *f)
  {
  	return PyInt_FromLong(*(long *)p);
***************
*** 479,485 ****
  
  static PyObject *
! nu_ulong(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyLong_FromUnsignedLong(*(unsigned long *)p);
--- 455,459 ----
  
  static PyObject *
! nu_ulong(const char *p, const formatdef *f)
  {
  	return PyLong_FromUnsignedLong(*(unsigned long *)p);
***************
*** 487,493 ****
  
  static PyObject *
! nu_float(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	float x;
--- 461,465 ----
  
  static PyObject *
! nu_float(const char *p, const formatdef *f)
  {
  	float x;
***************
*** 497,503 ****
  
  static PyObject *
! nu_double(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	double x;
--- 469,473 ----
  
  static PyObject *
! nu_double(const char *p, const formatdef *f)
  {
  	double x;
***************
*** 507,513 ****
  
  static PyObject *
! nu_void_p(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return PyLong_FromVoidPtr(*(void **)p);
--- 477,481 ----
  
  static PyObject *
! nu_void_p(const char *p, const formatdef *f)
  {
  	return PyLong_FromVoidPtr(*(void **)p);
***************
*** 515,522 ****
  
  static int
! np_byte(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	long x;
--- 483,487 ----
  
  static int
! np_byte(char *p, PyObject *v, const formatdef *f)
  {
  	long x;
***************
*** 528,535 ****
  
  static int
! np_char(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	if (!PyString_Check(v) || PyString_Size(v) != 1) {
--- 493,497 ----
  
  static int
! np_char(char *p, PyObject *v, const formatdef *f)
  {
  	if (!PyString_Check(v) || PyString_Size(v) != 1) {
***************
*** 543,550 ****
  
  static int
! np_short(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	long x;
--- 505,509 ----
  
  static int
! np_short(char *p, PyObject *v, const formatdef *f)
  {
  	long x;
***************
*** 556,563 ****
  
  static int
! np_int(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	long x;
--- 515,519 ----
  
  static int
! np_int(char *p, PyObject *v, const formatdef *f)
  {
  	long x;
***************
*** 569,576 ****
  
  static int
! np_uint(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	unsigned long x;
--- 525,529 ----
  
  static int
! np_uint(char *p, PyObject *v, const formatdef *f)
  {
  	unsigned long x;
***************
*** 582,589 ****
  
  static int
! np_long(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	long x;
--- 535,539 ----
  
  static int
! np_long(char *p, PyObject *v, const formatdef *f)
  {
  	long x;
***************
*** 595,602 ****
  
  static int
! np_ulong(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	unsigned long x;
--- 545,549 ----
  
  static int
! np_ulong(char *p, PyObject *v, const formatdef *f)
  {
  	unsigned long x;
***************
*** 608,615 ****
  
  static int
! np_float(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	float x = (float)PyFloat_AsDouble(v);
--- 555,559 ----
  
  static int
! np_float(char *p, PyObject *v, const formatdef *f)
  {
  	float x = (float)PyFloat_AsDouble(v);
***************
*** 624,631 ****
  
  static int
! np_double(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	double x = PyFloat_AsDouble(v);
--- 568,572 ----
  
  static int
! np_double(char *p, PyObject *v, const formatdef *f)
  {
  	double x = PyFloat_AsDouble(v);
***************
*** 640,647 ****
  
  static int
! np_void_p(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	void *x = PyLong_AsVoidPtr(v);
--- 581,585 ----
  
  static int
! np_void_p(char *p, PyObject *v, const formatdef *f)
  {
  	void *x = PyLong_AsVoidPtr(v);
***************
*** 677,683 ****
  
  static PyObject *
! bu_int(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	long x = 0;
--- 615,619 ----
  
  static PyObject *
! bu_int(const char *p, const formatdef *f)
  {
  	long x = 0;
***************
*** 695,701 ****
  
  static PyObject *
! bu_uint(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	unsigned long x = 0;
--- 631,635 ----
  
  static PyObject *
! bu_uint(const char *p, const formatdef *f)
  {
  	unsigned long x = 0;
***************
*** 711,717 ****
  
  static PyObject *
! bu_float(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return unpack_float(p, 1);
--- 645,649 ----
  
  static PyObject *
! bu_float(const char *p, const formatdef *f)
  {
  	return unpack_float(p, 1);
***************
*** 719,725 ****
  
  static PyObject *
! bu_double(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return unpack_double(p, 1);
--- 651,655 ----
  
  static PyObject *
! bu_double(const char *p, const formatdef *f)
  {
  	return unpack_double(p, 1);
***************
*** 727,734 ****
  
  static int
! bp_int(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	long x;
--- 657,661 ----
  
  static int
! bp_int(char *p, PyObject *v, const formatdef *f)
  {
  	long x;
***************
*** 745,752 ****
  
  static int
! bp_uint(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	unsigned long x;
--- 672,676 ----
  
  static int
! bp_uint(char *p, PyObject *v, const formatdef *f)
  {
  	unsigned long x;
***************
*** 763,770 ****
  
  static int
! bp_float(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	double x = PyFloat_AsDouble(v);
--- 687,691 ----
  
  static int
! bp_float(char *p, PyObject *v, const formatdef *f)
  {
  	double x = PyFloat_AsDouble(v);
***************
*** 778,785 ****
  
  static int
! bp_double(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	double x = PyFloat_AsDouble(v);
--- 699,703 ----
  
  static int
! bp_double(char *p, PyObject *v, const formatdef *f)
  {
  	double x = PyFloat_AsDouble(v);
***************
*** 811,817 ****
  
  static PyObject *
! lu_int(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	long x = 0;
--- 729,733 ----
  
  static PyObject *
! lu_int(const char *p, const formatdef *f)
  {
  	long x = 0;
***************
*** 829,835 ****
  
  static PyObject *
! lu_uint(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	unsigned long x = 0;
--- 745,749 ----
  
  static PyObject *
! lu_uint(const char *p, const formatdef *f)
  {
  	unsigned long x = 0;
***************
*** 845,851 ****
  
  static PyObject *
! lu_float(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return unpack_float(p+3, -1);
--- 759,763 ----
  
  static PyObject *
! lu_float(const char *p, const formatdef *f)
  {
  	return unpack_float(p+3, -1);
***************
*** 853,859 ****
  
  static PyObject *
! lu_double(p, f)
! 	const char *p;
! 	const formatdef *f;
  {
  	return unpack_double(p+7, -1);
--- 765,769 ----
  
  static PyObject *
! lu_double(const char *p, const formatdef *f)
  {
  	return unpack_double(p+7, -1);
***************
*** 861,868 ****
  
  static int
! lp_int(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	long x;
--- 771,775 ----
  
  static int
! lp_int(char *p, PyObject *v, const formatdef *f)
  {
  	long x;
***************
*** 879,886 ****
  
  static int
! lp_uint(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	unsigned long x;
--- 786,790 ----
  
  static int
! lp_uint(char *p, PyObject *v, const formatdef *f)
  {
  	unsigned long x;
***************
*** 897,904 ****
  
  static int
! lp_float(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	double x = PyFloat_AsDouble(v);
--- 801,805 ----
  
  static int
! lp_float(char *p, PyObject *v, const formatdef *f)
  {
  	double x = PyFloat_AsDouble(v);
***************
*** 912,919 ****
  
  static int
! lp_double(p, v, f)
! 	char *p;
! 	PyObject *v;
! 	const formatdef *f;
  {
  	double x = PyFloat_AsDouble(v);
--- 813,817 ----
  
  static int
! lp_double(char *p, PyObject *v, const formatdef *f)
  {
  	double x = PyFloat_AsDouble(v);
***************
*** 946,951 ****
  
  static const formatdef *
! whichtable(pfmt)
! 	const char **pfmt;
  {
  	const char *fmt = (*pfmt)++; /* May be backed out of later */
--- 844,848 ----
  
  static const formatdef *
! whichtable(char **pfmt)
  {
  	const char *fmt = (*pfmt)++; /* May be backed out of later */
***************
*** 976,982 ****
  
  static const formatdef *
! getentry(c, f)
! 	int c;
! 	const formatdef *f;
  {
  	for (; f->format != '\0'; f++) {
--- 873,877 ----
  
  static const formatdef *
! getentry(int c, const formatdef *f)
  {
  	for (; f->format != '\0'; f++) {
***************
*** 993,1000 ****
  
  static int
! align(size, c, e)
! 	int size;
! 	int c;
! 	const formatdef *e;
  {
  	if (e->format == c) {
--- 888,892 ----
  
  static int
! align(int size, int c, const formatdef *e)
  {
  	if (e->format == c) {
***************
*** 1012,1018 ****
  
  static int
! calcsize(fmt, f)
! 	const char *fmt;
! 	const formatdef *f;
  {
  	const formatdef *e;
--- 904,908 ----
  
  static int
! calcsize(const char *fmt, const formatdef *f)
  {
  	const formatdef *e;
***************
*** 1068,1074 ****
  
  static PyObject *
! struct_calcsize(self, args)
! 	PyObject *self; /* Not used */
! 	PyObject *args;
  {
  	char *fmt;
--- 958,962 ----
  
  static PyObject *
! struct_calcsize(PyObject *self, PyObject *args)
  {
  	char *fmt;
***************
*** 1092,1098 ****
  
  static PyObject *
! struct_pack(self, args)
! 	PyObject *self; /* Not used */
! 	PyObject *args;
  {
  	const formatdef *f, *e;
--- 980,984 ----
  
  static PyObject *
! struct_pack(PyObject *self, PyObject *args)
  {
  	const formatdef *f, *e;
***************
*** 1232,1238 ****
  
  static PyObject *
! struct_unpack(self, args)
! 	PyObject *self; /* Not used */
! 	PyObject *args;
  {
  	const formatdef *f, *e;
--- 1118,1122 ----
  
  static PyObject *
! struct_unpack(PyObject *self, PyObject *args)
  {
  	const formatdef *f, *e;

Index: syslogmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/syslogmodule.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** syslogmodule.c	2000/02/29 13:59:24	2.13
--- syslogmodule.c	2000/07/10 12:29:26	2.14
***************
*** 54,60 ****
  
  static PyObject * 
! syslog_openlog(self, args)
! 	PyObject * self;
! 	PyObject * args;
  {
  	long logopt = 0;
--- 54,58 ----
  
  static PyObject * 
! syslog_openlog(PyObject * self, PyObject * args)
  {
  	long logopt = 0;
***************
*** 81,87 ****
  
  static PyObject * 
! syslog_syslog(self, args)
! 	PyObject * self;
! 	PyObject * args;
  {
  	char *message;
--- 79,83 ----
  
  static PyObject * 
! syslog_syslog(PyObject * self, PyObject * args)
  {
  	char *message;
***************
*** 102,108 ****
  
  static PyObject * 
! syslog_closelog(self, args)
! 	PyObject * self;
! 	PyObject * args;
  {
  	if (!PyArg_ParseTuple(args, ":closelog"))
--- 98,102 ----
  
  static PyObject * 
! syslog_closelog(PyObject *self, PyObject *args)
  {
  	if (!PyArg_ParseTuple(args, ":closelog"))
***************
*** 116,122 ****
  
  static PyObject * 
! syslog_setlogmask(self, args)
! 	PyObject * self;
! 	PyObject * args;
  {
  	long maskpri, omaskpri;
--- 110,114 ----
  
  static PyObject * 
! syslog_setlogmask(PyObject *self, PyObject *args)
  {
  	long maskpri, omaskpri;
***************
*** 129,135 ****
  
  static PyObject * 
! syslog_log_mask(self, args)
! 	PyObject * self;
! 	PyObject * args;
  {
  	long mask;
--- 121,125 ----
  
  static PyObject * 
! syslog_log_mask(PyObject *self, PyObject *args)
  {
  	long mask;
***************
*** 142,148 ****
  
  static PyObject * 
! syslog_log_upto(self, args)
! 	PyObject * self;
! 	PyObject * args;
  {
  	long mask;
--- 132,136 ----
  
  static PyObject * 
! syslog_log_upto(PyObject *self, PyObject *args)
  {
  	long mask;
***************
*** 169,176 ****
  
  static void
! ins(d, s, x)
! 	PyObject *d;
! 	char *s;
! 	long x;
  {
  	PyObject *v = PyInt_FromLong(x);
--- 157,161 ----
  
  static void
! ins(PyObject *d, char *s, long x)
  {
  	PyObject *v = PyInt_FromLong(x);