[Python-checkins] CVS: python/dist/src/Python getargs.c,2.82,2.83

[Tim Peters]

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

Modified Files:
	getargs.c 
Log Message:
vgetargskeywords:  Now that it's clear that nkwlist must equal max, and
we're ensuring that's true during the format parse, get rid of nkwlist.


Index: getargs.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/getargs.c,v
retrieving revision 2.82
retrieving revision 2.83
diff -C2 -d -r2.82 -r2.83
*** getargs.c	2001/10/27 06:53:00	2.82
--- getargs.c	2001/10/27 07:00:56	2.83
***************
*** 1033,1037 ****
  	int min, max;
  	char *formatsave;
! 	int i, len, nargs, nkeywords, nkwlist;
  	char *msg, *ks, **p;
  	int pos, match, converted;
--- 1033,1037 ----
  	int min, max;
  	char *formatsave;
! 	int i, len, nargs, nkeywords;
  	char *msg, *ks, **p;
  	int pos, match, converted;
***************
*** 1094,1098 ****
  	}
  
- 	nkwlist = max;
  	nargs = PyTuple_GET_SIZE(args);
  	nkeywords = keywords == NULL ? 0 : PyDict_Size(keywords);
--- 1094,1097 ----
***************
*** 1171,1175 ****
  	   string where it was left after processing args */
  	converted = 0;
! 	for (i = nargs; i < nkwlist; i++) {
  		PyObject *item;
  		if (*format == '|')
--- 1170,1174 ----
  	   string where it was left after processing args */
  	converted = 0;
! 	for (i = nargs; i < max; i++) {
  		PyObject *item;
  		if (*format == '|')
***************
*** 1203,1207 ****
  			match = 0;
  			ks = PyString_AsString(key);
! 			for (i = 0; i < nkwlist; i++) {
  				if (!strcmp(ks, kwlist[i])) {
  					match = 1;
--- 1202,1206 ----
  			match = 0;
  			ks = PyString_AsString(key);
! 			for (i = 0; i < max; i++) {
  				if (!strcmp(ks, kwlist[i])) {
  					match = 1;