Make more warnings go away on the SGI compiler.

freddrake · freddrake · commit dff3a37afdf3 · 2001-07-19T21:29:49.000Z
This is part of SF patch #424992.
diff --git a/Modules/pcremodule.c b/Modules/pcremodule.c
@@ -258,7 +258,6 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,
 		*indexptr = end;
 		return Py_BuildValue("c", (char)x);
 	}
-	break;
 
 	case('E'):    case('G'):    case('L'):    case('Q'):
 	case('U'):    case('l'):    case('u'):
@@ -331,7 +330,6 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,
 		/* Otherwise, return a string containing the group name */
 		return Py_BuildValue("s#", pattern+index, end-index);
 	}
-	break;
 
 	case('0'):
 	{
@@ -354,7 +352,7 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,
 		*indexptr = i;
 		return Py_BuildValue("c", (unsigned char)octval);
 	}
-	break;
+
 	case('1'):    case('2'):    case('3'):    case('4'):
 	case('5'):    case('6'):    case('7'):    case('8'):
 	case('9'):
@@ -410,7 +408,6 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,
 			return Py_BuildValue("i", pattern[index]-'0');
 		}
 	}
-	break;
 
 	default:
 	  /* It's some unknown escape like \s, so return a string containing
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -332,7 +332,7 @@ staticforward PyTypeObject poll_Type;
 static int
 update_ufd_array(pollObject *self)
 {
-	int i, j, pos;
+	int i, pos;
 	PyObject *key, *value;
 
 	self->ufd_len = PyDict_Size(self->dict);
@@ -343,9 +343,9 @@ update_ufd_array(pollObject *self)
 	}
 
 	i = pos = 0;
-	while ((j = PyDict_Next(self->dict, &pos, &key, &value))) {
+	while (PyDict_Next(self->dict, &pos, &key, &value)) {
 		self->ufds[i].fd = PyInt_AsLong(key);
-		self->ufds[i].events = PyInt_AsLong(value);
+		self->ufds[i].events = (short)PyInt_AsLong(value);
 		i++;
 	}
 	self->ufd_uptodate = 1;
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -156,7 +156,7 @@ signal_alarm(PyObject *self, PyObject *args)
 	if (!PyArg_Parse(args, "i", &t))
 		return NULL;
 	/* alarm() returns the number of seconds remaining */
-	return PyInt_FromLong(alarm(t));
+	return PyInt_FromLong((long)alarm(t));
 }
 
 static char alarm_doc[] =
diff --git a/Modules/xreadlinesmodule.c b/Modules/xreadlinesmodule.c
@@ -171,8 +171,6 @@ static PyMethodDef xreadlines_functions[] = {
 DL_EXPORT(void)
 initxreadlines(void)
 {
-	PyObject *m;
-
 	XReadlinesObject_Type.ob_type = &PyType_Type;
-	m = Py_InitModule("xreadlines", xreadlines_functions);
+	Py_InitModule("xreadlines", xreadlines_functions);
 }

Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,6 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,`
`258`	`258`	`*indexptr = end;`
`259`	`259`	`return Py_BuildValue("c", (char)x);`
`260`	`260`	`}`
`261`		`- break;`
`262`	`261`
`263`	`262`	`case('E'): case('G'): case('L'): case('Q'):`
`264`	`263`	`case('U'): case('l'): case('u'):`
`@@ -331,7 +330,6 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,`
`331`	`330`	`/* Otherwise, return a string containing the group name */`
`332`	`331`	`return Py_BuildValue("s#", pattern+index, end-index);`
`333`	`332`	`}`
`334`		`- break;`
`335`	`333`
`336`	`334`	`case('0'):`
`337`	`335`	`{`
`@@ -354,7 +352,7 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,`
`354`	`352`	`*indexptr = i;`
`355`	`353`	`return Py_BuildValue("c", (unsigned char)octval);`
`356`	`354`	`}`
`357`		`- break;`
	`355`	`+`
`358`	`356`	`case('1'): case('2'): case('3'): case('4'):`
`359`	`357`	`case('5'): case('6'): case('7'): case('8'):`
`360`	`358`	`case('9'):`
`@@ -410,7 +408,6 @@ PyPcre_expand_escape(unsigned char *pattern, int pattern_len,`
`410`	`408`	`return Py_BuildValue("i", pattern[index]-'0');`
`411`	`409`	`}`
`412`	`410`	`}`
`413`		`- break;`
`414`	`411`
`415`	`412`	`default:`
`416`	`413`	`/* It's some unknown escape like \s, so return a string containing`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ staticforward PyTypeObject poll_Type;`
`332`	`332`	`static int`
`333`	`333`	`update_ufd_array(pollObject *self)`
`334`	`334`	`{`
`335`		`- int i, j, pos;`
	`335`	`+ int i, pos;`
`336`	`336`	`PyObject key, value;`
`337`	`337`
`338`	`338`	`self->ufd_len = PyDict_Size(self->dict);`
`@@ -343,9 +343,9 @@ update_ufd_array(pollObject *self)`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`i = pos = 0;`
`346`		`- while ((j = PyDict_Next(self->dict, &pos, &key, &value))) {`
	`346`	`+ while (PyDict_Next(self->dict, &pos, &key, &value)) {`
`347`	`347`	`self->ufds[i].fd = PyInt_AsLong(key);`
`348`		`- self->ufds[i].events = PyInt_AsLong(value);`
	`348`	`+ self->ufds[i].events = (short)PyInt_AsLong(value);`
`349`	`349`	`i++;`
`350`	`350`	`}`
`351`	`351`	`self->ufd_uptodate = 1;`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ signal_alarm(PyObject self, PyObject args)`
`156`	`156`	`if (!PyArg_Parse(args, "i", &t))`
`157`	`157`	`return NULL;`
`158`	`158`	`/* alarm() returns the number of seconds remaining */`
`159`		`- return PyInt_FromLong(alarm(t));`
	`159`	`+ return PyInt_FromLong((long)alarm(t));`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`static char alarm_doc[] =`
Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,6 @@ static PyMethodDef xreadlines_functions[] = {`
`171`	`171`	`DL_EXPORT(void)`
`172`	`172`	`initxreadlines(void)`
`173`	`173`	`{`
`174`		`- PyObject *m;`
`175`		`-`
`176`	`174`	`XReadlinesObject_Type.ob_type = &PyType_Type;`
`177`		`- m = Py_InitModule("xreadlines", xreadlines_functions);`
	`175`	`+ Py_InitModule("xreadlines", xreadlines_functions);`
`178`	`176`	`}`