mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +00:00
Even more ANSIfication: fix as many function pointers and declarations as
possible.
This commit is contained in:
parent
3b6448fbae
commit
bd4bc4e9e9
10 changed files with 18 additions and 17 deletions
|
@ -12,7 +12,7 @@
|
||||||
static PyObject *crypt_crypt(PyObject *self, PyObject *args)
|
static PyObject *crypt_crypt(PyObject *self, PyObject *args)
|
||||||
{
|
{
|
||||||
char *word, *salt;
|
char *word, *salt;
|
||||||
extern char * crypt();
|
extern char * crypt(const char *, const char *);
|
||||||
|
|
||||||
if (!PyArg_Parse(args, "(ss)", &word, &salt)) {
|
if (!PyArg_Parse(args, "(ss)", &word, &salt)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -1672,7 +1672,7 @@ forms_set_event_call_back(PyObject *dummy, PyObject *args)
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject *
|
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;
|
FL_OBJECT *generic;
|
||||||
genericobject *g;
|
genericobject *g;
|
||||||
|
@ -1751,7 +1751,7 @@ forms_check_only_forms(PyObject *dummy, PyObject *args)
|
||||||
|
|
||||||
#ifdef UNUSED
|
#ifdef UNUSED
|
||||||
static PyObject *
|
static PyObject *
|
||||||
fl_call(void (*func)(), PyObject *args)
|
fl_call(void (*func)(void), PyObject *args)
|
||||||
{
|
{
|
||||||
if (!PyArg_NoArgs(args))
|
if (!PyArg_NoArgs(args))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -2058,7 +2058,7 @@ forms_file_selector(PyObject *f, PyObject *args)
|
||||||
|
|
||||||
|
|
||||||
static PyObject *
|
static PyObject *
|
||||||
forms_file_selector_func(PyObject *args, char *(*func)())
|
forms_file_selector_func(PyObject *args, char *(*func)(void))
|
||||||
{
|
{
|
||||||
char *str;
|
char *str;
|
||||||
|
|
||||||
|
|
|
@ -349,7 +349,7 @@ search_for_exec_prefix(char *argv0_path, char *home)
|
||||||
static void
|
static void
|
||||||
calculate_path(void)
|
calculate_path(void)
|
||||||
{
|
{
|
||||||
extern char *Py_GetProgramName();
|
extern char *Py_GetProgramName(void);
|
||||||
|
|
||||||
static char delimiter[2] = {DELIM, '\0'};
|
static char delimiter[2] = {DELIM, '\0'};
|
||||||
static char separator[2] = {SEP, '\0'};
|
static char separator[2] = {SEP, '\0'};
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#ifdef __sgi
|
#ifdef __sgi
|
||||||
/* This is missing from rpcsvc/ypclnt.h */
|
/* This is missing from rpcsvc/ypclnt.h */
|
||||||
extern int yp_get_default_domain();
|
extern int yp_get_default_domain(char **);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static PyObject *NisError;
|
static PyObject *NisError;
|
||||||
|
|
|
@ -963,7 +963,7 @@ validate_terminal(node *terminal, int type, char *string)
|
||||||
/* X (',' X) [',']
|
/* X (',' X) [',']
|
||||||
*/
|
*/
|
||||||
static int
|
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)
|
const char *const name)
|
||||||
{
|
{
|
||||||
int nch = NCH(tree);
|
int nch = NCH(tree);
|
||||||
|
|
|
@ -130,11 +130,11 @@ corresponding Unix manual entries for more information on calls.";
|
||||||
|
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
/* XXX These are for SunOS4.1.3 but shouldn't hurt elsewhere */
|
/* XXX These are for SunOS4.1.3 but shouldn't hurt elsewhere */
|
||||||
extern int rename();
|
extern int rename(const char *, const char *);
|
||||||
extern int pclose();
|
extern int pclose(FILE *);
|
||||||
extern int lstat();
|
extern int lstat(const char *, struct stat *);
|
||||||
extern int symlink();
|
extern int symlink(const char *, const char *);
|
||||||
extern int fsync();
|
extern int fsync(int fd);
|
||||||
#else /* !HAVE_UNISTD_H */
|
#else /* !HAVE_UNISTD_H */
|
||||||
#if defined(PYCC_VACPP)
|
#if defined(PYCC_VACPP)
|
||||||
extern int mkdir(char *);
|
extern int mkdir(char *);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
|
|
||||||
extern DL_EXPORT(int) Py_Main();
|
extern DL_EXPORT(int) Py_Main(int, char **);
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char **argv)
|
main(int argc, char **argv)
|
||||||
|
|
|
@ -27,7 +27,7 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||||
|
|
||||||
#ifdef __sgi
|
#ifdef __sgi
|
||||||
/* This is missing from unistd.h */
|
/* This is missing from unistd.h */
|
||||||
extern void bzero();
|
extern void bzero(void *, int);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef DONT_HAVE_SYS_TYPES_H
|
#ifndef DONT_HAVE_SYS_TYPES_H
|
||||||
|
|
|
@ -111,7 +111,7 @@ Socket methods:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(MS_WINDOWS) && !defined(PYOS_OS2) && !defined(__BEOS__)
|
#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
|
#endif
|
||||||
|
|
||||||
#if defined(PYCC_VACPP)
|
#if defined(PYCC_VACPP)
|
||||||
|
|
|
@ -49,7 +49,7 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
||||||
#ifdef HAVE_FTIME
|
#ifdef HAVE_FTIME
|
||||||
#include <sys/timeb.h>
|
#include <sys/timeb.h>
|
||||||
#if !defined(MS_WINDOWS) && !defined(PYOS_OS2)
|
#if !defined(MS_WINDOWS) && !defined(PYOS_OS2)
|
||||||
extern int ftime();
|
extern int ftime(struct timeb *);
|
||||||
#endif /* MS_WINDOWS */
|
#endif /* MS_WINDOWS */
|
||||||
#endif /* HAVE_FTIME */
|
#endif /* HAVE_FTIME */
|
||||||
|
|
||||||
|
@ -384,7 +384,8 @@ See the library reference manual for formatting codes.";
|
||||||
#ifdef HAVE_STRPTIME
|
#ifdef HAVE_STRPTIME
|
||||||
|
|
||||||
#if 0
|
#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
|
#endif
|
||||||
|
|
||||||
static PyObject *
|
static PyObject *
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue