Even more ANSIfication: fix as many function pointers and declarations as

Yhg1s · Yhg1s · commit bd4bc4e9e947 · 2000-07-22T23:57:55.000Z
possible.
diff --git a/Modules/cryptmodule.c b/Modules/cryptmodule.c
@@ -12,7 +12,7 @@
 static PyObject *crypt_crypt(PyObject *self, PyObject *args)
 {
 	char *word, *salt; 
-	extern char * crypt();
+	extern char * crypt(const char *, const char *);
 
 	if (!PyArg_Parse(args, "(ss)", &word, &salt)) {
 		return NULL;
diff --git a/Modules/flmodule.c b/Modules/flmodule.c
@@ -1672,7 +1672,7 @@ forms_set_event_call_back(PyObject *dummy, PyObject *args)
 }
 
 static PyObject *
-forms_do_or_check_forms(PyObject *dummy, PyObject *args, FL_OBJECT *(*func)())
+forms_do_or_check_forms(PyObject *dummy, PyObject *args, FL_OBJECT *(*func)(void))
 {
 	FL_OBJECT *generic;
 	genericobject *g;
@@ -1751,7 +1751,7 @@ forms_check_only_forms(PyObject *dummy, PyObject *args)
 
 #ifdef UNUSED
 static PyObject *
-fl_call(void (*func)(), PyObject *args)
+fl_call(void (*func)(void), PyObject *args)
 {
 	if (!PyArg_NoArgs(args))
 		return NULL;
@@ -2058,7 +2058,7 @@ forms_file_selector(PyObject *f, PyObject *args)
 
 
 static PyObject *
-forms_file_selector_func(PyObject *args, char *(*func)())
+forms_file_selector_func(PyObject *args, char *(*func)(void))
 {
 	char *str;
 
diff --git a/Modules/getpath.c b/Modules/getpath.c
@@ -349,7 +349,7 @@ search_for_exec_prefix(char *argv0_path, char *home)
 static void
 calculate_path(void)
 {
-    extern char *Py_GetProgramName();
+    extern char *Py_GetProgramName(void);
 
     static char delimiter[2] = {DELIM, '\0'};
     static char separator[2] = {SEP, '\0'};
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
@@ -20,7 +20,7 @@
 
 #ifdef __sgi
 /* This is missing from rpcsvc/ypclnt.h */
-extern int yp_get_default_domain();
+extern int yp_get_default_domain(char **);
 #endif
 
 static PyObject *NisError;
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
@@ -963,7 +963,7 @@ validate_terminal(node *terminal, int type, char *string)
 /*  X (',' X) [',']
  */
 static int
-validate_repeating_list(node *tree, int ntype, int (*vfunc)(),
+validate_repeating_list(node *tree, int ntype, int (*vfunc)(node *),
                         const char *const name)
 {
     int nch = NCH(tree);
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -130,11 +130,11 @@ corresponding Unix manual entries for more information on calls.";
 
 #ifdef HAVE_UNISTD_H
 /* XXX These are for SunOS4.1.3 but shouldn't hurt elsewhere */
-extern int rename();
-extern int pclose();
-extern int lstat();
-extern int symlink();
-extern int fsync();
+extern int rename(const char *, const char *);
+extern int pclose(FILE *);
+extern int lstat(const char *, struct stat *);
+extern int symlink(const char *, const char *);
+extern int fsync(int fd);
 #else /* !HAVE_UNISTD_H */
 #if defined(PYCC_VACPP)
 extern int mkdir(char *);
diff --git a/Modules/python.c b/Modules/python.c
@@ -2,7 +2,7 @@
 
 #include "Python.h"
 
-extern DL_EXPORT(int) Py_Main();
+extern DL_EXPORT(int) Py_Main(int, char **);
 
 int
 main(int argc, char **argv)
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -27,7 +27,7 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 #ifdef __sgi
 /* This is missing from unistd.h */
-extern void bzero();
+extern void bzero(void *, int);
 #endif
 
 #ifndef DONT_HAVE_SYS_TYPES_H
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -111,7 +111,7 @@ Socket methods:
 #endif
 
 #if !defined(MS_WINDOWS) && !defined(PYOS_OS2) && !defined(__BEOS__)
-extern int gethostname(); /* For Solaris, at least */
+extern int gethostname(char *, size_t); /* For Solaris, at least */
 #endif
 
 #if defined(PYCC_VACPP)
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
@@ -49,7 +49,7 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #ifdef HAVE_FTIME
 #include <sys/timeb.h>
 #if !defined(MS_WINDOWS) && !defined(PYOS_OS2)
-extern int ftime();
+extern int ftime(struct timeb *);
 #endif /* MS_WINDOWS */
 #endif /* HAVE_FTIME */
 
@@ -384,7 +384,8 @@ See the library reference manual for formatting codes.";
 #ifdef HAVE_STRPTIME
 
 #if 0
-extern char *strptime(); /* Enable this if it's not declared in <time.h> */
+/* Enable this if it's not declared in <time.h> */
+extern char *strptime(const char *, const char *, struct tm *);
 #endif
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`static PyObject crypt_crypt(PyObject self, PyObject *args)`
`13`	`13`	`{`
`14`	`14`	`char word, salt;`
`15`		`- extern char * crypt();`
	`15`	`+ extern char * crypt(const char , const char );`
`16`	`16`
`17`	`17`	`if (!PyArg_Parse(args, "(ss)", &word, &salt)) {`
`18`	`18`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -1672,7 +1672,7 @@ forms_set_event_call_back(PyObject dummy, PyObject args)`
`1672`	`1672`	`}`
`1673`	`1673`
`1674`	`1674`	`static PyObject *`
`1675`		`-forms_do_or_check_forms(PyObject dummy, PyObject args, FL_OBJECT (func)())`
	`1675`	`+forms_do_or_check_forms(PyObject dummy, PyObject args, FL_OBJECT (func)(void))`
`1676`	`1676`	`{`
`1677`	`1677`	`FL_OBJECT *generic;`
`1678`	`1678`	`genericobject *g;`
`@@ -1751,7 +1751,7 @@ forms_check_only_forms(PyObject dummy, PyObject args)`
`1751`	`1751`
`1752`	`1752`	`#ifdef UNUSED`
`1753`	`1753`	`static PyObject *`
`1754`		`-fl_call(void (func)(), PyObject args)`
	`1754`	`+fl_call(void (func)(void), PyObject args)`
`1755`	`1755`	`{`
`1756`	`1756`	`if (!PyArg_NoArgs(args))`
`1757`	`1757`	`return NULL;`
`@@ -2058,7 +2058,7 @@ forms_file_selector(PyObject f, PyObject args)`
`2058`	`2058`
`2059`	`2059`
`2060`	`2060`	`static PyObject *`
`2061`		`-forms_file_selector_func(PyObject args, char (*func)())`
	`2061`	`+forms_file_selector_func(PyObject args, char (*func)(void))`
`2062`	`2062`	`{`
`2063`	`2063`	`char *str;`
`2064`	`2064`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ search_for_exec_prefix(char argv0_path, char home)`
`349`	`349`	`static void`
`350`	`350`	`calculate_path(void)`
`351`	`351`	`{`
`352`		`- extern char *Py_GetProgramName();`
	`352`	`+ extern char *Py_GetProgramName(void);`
`353`	`353`
`354`	`354`	`static char delimiter[2] = {DELIM, '\0'};`
`355`	`355`	`static char separator[2] = {SEP, '\0'};`
Original file line number	Diff line number	Diff line change
`@@ -963,7 +963,7 @@ validate_terminal(node terminal, int type, char string)`
`963`	`963`	`/* X (',' X) [',']`
`964`	`964`	`*/`
`965`	`965`	`static int`
`966`		`-validate_repeating_list(node tree, int ntype, int (vfunc)(),`
	`966`	`+validate_repeating_list(node tree, int ntype, int (vfunc)(node *),`
`967`	`967`	`const char *const name)`
`968`	`968`	`{`
`969`	`969`	`int nch = NCH(tree);`