Keep gcc -Wall happy

gvanrossum · gvanrossum · commit 7c14103d77e0 · 1997-08-15T02:52:08.000Z
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
@@ -279,6 +279,7 @@ all_ins(d)
         if (ins(d, "LOCK_EX", (long)LOCK_EX)) return -1;
         if (ins(d, "LOCK_NB", (long)LOCK_NB)) return -1;
         if (ins(d, "LOCK_UN", (long)LOCK_UN)) return -1;
+	return 0;
 }
 
 void
diff --git a/Modules/python.c b/Modules/python.c
@@ -2,6 +2,7 @@
 
 extern int Py_Main();
 
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/Modules/reopmodule.c b/Modules/reopmodule.c
@@ -62,8 +62,6 @@ static PyObject *ReopError;	/* Exception */
 #define BEGINNING_OF_BUFFER	7
 #define END_OF_BUFFER		8
 
-static unsigned char *reop_casefold;
-
 static PyObject *
 makeresult(regs, num_regs)
 	struct re_registers *regs;
diff --git a/Python/frozenmain.c b/Python/frozenmain.c
@@ -77,6 +77,6 @@ Py_FrozenMain(argc, argv)
 	if (inspect && isatty((int)fileno(stdin)))
 		sts = PyRun_AnyFile(stdin, "<stdin>") != 0;
 
-	Py_Exit(sts);
-	/*NOTREACHED*/
+	Py_Finalize();
+	return sts;
 }
diff --git a/Python/import.c b/Python/import.c
@@ -692,7 +692,6 @@ static int
 init_builtin(name)
 	char *name;
 {
-	PyInterpreterState *interp = PyThreadState_Get()->interp;
 	struct _inittab *p;
 	PyObject *mod;
 

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ all_ins(d)`
`279`	`279`	`if (ins(d, "LOCK_EX", (long)LOCK_EX)) return -1;`
`280`	`280`	`if (ins(d, "LOCK_NB", (long)LOCK_NB)) return -1;`
`281`	`281`	`if (ins(d, "LOCK_UN", (long)LOCK_UN)) return -1;`
	`282`	`+ return 0;`
`282`	`283`	`}`
`283`	`284`
`284`	`285`	`void`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,6 @@ Py_FrozenMain(argc, argv)`
`77`	`77`	`if (inspect && isatty((int)fileno(stdin)))`
`78`	`78`	`sts = PyRun_AnyFile(stdin, "<stdin>") != 0;`
`79`	`79`
`80`		`- Py_Exit(sts);`
`81`		`- /NOTREACHED/`
	`80`	`+ Py_Finalize();`
	`81`	`+ return sts;`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,6 @@ static int`
`692`	`692`	`init_builtin(name)`
`693`	`693`	`char *name;`
`694`	`694`	`{`
`695`		`- PyInterpreterState *interp = PyThreadState_Get()->interp;`
`696`	`695`	`struct _inittab *p;`
`697`	`696`	`PyObject *mod;`
`698`	`697`