[Python-checkins] python/dist/src/Objects listobject.c,2.161,2.162

Mon Nov 3 15:58:30 EST 2003

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv30652
Modified Files:
	listobject.c 
Log Message:
Fix compiler warning about possible use of n without assignment.
Also fix use of n for two different variables in two different blocks.
Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.161
retrieving revision 2.162
diff -C2 -d -r2.161 -r2.162
*** listobject.c	29 Oct 2003 06:54:43 -0000	2.161
--- listobject.c	3 Nov 2003 20:58:28 -0000	2.162
***************
*** 1849,1853 ****
 	int reverse = 0;
 	PyObject *keyfunc = NULL;
! 	int i, n;
 	PyObject *key, *value, *kvpair;
 	static char *kwlist[] = {"cmp", "key", "reverse", 0};
--- 1849,1853 ----
 	int reverse = 0;
 	PyObject *keyfunc = NULL;
! 	int i, len = 0;
 	PyObject *key, *value, *kvpair;
 	static char *kwlist[] = {"cmp", "key", "reverse", 0};
***************
*** 1872,1879 ****
 
 	if (keyfunc != NULL) {
! 		n = PyList_GET_SIZE(self);
! 		for (i=0 ; i<n ; i++) {
 			value = PyList_GET_ITEM(self, i);
! 			key = PyObject_CallFunctionObjArgs(keyfunc, value, NULL);
 			if (key == NULL)
 				goto dsu_fail;
--- 1872,1880 ----
 
 	if (keyfunc != NULL) {
! 		len = PyList_GET_SIZE(self);
! 		for (i=0 ; i < len ; i++) {
 			value = PyList_GET_ITEM(self, i);
! 			key = PyObject_CallFunctionObjArgs(keyfunc, value, 
! 							 NULL);
 			if (key == NULL)
 				goto dsu_fail;
***************
*** 1968,1972 ****
 
 	if (keyfunc != NULL) {
! 		for (i=0 ; i<n ; i++) {
 			kvpair = PyList_GET_ITEM(self, i);
 			value = sortwrapper_getvalue(kvpair);
--- 1969,1973 ----
 
 	if (keyfunc != NULL) {
! 		for (i=0 ; i < len ; i++) {
 			kvpair = PyList_GET_ITEM(self, i);
 			value = sortwrapper_getvalue(kvpair);