K&R Cleanup patch
Andreas Jaeger
aj@suse.de
Tue May 23 01:10:00 GMT 2000
FYI: I'm going to commit the following patch later today.
Andreas
2000-05-23 Andreas Jaeger <aj@suse.de>
* csu/munch-tmpl.c (__libc_init): Remove K&R support.
* dirent/scandir64.c: Likewise.
* pwd/getpw.c: Likewise.
* stdlib/bsearch.c (bsearch): Likewise.
* stdlib/tst-strtoll.c: Likewise.
* localedata/collate-test.c: Likewise.
* localedata/xfrm-test.c: Likewise.
* posix/bsd-getpgrp.c: Likewise.
* sysdeps/alpha/fpu/bits/fenv.h: Likewise.
* sysdeps/generic/bits/siginfo.h: Likewise.
* sysdeps/generic/bits/sockaddr.h: Likewise.
* sysdeps/generic/sys/swap.h: Likewise.
* sysdeps/generic/sys/sysinfo.h: Likewise.
* sysdeps/generic/vfork.c: Likewise.
* sysdeps/m68k/fpu/switch/68881-sw.h: Likewise.
* sysdeps/mach/hurd/fdopen.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/sys/acct.h: Likewise.
* sysdeps/unix/sysv/linux/poll.c: Likewise.
* sysdeps/unix/sysv/linux/readv.c: Likewise.
* sysdeps/unix/sysv/linux/writev.c: Likewise.
* sysdeps/unix/sysv/linux/i386/setgroups.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sigaction.h: Likewise.
* misc/tst-dirname.c: Remove K&R support, use ANSI C prototypes.
* shadow/lckpwdf.c: Likewise.
* stdlib/tst-strtol.c: Likewise.
* sysdeps/generic/tcsetattr.c: Likewise.
* sysdeps/unix/sysv/linux/ttyname.c: Likewise.
* sysdeps/unix/sysv/linux/ttyname_r.c: Likewise.
============================================================
Index: csu/munch-tmpl.c
--- csu/munch-tmpl.c 1998/05/08 20:39:40 1.1
+++ csu/munch-tmpl.c 2000/05/23 07:41:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
{
/* These functions are defined in crti.o to run the .init and .fini
sections, which are used for initializers and finalizers. */
- extern void _init __P ((void)), _fini __P ((void));
+ extern void _init (void), _fini (void);
atexit (&_fini); /* Arrange for _fini to run at exit. */
_init ();
}
============================================================
Index: dirent/scandir64.c
--- dirent/scandir64.c 1998/07/16 10:28:49 1.2
+++ dirent/scandir64.c 2000/05/23 07:41:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,96,97,98,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,8 +25,8 @@
scandir64 (dir, namelist, select, cmp)
const char *dir;
struct dirent64 ***namelist;
- int (*select) __P ((const struct dirent64 *));
- int (*cmp) __P ((const void *, const void *));
+ int (*select) (const struct dirent64 *);
+ int (*cmp) (const void *, const void *);
{
DIR *dp = __opendir (dir);
struct dirent64 **v = NULL;
============================================================
Index: pwd/getpw.c
--- pwd/getpw.c 1999/06/30 17:11:04 1.12
+++ pwd/getpw.c 2000/05/23 07:41:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,96,98,99,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
in the given buffer. This knows the format that the caller
will expect, but this need not be the format of the password file. */
-int __getpw __P ((__uid_t uid, char *buf));
+int __getpw (__uid_t uid, char *buf);
int
__getpw (uid, buf)
============================================================
Index: stdlib/bsearch.c
--- stdlib/bsearch.c 1997/02/10 03:18:45 1.4
+++ stdlib/bsearch.c 2000/05/23 07:41:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
of SIZE bytes each. The comparisons are done by (*COMPAR)(). */
void *
bsearch (const void *key, const void *base, size_t nmemb, size_t size,
- int (*compar) __P ((const void *, const void *)))
+ int (*compar) (const void *, const void *))
{
size_t l, u, idx;
const void *p;
============================================================
Index: stdlib/tst-strtoll.c
--- stdlib/tst-strtoll.c 1999/06/21 13:35:52 1.2
+++ stdlib/tst-strtoll.c 2000/05/23 07:41:07
@@ -80,10 +80,11 @@
{NULL, 0, 0, 0, 0},
};
-static void expand __P ((char *dst, int c));
+/* Prototypes for local functions. */
+static void expand (char *dst, int c);
int
-main (int argc, char ** argv)
+main (void)
{
register const struct ltest *lt;
char *ep;
============================================================
Index: stdlib/tst-strtol.c
--- stdlib/tst-strtol.c 1998/09/20 18:10:03 1.17
+++ stdlib/tst-strtol.c 2000/05/23 07:41:07
@@ -92,10 +92,11 @@
{NULL, 0, 0, 0, 0},
};
-static void expand __P ((char *dst, int c));
+/* Prototypes for local functions. */
+static void expand (char *dst, int c);
int
-main (int argc, char ** argv)
+main (void)
{
register const struct ltest *lt;
char *ep;
============================================================
Index: localedata/collate-test.c
--- localedata/collate-test.c 1999/12/26 09:06:56 1.2
+++ localedata/collate-test.c 2000/05/23 07:41:07
@@ -1,5 +1,5 @@
/* Test collation function using real data.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -31,7 +31,7 @@
const char *line;
};
-static int xstrcoll __P ((const void *, const void *));
+static int xstrcoll (const void *, const void *);
int
main (int argc, char *argv[])
============================================================
Index: localedata/xfrm-test.c
--- localedata/xfrm-test.c 1998/02/13 17:42:44 1.2
+++ localedata/xfrm-test.c 2000/05/23 07:41:07
@@ -1,5 +1,5 @@
/* Test collation function via transformation using real data.
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -31,7 +31,7 @@
const char *line;
};
-static int xstrcmp __P ((const void *, const void *));
+static int xstrcmp (const void *, const void *);
int
main (int argc, char *argv[])
============================================================
Index: posix/bsd-getpgrp.c
--- posix/bsd-getpgrp.c 1997/03/16 18:21:26 1.1
+++ posix/bsd-getpgrp.c 2000/05/23 07:41:07
@@ -1,5 +1,5 @@
/* BSD-compatible versions of getpgrp function.
- Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc.
+ Copyright (C) 1991, 92, 94, 95, 96, 97, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
/* Don't include unistd.h because it declares a conflicting
prototype for the POSIX.1 `getpgrp' function. */
-extern pid_t __getpgid __P ((pid_t));
+extern pid_t __getpgid (pid_t);
pid_t
__bsd_getpgrp (pid_t pid)
============================================================
Index: sysdeps/alpha/fpu/bits/fenv.h
--- sysdeps/alpha/fpu/bits/fenv.h 1999/05/23 10:11:27 1.4
+++ sysdeps/alpha/fpu/bits/fenv.h 2000/05/23 07:41:08
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -99,5 +99,5 @@
#endif
/* The system calls to talk to the kernel's FP code. */
-extern unsigned long int __ieee_get_fp_control __P ((void));
-extern void __ieee_set_fp_control __P ((unsigned long int __value));
+extern unsigned long int __ieee_get_fp_control (void) __THROW;
+extern void __ieee_set_fp_control (unsigned long int __value) __THROW;
============================================================
Index: sysdeps/generic/bits/siginfo.h
--- sysdeps/generic/bits/siginfo.h 1998/10/23 13:37:17 1.3
+++ sysdeps/generic/bits/siginfo.h 2000/05/23 07:41:08
@@ -1,5 +1,5 @@
/* siginfo_t, sigevent and constants. Stub version.
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -185,7 +185,7 @@
sigval_t sigev_value;
int sigev_signo;
int sigev_notify;
- void (*sigev_notify_function) __PMT ((sigval_t)); /* Function to start. */
+ void (*sigev_notify_function) (sigval_t); /* Function to start. */
void *sigev_notify_attributes; /* Really pthread_attr_t.*/
} sigevent_t;
============================================================
Index: sysdeps/generic/bits/sockaddr.h
--- sysdeps/generic/bits/sockaddr.h 1998/04/07 09:06:08 1.2
+++ sysdeps/generic/bits/sockaddr.h 2000/05/23 07:41:08
@@ -1,5 +1,5 @@
/* Definition of `struct sockaddr_*' common members. Generic/4.2 BSD version.
- Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -39,6 +39,6 @@
/* Return the length of a `sockaddr' structure. */
#define SA_LEN(_x) __libc_sa_len((_x)->sa_family)
-extern int __libc_sa_len __P ((sa_family_t __af));
+extern int __libc_sa_len (sa_family_t __af) __THROW;
#endif /* bits/sockaddr.h */
============================================================
Index: sysdeps/generic/sys/swap.h
--- sysdeps/generic/sys/swap.h 1997/06/23 21:51:54 1.2
+++ sysdeps/generic/sys/swap.h 2000/05/23 07:41:08
@@ -1,5 +1,5 @@
/* Calls to enable and disable swapping on specified locations. Unix version.
- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,9 +25,9 @@
/* Make the block special device PATH available to the system for swapping.
This call is restricted to the super-user. */
-extern int swapon __P ((__const char *__path));
+extern int swapon (__const char *__path) __THROW;
/* Stop using block special device PATH for swapping. */
-extern int swapoff __P ((__const char *__path));
+extern int swapoff (__const char *__path) __THROW;
#endif /* sys/swap.h */
============================================================
Index: sysdeps/generic/sys/sysinfo.h
--- sysdeps/generic/sys/sysinfo.h 1999/07/31 06:08:39 1.4
+++ sysdeps/generic/sys/sysinfo.h 2000/05/23 07:41:08
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -22,16 +22,16 @@
#include <features.h>
/* Return number of configured processors. */
-extern int get_nprocs_conf __P ((void));
+extern int get_nprocs_conf (void) __THROW;
/* Return number of available processors. */
-extern int get_nprocs __P ((void));
+extern int get_nprocs (void) __THROW;
/* Return number of physical pages of memory in the system. */
-extern int get_phys_pages __P ((void));
+extern int get_phys_pages (void) __THROW;
/* Return number of available physical pages of memory in the system. */
-extern int get_avphys_pages __P ((void));
+extern int get_avphys_pages (void) __THROW;
#endif /* sys/sysinfo.h */
============================================================
Index: sysdeps/generic/vfork.c
--- sysdeps/generic/vfork.c 1997/05/26 22:21:20 1.5
+++ sysdeps/generic/vfork.c 2000/05/23 07:41:08
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@
/* If we don't have vfork, fork is close enough. */
__pid_t
-__vfork __P ((void))
+__vfork (void)
{
return __fork ();
}
============================================================
Index: sysdeps/generic/tcsetattr.c
--- sysdeps/generic/tcsetattr.c 1997/10/13 03:52:41 1.1
+++ sysdeps/generic/tcsetattr.c 2000/05/23 07:41:08
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,14 +20,11 @@
#include <stddef.h>
#include <termios.h>
-static int bad_speed __P ((speed_t speed));
+static int bad_speed (speed_t speed);
/* Set the state of FD to *TERMIOS_P. */
int
-tcsetattr (fd, optional_actions, termios_p)
- int fd;
- int optional_actions;
- const struct termios *termios_p;
+tcsetattr (int fd, int optional_actions, const struct termios *termios_p)
{
if (fd < 0)
{
@@ -65,8 +62,7 @@
/* Strychnine checking. */
static int
-bad_speed (speed)
- speed_t speed;
+bad_speed (speed_t speed)
{
switch (speed)
{
============================================================
Index: sysdeps/m68k/fpu/switch/68881-sw.h
--- sysdeps/m68k/fpu/switch/68881-sw.h 1997/01/20 02:49:02 1.3
+++ sysdeps/m68k/fpu/switch/68881-sw.h 2000/05/23 07:41:08
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,9 +33,9 @@
struct switch_caller
{
unsigned short int insn; /* The `jsr' or `jmp' instruction. */
- __ptr_t target; /* The target of the instruction. */
- __ptr_t soft; /* The address of the soft function. */
- __ptr_t fpu; /* The address of the 68881 function. */
+ void *target; /* The target of the instruction. */
+ void *soft; /* The address of the soft function. */
+ void *fpu; /* The address of the 68881 function. */
};
/* These are opcodes (values for `insn', above) for `jmp' and `jsr'
@@ -47,12 +47,12 @@
/* Function to determine whether or not a 68881 is available,
and modify its caller (which must be a `struct switch_caller', above,
in data space) to use the appropriate version. */
-extern void __68881_switch __P ((int __dummy));
+extern void __68881_switch (int __dummy) __THROW;
/* Define FUNCTION as a `struct switch_caller' which will call
`__FUNCTION_68881' if a 68881 is present, and `__FUNCTION_soft' if not.
-#define switching_function(FUNCTION) \
+#define switching_function(FUNCTION) \
struct switch_caller FUNCTION = \
{ \
JSR, (__ptr_t) __68881_switch, \
============================================================
Index: sysdeps/mach/hurd/fdopen.c
--- sysdeps/mach/hurd/fdopen.c 1998/08/08 19:54:12 1.9
+++ sysdeps/mach/hurd/fdopen.c 2000/05/23 07:41:08
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1995, 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
#include <hurd/io.h>
/* Defined in fopen.c. */
-extern int __getmode __P ((const char *mode, __io_mode *mptr));
+extern int __getmode (const char *mode, __io_mode *mptr);
/* Open a new stream on a given system file descriptor. */
FILE *
============================================================
Index: sysdeps/unix/sysv/linux/poll.c
--- sysdeps/unix/sysv/linux/poll.c 1999/05/26 23:33:27 1.11
+++ sysdeps/unix/sysv/linux/poll.c 2000/05/23 07:41:08
@@ -1,5 +1,5 @@
/* Poll system call, with emulation if it is not available.
- Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -27,12 +27,12 @@
#if defined __NR_poll || __ASSUME_POLL_SYSCALL > 0
-extern int __syscall_poll __P ((struct pollfd *fds, unsigned int nfds,
- int timeout));
+extern int __syscall_poll (struct pollfd *fds, unsigned int nfds,
+ int timeout);
# if __ASSUME_POLL_SYSCALL == 0
-static int __emulate_poll __P ((struct pollfd *fds, unsigned long int nfds,
- int timeout)) internal_function;
+static int __emulate_poll (struct pollfd *fds, unsigned long int nfds,
+ int timeout) internal_function;
# endif
/* The real implementation. */
============================================================
Index: sysdeps/unix/sysv/linux/readv.c
--- sysdeps/unix/sysv/linux/readv.c 1998/10/21 15:11:06 1.8
+++ sysdeps/unix/sysv/linux/readv.c 2000/05/23 07:41:08
@@ -1,5 +1,5 @@
/* readv supports all Linux kernels >= 2.0.
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,9 +25,9 @@
#include <sysdep.h>
#include <sys/syscall.h>
-extern ssize_t __syscall_readv __P ((int, __const struct iovec *, int));
-static ssize_t __atomic_readv_replacement __P ((int, __const struct iovec *,
- int)) internal_function;
+extern ssize_t __syscall_readv (int, __const struct iovec *, int);
+static ssize_t __atomic_readv_replacement (int, __const struct iovec *,
+ int) internal_function;
/* Not all versions of the kernel support the large number of records. */
============================================================
Index: sysdeps/unix/sysv/linux/writev.c
--- sysdeps/unix/sysv/linux/writev.c 1998/10/21 15:11:20 1.8
+++ sysdeps/unix/sysv/linux/writev.c 2000/05/23 07:41:08
@@ -1,5 +1,5 @@
/* writev supports all Linux kernels >= 2.0.
- Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,9 +25,9 @@
#include <sysdep.h>
#include <sys/syscall.h>
-extern ssize_t __syscall_writev __P ((int, const struct iovec *, int));
-static ssize_t __atomic_writev_replacement __P ((int, const struct iovec *,
- int)) internal_function;
+extern ssize_t __syscall_writev (int, const struct iovec *, int);
+static ssize_t __atomic_writev_replacement (int, const struct iovec *,
+ int) internal_function;
/* Not all versions of the kernel support the large number of records. */
============================================================
Index: sysdeps/unix/sysv/linux/ttyname.c
--- sysdeps/unix/sysv/linux/ttyname.c 1999/04/28 23:05:51 1.10
+++ sysdeps/unix/sysv/linux/ttyname.c 2000/05/23 07:41:09
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,96,97,98,99,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -30,18 +30,13 @@
char *__ttyname;
-static char * getttyname __P ((const char *dev, dev_t mydev,
- ino_t myino, int save, int *dostat))
+static char * getttyname (const char *dev, dev_t mydev,
+ ino_t myino, int save, int *dostat)
internal_function;
static char *
internal_function
-getttyname (dev, mydev, myino, save, dostat)
- const char *dev;
- dev_t mydev;
- ino_t myino;
- int save;
- int *dostat;
+getttyname (const char *dev, dev_t mydev, ino_t myino, int save, int *dostat)
{
static char *name;
static size_t namelen;
@@ -102,8 +97,7 @@
/* Return the pathname of the terminal FD is open on, or NULL on errors.
The returned storage is good only until the next call to this function. */
char *
-ttyname (fd)
- int fd;
+ttyname (int fd)
{
static char *buf;
static size_t buflen;
============================================================
Index: sysdeps/unix/sysv/linux/ttyname_r.c
--- sysdeps/unix/sysv/linux/ttyname_r.c 1999/04/01 09:32:17 1.10
+++ sysdeps/unix/sysv/linux/ttyname_r.c 2000/05/23 07:41:09
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,95,96,97,98,99,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -28,19 +28,14 @@
#include <stdio-common/_itoa.h>
-static int getttyname_r __P ((char *buf, size_t buflen,
- dev_t mydev, ino_t myino, int save,
- int *dostat)) internal_function;
+static int getttyname_r (char *buf, size_t buflen,
+ dev_t mydev, ino_t myino, int save,
+ int *dostat) internal_function;
static int
internal_function
-getttyname_r (buf, buflen, mydev, myino, save, dostat)
- char *buf;
- size_t buflen;
- dev_t mydev;
- ino_t myino;
- int save;
- int *dostat;
+getttyname_r (char *buf, size_t buflen, dev_t mydev, ino_t myino,
+ int save, int *dostat)
{
struct stat st;
DIR *dirstream;
@@ -98,10 +93,7 @@
/* Store at most BUFLEN character of the pathname of the terminal FD is
open on in BUF. Return 0 on success, otherwise an error number. */
int
-__ttyname_r (fd, buf, buflen)
- int fd;
- char *buf;
- size_t buflen;
+__ttyname_r (int fd, char *buf, size_t buflen)
{
char procname[30];
struct stat st, st1;
============================================================
Index: sysdeps/unix/sysv/linux/i386/setgroups.c
--- sysdeps/unix/sysv/linux/i386/setgroups.c 2000/02/11 19:42:14 1.9
+++ sysdeps/unix/sysv/linux/i386/setgroups.c 2000/05/23 07:41:09
@@ -30,7 +30,7 @@
extern int __syscall_setgroups (int, const __kernel_gid_t *);
#ifdef __NR_setgroups32
-extern int __syscall_setgroups32 __P ((int, const __kernel_gid32_t *));
+extern int __syscall_setgroups32 (int, const __kernel_gid32_t *);
# if __ASSUME_32BITUIDS == 0
/* This variable is shared with all files that need to check for 32bit
uids. */
============================================================
Index: sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
--- sysdeps/unix/sysv/linux/powerpc/bits/ipc.h 2000/02/25 08:56:35 1.3
+++ sysdeps/unix/sysv/linux/powerpc/bits/ipc.h 2000/05/23 07:41:09
@@ -55,8 +55,8 @@
__BEGIN_DECLS
/* The actual system call: all functions are multiplexed by this. */
-extern int __ipc __P ((int __call, int __first, int __second, int __third,
- void *__ptr));
+extern int __ipc (int __call, int __first, int __second, int __third,
+ void *__ptr) __THROW;
__END_DECLS
============================================================
Index: sysdeps/unix/sysv/linux/sparc/bits/sigaction.h
--- sysdeps/unix/sysv/linux/sparc/bits/sigaction.h 2000/02/23 05:59:15 1.8
+++ sysdeps/unix/sysv/linux/sparc/bits/sigaction.h 2000/05/23 07:41:09
@@ -47,7 +47,7 @@
unsigned long sa_flags;
/* Not used by Linux/Sparc yet. */
- void (*sa_restorer) __PMT ((void));
+ void (*sa_restorer) (void);
};
============================================================
Index: misc/tst-dirname.c
--- misc/tst-dirname.c 1996/12/22 00:32:05 1.3
+++ misc/tst-dirname.c 2000/05/23 07:41:09
@@ -1,5 +1,5 @@
/* Test program for dirname function a la XPG.
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -24,12 +24,8 @@
#include <string.h>
-extern int test __P ((const char *input, const char *result));
-
int
-test (input, result)
- const char *input;
- const char *result;
+test (const char *input, const char *result)
{
int retval;
char *cp;
@@ -42,11 +38,8 @@
return retval;
}
-int main __P ((int argc, char *argv[]));
int
-main (argc, argv)
- int argc;
- char *argv[];
+main (void)
{
int result = 0;
============================================================
Index: shadow/lckpwdf.c
--- shadow/lckpwdf.c 1998/07/16 11:20:45 1.7
+++ shadow/lckpwdf.c 2000/05/23 07:41:10
@@ -1,5 +1,5 @@
/* Handle locking of password file.
- Copyright (C) 1996, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -43,7 +43,7 @@
/* Prototypes for local functions. */
-static void noop_handler __P ((int __sig));
+static void noop_handler (int __sig);
/* We cannot simply return in error cases. We have to close the file
@@ -79,7 +79,7 @@
int
-__lckpwdf ()
+__lckpwdf (void)
{
int flags;
sigset_t saved_set; /* Saved set of caught signals. */
@@ -151,7 +151,7 @@
int
-__ulckpwdf ()
+__ulckpwdf (void)
{
int result;
@@ -178,8 +178,7 @@
static void
-noop_handler (sig)
- int sig;
+noop_handler (int sig)
{
/* We simply return which makes the `fcntl' call return with an error. */
}
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
More information about the Libc-hacker
mailing list