[Python-checkins] CVS: python/dist/src/Modules pcremodule.c,2.27,2.28 selectmodule.c,2.52,2.53 signalmodule.c,2.58,2.59 xreadlinesmodule.c,1.6,1.7

Fred L. Drake fdrake@users.sourceforge.net
Thu, 19 Jul 2001 14:29:51 -0700


Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv17623

Modified Files:
	pcremodule.c selectmodule.c signalmodule.c xreadlinesmodule.c 
Log Message:

Make more warnings go away on the SGI compiler.
This is part of SF patch #424992.


Index: pcremodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.27
retrieving revision 2.28
diff -C2 -r2.27 -r2.28
*** pcremodule.c	2001/07/15 19:42:03	2.27
--- pcremodule.c	2001/07/19 21:29:48	2.28
***************
*** 259,263 ****
  		return Py_BuildValue("c", (char)x);
  	}
- 	break;
  
  	case('E'):    case('G'):    case('L'):    case('Q'):
--- 259,262 ----
***************
*** 332,336 ****
  		return Py_BuildValue("s#", pattern+index, end-index);
  	}
- 	break;
  
  	case('0'):
--- 331,334 ----
***************
*** 355,359 ****
  		return Py_BuildValue("c", (unsigned char)octval);
  	}
! 	break;
  	case('1'):    case('2'):    case('3'):    case('4'):
  	case('5'):    case('6'):    case('7'):    case('8'):
--- 353,357 ----
  		return Py_BuildValue("c", (unsigned char)octval);
  	}
! 
  	case('1'):    case('2'):    case('3'):    case('4'):
  	case('5'):    case('6'):    case('7'):    case('8'):
***************
*** 411,415 ****
  		}
  	}
- 	break;
  
  	default:
--- 409,412 ----

Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.52
retrieving revision 2.53
diff -C2 -r2.52 -r2.53
*** selectmodule.c	2001/07/14 20:54:37	2.52
--- selectmodule.c	2001/07/19 21:29:49	2.53
***************
*** 333,337 ****
  update_ufd_array(pollObject *self)
  {
! 	int i, j, pos;
  	PyObject *key, *value;
  
--- 333,337 ----
  update_ufd_array(pollObject *self)
  {
! 	int i, pos;
  	PyObject *key, *value;
  
***************
*** 344,350 ****
  
  	i = pos = 0;
! 	while ((j = PyDict_Next(self->dict, &pos, &key, &value))) {
  		self->ufds[i].fd = PyInt_AsLong(key);
! 		self->ufds[i].events = PyInt_AsLong(value);
  		i++;
  	}
--- 344,350 ----
  
  	i = pos = 0;
! 	while (PyDict_Next(self->dict, &pos, &key, &value)) {
  		self->ufds[i].fd = PyInt_AsLong(key);
! 		self->ufds[i].events = (short)PyInt_AsLong(value);
  		i++;
  	}

Index: signalmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/signalmodule.c,v
retrieving revision 2.58
retrieving revision 2.59
diff -C2 -r2.58 -r2.59
*** signalmodule.c	2001/03/06 12:13:56	2.58
--- signalmodule.c	2001/07/19 21:29:49	2.59
***************
*** 157,161 ****
  		return NULL;
  	/* alarm() returns the number of seconds remaining */
! 	return PyInt_FromLong(alarm(t));
  }
  
--- 157,161 ----
  		return NULL;
  	/* alarm() returns the number of seconds remaining */
! 	return PyInt_FromLong((long)alarm(t));
  }
  

Index: xreadlinesmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/xreadlinesmodule.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** xreadlinesmodule.c	2001/05/22 16:41:32	1.6
--- xreadlinesmodule.c	2001/07/19 21:29:49	1.7
***************
*** 172,178 ****
  initxreadlines(void)
  {
- 	PyObject *m;
- 
  	XReadlinesObject_Type.ob_type = &PyType_Type;
! 	m = Py_InitModule("xreadlines", xreadlines_functions);
  }
--- 172,176 ----
  initxreadlines(void)
  {
  	XReadlinesObject_Type.ob_type = &PyType_Type;
! 	Py_InitModule("xreadlines", xreadlines_functions);
  }