Remove a couple of unused local variables (bug #445960, compiler warnings

gward · gward · commit 201baee7ea44 · 2001-10-04T14:52:06.000Z
on IRIX 6.5).
diff --git a/Python/import.c b/Python/import.c
@@ -866,7 +866,6 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
 {
 	int i, npath;
 	size_t len, namelen;
-	struct _frozen *f;
 	struct filedescr *fdp = NULL;
 	FILE *fp = NULL;
 #ifndef RISCOS
@@ -903,7 +902,7 @@ find_module(char *realname, PyObject *path, char *buf, size_t buflen,
 			strcpy(buf, name);
 			return &fd_builtin;
 		}
-		if ((f = find_frozen(name)) != NULL) {
+		if ((find_frozen(name)) != NULL) {
 			strcpy(buf, name);
 			return &fd_frozen;
 		}
@@ -1388,9 +1387,8 @@ static int
 init_builtin(char *name)
 {
 	struct _inittab *p;
-	PyObject *mod;
 
-	if ((mod = _PyImport_FindExtension(name, name)) != NULL)
+	if (_PyImport_FindExtension(name, name) != NULL)
 		return 1;
 
 	for (p = PyImport_Inittab; p->name != NULL; p++) {

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,6 @@ find_module(char realname, PyObject path, char *buf, size_t buflen,`
`866`	`866`	`{`
`867`	`867`	`int i, npath;`
`868`	`868`	`size_t len, namelen;`
`869`		`- struct _frozen *f;`
`870`	`869`	`struct filedescr *fdp = NULL;`
`871`	`870`	`FILE *fp = NULL;`
`872`	`871`	`#ifndef RISCOS`
`@@ -903,7 +902,7 @@ find_module(char realname, PyObject path, char *buf, size_t buflen,`
`903`	`902`	`strcpy(buf, name);`
`904`	`903`	`return &fd_builtin;`
`905`	`904`	`}`
`906`		`- if ((f = find_frozen(name)) != NULL) {`
	`905`	`+ if ((find_frozen(name)) != NULL) {`
`907`	`906`	`strcpy(buf, name);`
`908`	`907`	`return &fd_frozen;`
`909`	`908`	`}`
`@@ -1388,9 +1387,8 @@ static int`
`1388`	`1387`	`init_builtin(char *name)`
`1389`	`1388`	`{`
`1390`	`1389`	`struct _inittab *p;`
`1391`		`- PyObject *mod;`
`1392`	`1390`
`1393`		`- if ((mod = _PyImport_FindExtension(name, name)) != NULL)`
	`1391`	`+ if (_PyImport_FindExtension(name, name) != NULL)`
`1394`	`1392`	`return 1;`
`1395`	`1393`
`1396`	`1394`	`for (p = PyImport_Inittab; p->name != NULL; p++) {`