Skip to content

Commit e240c2d

Browse files
brammoolbrammool
committed
patch 7.4.1159
Problem: Automatically generated function prototypes use __ARGS. Solution: Remove __ARGS from osdef.sh.
1 parent 48e697e commit e240c2d

4 files changed

Lines changed: 118 additions & 116 deletions

File tree

‎src/osdef.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ $CC -I. -I$srcdir -E osdef0.c >osdef0.cc
5353
# start of the line is matched with "[)*, ]\1[ (]"
5454
sed < osdef0.cc -e '/\(..*\)/s// \1/' > osdef0.ccc
5555

56-
sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, ][(]*\1[)]*[ (]/i\\\
57-
\\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef11.sed
56+
sed < $srcdir/osdef1.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\)(.*@/[)*, ][(]*\1[)]*[ (]/i\\\
57+
\\/\\[^a-zA-Z_\\]\1(\\/d@p' > osdef11.sed
5858

59-
sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\) __ARGS.*@/[)*, ][(]*\1[)]*[ (]/i\\\
60-
\\/\\[^a-zA-Z_\\]\1 __ARGS\\/d@p' > osdef21.sed
59+
sed < $srcdir/osdef2.h.in -n -e '/^extern/s@.*[)* ][)* ]*\([a-zA-Z_][a-zA-Z0-9_]*\)(.*@/[)*, ][(]*\1[)]*[ (]/i\\\
60+
\\/\\[^a-zA-Z_\\]\1(\\/d@p' > osdef21.sed
6161

6262
cat << EOF > osdef2.sed
6363
1i\\

‎src/osdef1.h.in‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -12,130 +12,130 @@
1212
* sed cannot always handle so many commands, this is file 1 of 2
1313
*/
1414

15-
extern int printf __ARGS((char *, ...));
16-
extern int fprintf __ARGS((FILE *, char *, ...));
17-
extern int sprintf __ARGS((char *, char *, ...));
18-
extern int sscanf __ARGS((char *, char *, ...));
15+
extern int printf(char *, ...);
16+
extern int fprintf(FILE *, char *, ...);
17+
extern int sprintf(char *, char *, ...);
18+
extern int sscanf(char *, char *, ...);
1919
#ifndef fopen /* could be redefined to fopen64() */
20-
extern FILE *fopen __ARGS((const char *, const char *));
20+
extern FILE *fopen(const char *, const char *);
2121
#endif
22-
extern int fclose __ARGS((FILE *));
23-
extern int fseek __ARGS((FILE *, long, int));
22+
extern int fclose(FILE *);
23+
extern int fseek(FILE *, long, int);
2424
#ifdef HAVE_FSEEKO
25-
extern int fseeko __ARGS((FILE *, off_t, int));
25+
extern int fseeko(FILE *, off_t, int);
2626
#endif
27-
extern long ftell __ARGS((FILE *));
27+
extern long ftell(FILE *);
2828
#ifdef HAVE_FSEEKO
29-
extern off_t ftello __ARGS((FILE *));
29+
extern off_t ftello(FILE *);
3030
#endif
31-
extern void rewind __ARGS((FILE *));
32-
extern int fread __ARGS((char *, int, int, FILE *));
33-
extern int fwrite __ARGS((char *, int, int, FILE *));
34-
extern int fputs __ARGS((char *, FILE *));
31+
extern void rewind(FILE *);
32+
extern int fread(char *, int, int, FILE *);
33+
extern int fwrite(char *, int, int, FILE *);
34+
extern int fputs(char *, FILE *);
3535
#ifndef ferror /* let me say it again: "macros should never have prototypes" */
36-
extern int ferror __ARGS((FILE *));
36+
extern int ferror(FILE *);
3737
#endif
38-
extern int fflush __ARGS((FILE *));
38+
extern int fflush(FILE *);
3939
#if defined(sun) || defined(_SEQUENT_)
4040
/* used inside of stdio macros getc(), puts(), putchar()... */
41-
extern int _flsbuf __ARGS((int, FILE *));
42-
extern int _filbuf __ARGS((FILE *));
41+
extern int _flsbuf(int, FILE *);
42+
extern int _filbuf(FILE *);
4343
#endif
4444

4545
#if !defined(HAVE_SELECT)
46-
struct pollfd; /* for poll __ARGS */
47-
extern int poll __ARGS((struct pollfd *, long, int));
46+
struct pollfd; /* for poll() */
47+
extern int poll(struct pollfd *, long, int);
4848
#endif
4949

5050
#ifdef HAVE_MEMSET
51-
extern void *memset __ARGS((void *, int, size_t));
51+
extern void *memset(void *, int, size_t);
5252
#endif
5353
#ifdef HAVE_BCMP
54-
extern int bcmp __ARGS((void *, void *, size_t));
54+
extern int bcmp(void *, void *, size_t);
5555
#endif
5656
#ifdef HAVE_MEMCMP
57-
extern int memcmp __ARGS((const void *, const void *, size_t));
57+
extern int memcmp(const void *, const void *, size_t);
5858
#endif
5959
#ifdef HAVE_STRPBRK
60-
extern char *strpbrk __ARGS((const char *, const char *));
60+
extern char *strpbrk(const char *, const char *);
6161
#endif
6262
#ifdef USEBCOPY
63-
extern void bcopy __ARGS((char *, char *, int));
63+
extern void bcopy(char *, char *, int);
6464
#else
6565
# ifdef USEMEMCPY
66-
extern void memcpy __ARGS((char *, char *, int));
66+
extern void memcpy(char *, char *, int);
6767
# else
6868
# ifdef USEMEMMOVE
69-
extern void memmove __ARGS((char *, char *, int));
69+
extern void memmove(char *, char *, int);
7070
# endif
7171
# endif
7272
#endif
7373
/* used inside of FD_ZERO macro: */
74-
extern void bzero __ARGS((void *, size_t));
74+
extern void bzero(void *, size_t);
7575
#ifdef HAVE_SETSID
76-
extern pid_t setsid __ARGS((void));
76+
extern pid_t setsid(void);
7777
#endif
7878
#ifdef HAVE_SETPGID
79-
extern int setpgid __ARGS((pid_t, pid_t));
79+
extern int setpgid(pid_t, pid_t);
8080
#endif
8181
#ifdef HAVE_STRTOL
82-
extern int strtol __ARGS((char *, char **, int));
82+
extern int strtol(char *, char **, int);
8383
#endif
8484
#ifdef HAVE_STRFTIME
85-
extern size_t strftime __ARGS((char *, size_t, char *, struct tm *));
85+
extern size_t strftime(char *, size_t, char *, struct tm *);
8686
#endif
8787
#ifdef HAVE_STRCASECMP
88-
extern int strcasecmp __ARGS((char *, char *));
88+
extern int strcasecmp(char *, char *);
8989
#endif
9090
#ifdef HAVE_STRNCASECMP
91-
extern int strncasecmp __ARGS((char *, char *, size_t));
91+
extern int strncasecmp(char *, char *, size_t);
9292
#endif
9393
#ifndef strdup
94-
extern char *strdup __ARGS((const char *));
94+
extern char *strdup(const char *);
9595
#endif
96-
extern int atoi __ARGS((char *));
97-
extern int atol __ARGS((char *));
96+
extern int atoi(char *);
97+
extern int atol(char *);
9898

9999
#ifndef USE_SYSTEM
100-
extern int fork __ARGS((void));
100+
extern int fork(void);
101101
# ifndef __TANDEM
102-
extern int execvp __ARGS((const char *, const char **));
102+
extern int execvp(const char *, const char **);
103103
# endif
104-
extern int wait __ARGS((int *)); /* will this break things ...? */
105-
extern int waitpid __ARGS((pid_t, int *, int));
104+
extern int wait(int *); /* will this break things ...? */
105+
extern int waitpid(pid_t, int *, int);
106106
#endif
107107

108-
extern int toupper __ARGS((int));
109-
extern int tolower __ARGS((int));
108+
extern int toupper(int);
109+
extern int tolower(int);
110110

111-
extern RETSIGTYPE (*signal __ARGS((int, RETSIGTYPE (*func) SIGPROTOARG))) __ARGS(SIGPROTOARG);
111+
extern RETSIGTYPE (*signal(int, RETSIGTYPE (*func) SIGPROTOARG)) SIGPROTOARG;
112112
#ifdef HAVE_SIGSET
113-
extern RETSIGTYPE (*sigset __ARGS((int, RETSIGTYPE (*func) SIGPROTOARG))) __ARGS(SIGPROTOARG);
113+
extern RETSIGTYPE (*sigset(int, RETSIGTYPE (*func) SIGPROTOARG)) SIGPROTOARG;
114114
#endif
115115

116116
#if defined(HAVE_SETJMP_H)
117117
# ifdef HAVE_SIGSETJMP
118-
extern int sigsetjmp __ARGS((sigjmp_buf, int));
119-
extern void siglongjmp __ARGS((sigjmp_buf, int));
118+
extern int sigsetjmp(sigjmp_buf, int);
119+
extern void siglongjmp(sigjmp_buf, int);
120120
# else
121-
extern int setjmp __ARGS((jmp_buf));
122-
extern void longjmp __ARGS((jmp_buf, int));
121+
extern int setjmp(jmp_buf);
122+
extern void longjmp(jmp_buf, int);
123123
# endif
124124
#endif
125125

126-
extern int kill __ARGS((int, int));
126+
extern int kill(int, int);
127127

128128
#ifndef __TANDEM
129-
extern int access __ARGS((char *, int));
129+
extern int access(char *, int);
130130
#endif
131-
extern int fsync __ARGS((int));
132-
extern int fchown __ARGS((int, int, int));
131+
extern int fsync(int);
132+
extern int fchown(int, int, int);
133133
#if defined(HAVE_GETCWD) && !defined(sun) && !defined(__TANDEM)
134-
extern char *getcwd __ARGS((char *, int));
134+
extern char *getcwd(char *, int);
135135
#else
136-
extern char *getwd __ARGS((char *));
136+
extern char *getwd(char *);
137137
#endif
138138
#ifndef __alpha /* suggested by Campbell */
139-
extern int ioctl __ARGS((int, int, ...));
139+
extern int ioctl(int, int, ...);
140140
#endif
141-
extern int chmod __ARGS((const char *, mode_t));
141+
extern int chmod(const char *, mode_t);

‎src/osdef2.h.in‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,95 +2,95 @@
22
* osdef2.h.in - See osdef1.h.in for a description.
33
*/
44

5-
extern int remove __ARGS((const char *));
6-
extern int rename __ARGS((const char *, const char *));
7-
extern int free __ARGS((char *));
8-
extern char *malloc __ARGS((unsigned int));
9-
extern char *realloc __ARGS((char *, int));
10-
extern char *getenv __ARGS((char *));
11-
extern int setenv __ARGS((char *, char *, int));
12-
extern int putenv __ARGS((const char *));
5+
extern int remove(const char *);
6+
extern int rename(const char *, const char *);
7+
extern int free(char *);
8+
extern char *malloc(unsigned int);
9+
extern char *realloc(char *, int);
10+
extern char *getenv(char *);
11+
extern int setenv(char *, char *, int);
12+
extern int putenv(const char *);
1313

1414
#ifndef __TANDEM
15-
extern int gethostname __ARGS((char *, int));
15+
extern int gethostname(char *, int);
1616
#endif
17-
extern void perror __ARGS((char *));
17+
extern void perror(char *);
1818

1919
#ifndef __TANDEM
20-
extern int sleep __ARGS((int));
20+
extern int sleep(int);
2121
#endif
22-
extern int usleep __ARGS((unsigned int));
23-
extern unsigned int alarm __ARGS((unsigned int));
22+
extern int usleep(unsigned int);
23+
extern unsigned int alarm(unsigned int);
2424
#ifndef __TANDEM
25-
extern int chdir __ARGS((char *));
25+
extern int chdir(char *);
2626
#endif
27-
extern int fchdir __ARGS((int));
27+
extern int fchdir(int);
2828
#ifndef stat /* could be redefined to stat64() */
29-
extern int stat __ARGS((const char *, struct stat *));
29+
extern int stat(const char *, struct stat *);
3030
#endif
3131
#ifndef lstat /* could be redefined to lstat64() */
32-
extern int lstat __ARGS((const char *, struct stat *));
32+
extern int lstat(const char *, struct stat *);
3333
#endif
34-
extern int fstat __ARGS((int, struct stat *));
35-
extern int open __ARGS((const char *, int, ...));
36-
extern int close __ARGS((int));
34+
extern int fstat(int, struct stat *);
35+
extern int open(const char *, int, ...);
36+
extern int close(int);
3737
#ifndef __TANDEM
38-
extern int read __ARGS((int, char *, size_t));
39-
extern int write __ARGS((int, char *, size_t));
38+
extern int read(int, char *, size_t);
39+
extern int write(int, char *, size_t);
4040
#endif
41-
extern int pipe __ARGS((int *));
42-
extern off_t lseek __ARGS((int, off_t, int));
43-
extern void sync __ARGS((void));
44-
extern uid_t getuid __ARGS((void));
45-
extern gid_t getgid __ARGS((void));
46-
extern void qsort __ARGS((void *, size_t, size_t, int (*)(const void *, const void *)));
41+
extern int pipe(int *);
42+
extern off_t lseek(int, off_t, int);
43+
extern void sync(void);
44+
extern uid_t getuid(void);
45+
extern gid_t getgid(void);
46+
extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
4747

48-
extern int isatty __ARGS((int));
49-
extern int getpid __ARGS((void));
50-
extern int dup __ARGS((int));
51-
extern int unlink __ARGS((const char *));
52-
extern int link __ARGS((const char *, const char *));
53-
extern int mkdir __ARGS((const char *, mode_t));
54-
extern int rmdir __ARGS((const char *));
48+
extern int isatty(int);
49+
extern int getpid(void);
50+
extern int dup(int);
51+
extern int unlink(const char *);
52+
extern int link(const char *, const char *);
53+
extern int mkdir(const char *, mode_t);
54+
extern int rmdir(const char *);
5555

56-
extern int tgetent __ARGS((char *, char *));
57-
extern int tgetnum __ARGS((char *));
58-
extern int tgetflag __ARGS((char *));
59-
extern char *tgoto __ARGS((char *, int, int));
60-
extern int tputs __ARGS((char *, int, int (*)(int)));
56+
extern int tgetent(char *, char *);
57+
extern int tgetnum(char *);
58+
extern int tgetflag(char *);
59+
extern char *tgoto(char *, int, int);
60+
extern int tputs(char *, int, int (*)(int));
6161

6262
#ifdef HAVE_TERMIOS_H
63-
struct termios; /* for tcgetattr __ARGS */
64-
extern int tcgetattr __ARGS((int, struct termios *));
65-
extern int tcsetattr __ARGS((int, int, const struct termios *));
63+
struct termios; /* for tcgetattr() */
64+
extern int tcgetattr(int, struct termios *);
65+
extern int tcsetattr(int, int, const struct termios *);
6666
#endif
6767

6868
#ifdef HAVE_SYS_STATFS_H
69-
struct statfs; /* for fstatfs __ARGS */
70-
extern int fstatfs __ARGS((int, struct statfs *, int, int));
69+
struct statfs; /* for fstatfs() */
70+
extern int fstatfs(int, struct statfs *, int, int);
7171
#endif
7272

7373
#ifdef HAVE_GETTIMEOFDAY
74-
struct timeval; /* for gettimeofday __ARGS */
75-
struct timezone; /* for gettimeofday __ARGS */
76-
extern int gettimeofday __ARGS((struct timeval *tp, struct timezone *tzp));
77-
extern time_t time __ARGS((time_t *));
74+
struct timeval; /* for gettimeofday() */
75+
struct timezone; /* for gettimeofday() */
76+
extern int gettimeofday(struct timeval *tp, struct timezone *tzp);
77+
extern time_t time(time_t *);
7878
#endif
7979

8080
#ifdef HAVE_GETPWNAM
81-
struct passwd; /* for getpwnam __ARGS */
82-
extern struct passwd *getpwnam __ARGS((const char *));
81+
struct passwd; /* for getpwnam() */
82+
extern struct passwd *getpwnam(const char *);
8383
#endif
8484

8585
#ifdef USE_TMPNAM
86-
extern char *tmpnam __ARGS((char *));
86+
extern char *tmpnam(char *);
8787
#else
88-
extern char *mktemp __ARGS((char *));
88+
extern char *mktemp(char *);
8989
#endif
9090

9191
#ifdef ISC
92-
extern int _Xmblen __ARGS((char const *, size_t));
92+
extern int _Xmblen(char const *, size_t);
9393
#else
9494
/* This is different from the header but matches mblen() */
95-
extern int _Xmblen __ARGS((char *, size_t));
95+
extern int _Xmblen(char *, size_t);
9696
#endif

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1159,
744746
/**/
745747
1158,
746748
/**/

0 commit comments

Comments
 (0)