diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | iconv/skeleton.c | 2 | ||||
| -rw-r--r-- | include/db_185.h | 2 | ||||
| -rw-r--r-- | include/dlfcn.h | 10 | ||||
| -rw-r--r-- | include/gnu/libc-version.h | 10 | ||||
| -rw-r--r-- | include/search.h | 18 | ||||
| -rw-r--r-- | include/setjmp.h | 4 | ||||
| -rw-r--r-- | include/signal.h | 38 | ||||
| -rw-r--r-- | include/stdio.h | 36 | ||||
| -rw-r--r-- | include/sys/select.h | 8 | ||||
| -rw-r--r-- | include/sys/statfs.h | 4 | ||||
| -rw-r--r-- | include/unistd.h | 106 |
12 files changed, 137 insertions, 119 deletions
diff --git a/ChangeLog b/ChangeLog index 56387553a4..61b223ef84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +1999-11-23 Thorsten Kukuk <kukuk@suse.de> + + * iconv/skeleton.c: Don't access next_step->fct if datat->is_last + is true. + +1999-11-23 Andreas Jaeger <aj@suse.de> + + * include/sys/select.h: Remove K&R compatibility. + * include/sys/statfs.h: Likewise. + * include/gnu/libc-version.h: Likewise. + * include/db_185.h: Likewise. + * include/dlfcn.h: Likewise. + * include/search.h: Likewise. + * include/setjmp.h: Likewise. + * include/signal.h: Likewise. + * include/stdio.h: Likewise. + * include/unistd.h: Likewise. + 1999-11-23 Andreas Jaeger <aj@suse.de> * include/aio.h: Remove __THROW from internal interfaces. __THROW diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 0bcad9e6d0..3574fabea4 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -199,7 +199,7 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, { struct __gconv_step *next_step = step + 1; struct __gconv_step_data *next_data = data + 1; - __gconv_fct fct = next_step->__fct; + __gconv_fct fct = data->is_last ? NULL : next_step->__fct; int status; /* If the function is called with no input this means we have to reset diff --git a/include/db_185.h b/include/db_185.h index 37bb16e99b..52ef98fb34 100644 --- a/include/db_185.h +++ b/include/db_185.h @@ -2,5 +2,5 @@ #include <db2/db_185.h> /* Now define the internal interfaces. */ -DB *__dbopen __P((const char *, int, int, DBTYPE, const void *)); +DB *__dbopen (const char *, int, int, DBTYPE, const void *); #endif diff --git a/include/dlfcn.h b/include/dlfcn.h index 72b9b0e83d..a2398c4c93 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -2,12 +2,12 @@ #include <dlfcn/dlfcn.h> /* Now define the internal interfaces. */ -extern void *__dlvsym __P ((void *__handle, __const char *__name, - __const char *__version)); +extern void *__dlvsym (void *__handle, __const char *__name, + __const char *__version); -extern void *__libc_dlopen __P ((__const char *__name)); -extern void *__libc_dlsym __P ((void *__map, __const char *__name)); -extern int __libc_dlclose __P ((void *__map)); +extern void *__libc_dlopen (__const char *__name); +extern void *__libc_dlsym (void *__map, __const char *__name); +extern int __libc_dlclose (void *__map); /* Locate shared object containing the given address. */ extern int _dl_addr (const void *address, Dl_info *info) diff --git a/include/gnu/libc-version.h b/include/gnu/libc-version.h index ab80cfc987..1a2b8dd626 100644 --- a/include/gnu/libc-version.h +++ b/include/gnu/libc-version.h @@ -1,5 +1,5 @@ /* Interface to GNU libc specific functions for version information. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 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,12 +25,12 @@ __BEGIN_DECLS /* Return string describing release status of currently running GNU libc. */ -extern const char *__gnu_get_libc_release __P ((void)); -extern const char *gnu_get_libc_release __P ((void)); +extern const char *__gnu_get_libc_release (void) __THROW; +extern const char *gnu_get_libc_release (void) __THROW; /* Return string describing version of currently running GNU libc. */ -extern const char *__gnu_get_libc_version __P ((void)); -extern const char *gnu_get_libc_version __P ((void)); +extern const char *__gnu_get_libc_version (void) __THROW; +extern const char *gnu_get_libc_version (void) __THROW; __END_DECLS diff --git a/include/search.h b/include/search.h index 2b4c63ba53..14d913a63c 100644 --- a/include/search.h +++ b/include/search.h @@ -2,13 +2,13 @@ #include <misc/search.h> /* Now define the internal interfaces. */ -extern void __hdestroy __P ((void)); -extern void *__tsearch __PMT ((__const void *__key, void **__rootp, - __compar_fn_t compar)); -extern void *__tfind __PMT ((__const void *__key, void *__const *__rootp, - __compar_fn_t compar)); -extern void *__tdelete __PMT ((__const void *__key, void **__rootp, - __compar_fn_t compar)); -extern void __twalk __PMT ((__const void *__root, __action_fn_t action)); -extern void __tdestroy __PMT ((void *__root, __free_fn_t freefct)); +extern void __hdestroy (void); +extern void *__tsearch (__const void *__key, void **__rootp, + __compar_fn_t compar); +extern void *__tfind (__const void *__key, void *__const *__rootp, + __compar_fn_t compar); +extern void *__tdelete (__const void *__key, void **__rootp, + __compar_fn_t compar); +extern void __twalk (__const void *__root, __action_fn_t action); +extern void __tdestroy (void *__root, __free_fn_t freefct); #endif diff --git a/include/setjmp.h b/include/setjmp.h index 97b1c3a46f..44dae7877a 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -4,12 +4,12 @@ /* Now define the internal interfaces. */ /* Internal machine-dependent function to restore context sans signal mask. */ -extern void __longjmp __P ((__jmp_buf __env, int __val)) +extern void __longjmp (__jmp_buf __env, int __val) __attribute__ ((__noreturn__)); /* Internal function to possibly save the current mask of blocked signals in ENV, and always set the flag saying whether or not it was saved. This is used by the machine-dependent definition of `__sigsetjmp'. Always returns zero, for convenience. */ -extern int __sigjmp_save __P ((jmp_buf __env, int __savemask)); +extern int __sigjmp_save (jmp_buf __env, int __savemask); #endif diff --git a/include/signal.h b/include/signal.h index 4ee3c6c265..d58d053eca 100644 --- a/include/signal.h +++ b/include/signal.h @@ -5,26 +5,26 @@ # include <signal/signal.h> /* Now define the internal interfaces. */ -extern __sighandler_t __bsd_signal __P ((int __sig, __sighandler_t __handler)); -extern int __kill __P ((__pid_t __pid, int __sig)); -extern int __sigblock __P ((int __mask)); -extern int __sigsetmask __P ((int __mask)); -extern int __sigprocmask __P ((int __how, - __const sigset_t *__set, sigset_t *__oset)); -extern int __sigsuspend __P ((__const sigset_t *__set)); -extern int __sigwait __P ((__const sigset_t *__set, int *__sig)); -extern int __sigwaitinfo __P ((__const sigset_t *__set, siginfo_t *__info)); -extern int __sigtimedwait __P ((__const sigset_t *__set, siginfo_t *__info, - __const struct timespec *__timeout)); -extern int __sigqueue __P ((__pid_t __pid, int __sig, - __const union sigval __val)); -extern int __sigvec __P ((int __sig, __const struct sigvec *__vec, - struct sigvec *__ovec)); -extern int __sigreturn __P ((struct sigcontext *__scp)); -extern int __sigaltstack __P ((__const struct sigaltstack *__ss, - struct sigaltstack *__oss)); +extern __sighandler_t __bsd_signal (int __sig, __sighandler_t __handler); +extern int __kill (__pid_t __pid, int __sig); +extern int __sigblock (int __mask); +extern int __sigsetmask (int __mask); +extern int __sigprocmask (int __how, + __const sigset_t *__set, sigset_t *__oset); +extern int __sigsuspend (__const sigset_t *__set); +extern int __sigwait (__const sigset_t *__set, int *__sig); +extern int __sigwaitinfo (__const sigset_t *__set, siginfo_t *__info); +extern int __sigtimedwait (__const sigset_t *__set, siginfo_t *__info, + __const struct timespec *__timeout); +extern int __sigqueue (__pid_t __pid, int __sig, + __const union sigval __val); +extern int __sigvec (int __sig, __const struct sigvec *__vec, + struct sigvec *__ovec); +extern int __sigreturn (struct sigcontext *__scp); +extern int __sigaltstack (__const struct sigaltstack *__ss, + struct sigaltstack *__oss); /* Allocate real-time signal with highest/lowest available priority. */ -extern int __libc_allocate_rtsig __P ((int __high)); +extern int __libc_allocate_rtsig (int __high); #endif #endif diff --git a/include/stdio.h b/include/stdio.h index 5a80563906..a4dc141275 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -10,22 +10,22 @@ # include <libio/stdio.h> /* Now define the internal interfaces. */ -extern int __fcloseall __P ((void)); -extern int __snprintf __P ((char *__restrict __s, size_t __maxlen, - __const char *__restrict __format, ...)) +extern int __fcloseall (void); +extern int __snprintf (char *__restrict __s, size_t __maxlen, + __const char *__restrict __format, ...) __attribute__ ((__format__ (__printf__, 3, 4))); -extern int __vfscanf __P ((FILE *__restrict __s, - __const char *__restrict __format, - _G_va_list __arg)) +extern int __vfscanf (FILE *__restrict __s, + __const char *__restrict __format, + _G_va_list __arg) __attribute__ ((__format__ (__scanf__, 2, 0))); -extern int __vscanf __P ((__const char *__restrict __format, - _G_va_list __arg)) +extern int __vscanf (__const char *__restrict __format, + _G_va_list __arg) __attribute__ ((__format__ (__scanf__, 1, 0))); -extern _IO_ssize_t __getline __P ((char **__lineptr, size_t *__n, - FILE *__stream)); -extern int __vsscanf __P ((__const char *__restrict __s, - __const char *__restrict __format, - _G_va_list __arg)) +extern _IO_ssize_t __getline (char **__lineptr, size_t *__n, + FILE *__stream); +extern int __vsscanf (__const char *__restrict __s, + __const char *__restrict __format, + _G_va_list __arg) __attribute__ ((__format__ (__scanf__, 2, 0))); # else @@ -35,11 +35,11 @@ extern int __vsscanf __P ((__const char *__restrict __s, # define __need_size_t # include <stddef.h> /* Generate a unique file name (and possibly open it). */ -extern int __path_search __P ((char *__tmpl, size_t __tmpl_len, - __const char *__dir, __const char *__pfx, - int __try_tempdir)); +extern int __path_search (char *__tmpl, size_t __tmpl_len, + __const char *__dir, __const char *__pfx, + int __try_tempdir); -extern int __gen_tempname __P ((char *__tmpl, int __kind)); +extern int __gen_tempname (char *__tmpl, int __kind); /* The __kind argument to __gen_tempname may be one of: */ # define __GT_FILE 0 /* create a file */ # define __GT_BIGFILE 1 /* create a file, using open64 */ @@ -47,7 +47,7 @@ extern int __gen_tempname __P ((char *__tmpl, int __kind)); # define __GT_NOCREATE 3 /* just find a name not currently in use */ /* Print out MESSAGE on the error output and abort. */ -extern void __libc_fatal __P ((__const char *__message)) +extern void __libc_fatal (__const char *__message) __attribute__ ((__noreturn__)); # endif diff --git a/include/sys/select.h b/include/sys/select.h index 5c722e9df6..dde8c60302 100644 --- a/include/sys/select.h +++ b/include/sys/select.h @@ -2,8 +2,8 @@ #include <misc/sys/select.h> /* Now define the internal interfaces. */ -extern int __pselect __P ((int __nfds, __fd_set *__readfds, - __fd_set *__writefds, __fd_set *__exceptfds, - const struct timespec *__timeout, - const __sigset_t *__sigmask)); +extern int __pselect (int __nfds, __fd_set *__readfds, + __fd_set *__writefds, __fd_set *__exceptfds, + const struct timespec *__timeout, + const __sigset_t *__sigmask); #endif diff --git a/include/sys/statfs.h b/include/sys/statfs.h index 80c8834be4..d6a5bcfe38 100644 --- a/include/sys/statfs.h +++ b/include/sys/statfs.h @@ -2,6 +2,6 @@ #include <io/sys/statfs.h> /* Now define the internal interfaces. */ -extern int __statfs __P ((__const char *__file, struct statfs *__buf)); -extern int __fstatfs __P ((int __fildes, struct statfs *__buf)); +extern int __statfs (__const char *__file, struct statfs *__buf); +extern int __fstatfs (int __fildes, struct statfs *__buf); #endif diff --git a/include/unistd.h b/include/unistd.h index 06fa8fbd93..78f0b9c4d2 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -2,24 +2,24 @@ # include <posix/unistd.h> /* Now define the internal interfaces. */ -extern int __access __P ((__const char *__name, int __type)); -extern int __euidaccess __P ((__const char *__name, int __type)); -extern __off64_t __lseek64 __P ((int __fd, __off64_t __offset, int __whence)); -extern ssize_t __pread __P ((int __fd, __ptr_t __buf, size_t __nbytes, - __off_t __offset)); -extern ssize_t __pwrite __P ((int __fd, __const __ptr_t __buf, size_t __n, - __off_t __offset)); -extern int __pipe __P ((int __pipedes[2])); -extern unsigned int __sleep __P ((unsigned int __seconds)); -extern int __chown __P ((__const char *__file, - __uid_t __owner, __gid_t __group)); -extern int __fchown __P ((int __fd, - __uid_t __owner, __gid_t __group)); -extern int __lchown __P ((__const char *__file, __uid_t __owner, - __gid_t __group)); -extern int __chdir __P ((__const char *__path)); -extern int __fchdir __P ((int __fd)); -extern char *__getcwd __P ((char *__buf, size_t __size)); +extern int __access (__const char *__name, int __type); +extern int __euidaccess (__const char *__name, int __type); +extern __off64_t __lseek64 (int __fd, __off64_t __offset, int __whence); +extern ssize_t __pread (int __fd, void *__buf, size_t __nbytes, + __off_t __offset); +extern ssize_t __pwrite (int __fd, __const void *__buf, size_t __n, + __off_t __offset); +extern int __pipe (int __pipedes[2]); +extern unsigned int __sleep (unsigned int __seconds); +extern int __chown (__const char *__file, + __uid_t __owner, __gid_t __group); +extern int __fchown (int __fd, + __uid_t __owner, __gid_t __group); +extern int __lchown (__const char *__file, __uid_t __owner, + __gid_t __group); +extern int __chdir (__const char *__path); +extern int __fchdir (int __fd); +extern char *__getcwd (char *__buf, size_t __size); /* Get the canonical absolute name of the named directory, and put it in SIZE bytes of BUF. Returns NULL if the directory couldn't be determined or @@ -27,42 +27,42 @@ extern char *__getcwd __P ((char *__buf, size_t __size)); NULL, an array is allocated with `malloc'; the array is SIZE bytes long, unless SIZE <= 0, in which case it is as big as necessary. */ -char *__canonicalize_directory_name_internal __P ((__const char *__thisdir, - char *__buf, - size_t __size)); +char *__canonicalize_directory_name_internal (__const char *__thisdir, + char *__buf, + size_t __size); -extern int __dup __P ((int __fd)); -extern int __dup2 __P ((int __fd, int __fd2)); -extern int __execve __P ((__const char *__path, char *__const __argv[], - char *__const __envp[])); -extern long int __pathconf __P ((__const char *__path, int __name)); -extern long int __fpathconf __P ((int __fd, int __name)); -extern long int __sysconf __P ((int __name)); -extern __pid_t __getppid __P ((void)); -extern __pid_t __setsid __P ((void)); -extern __uid_t __getuid __P ((void)); -extern __uid_t __geteuid __P ((void)); -extern __gid_t __getgid __P ((void)); -extern __gid_t __getegid __P ((void)); -extern int __getgroups __P ((int __size, __gid_t __list[])); -extern int __group_member __P ((__gid_t __gid)); -extern int __setuid __P ((__uid_t __uid)); -extern int __setreuid __P ((__uid_t __ruid, __uid_t __euid)); -extern int __setgid __P ((__gid_t __gid)); -extern int __setregid __P ((__gid_t __rgid, __gid_t __egid)); -extern __pid_t __vfork __P ((void)); -extern int __ttyname_r __P ((int __fd, char *__buf, size_t __buflen)); -extern int __isatty __P ((int __fd)); -extern int __link __P ((__const char *__from, __const char *__to)); -extern int __symlink __P ((__const char *__from, __const char *__to)); -extern int __readlink __P ((__const char *__path, char *__buf, size_t __len)); -extern int __unlink __P ((__const char *__name)); -extern int __rmdir __P ((__const char *__path)); -extern int __gethostname __P ((char *__name, size_t __len)); -extern int __profil __P ((unsigned short int *__sample_buffer, size_t __size, - size_t __offset, unsigned int __scale)); -extern int __getdtablesize __P ((void)); -extern int __brk __P ((__ptr_t __addr)); +extern int __dup (int __fd); +extern int __dup2 (int __fd, int __fd2); +extern int __execve (__const char *__path, char *__const __argv[], + char *__const __envp[]); +extern long int __pathconf (__const char *__path, int __name); +extern long int __fpathconf (int __fd, int __name); +extern long int __sysconf (int __name); +extern __pid_t __getppid (void); +extern __pid_t __setsid (void); +extern __uid_t __getuid (void); +extern __uid_t __geteuid (void); +extern __gid_t __getgid (void); +extern __gid_t __getegid (void); +extern int __getgroups (int __size, __gid_t __list[]); +extern int __group_member (__gid_t __gid); +extern int __setuid (__uid_t __uid); +extern int __setreuid (__uid_t __ruid, __uid_t __euid); +extern int __setgid (__gid_t __gid); +extern int __setregid (__gid_t __rgid, __gid_t __egid); +extern __pid_t __vfork (void); +extern int __ttyname_r (int __fd, char *__buf, size_t __buflen); +extern int __isatty (int __fd); +extern int __link (__const char *__from, __const char *__to); +extern int __symlink (__const char *__from, __const char *__to); +extern int __readlink (__const char *__path, char *__buf, size_t __len); +extern int __unlink (__const char *__name); +extern int __rmdir (__const char *__path); +extern int __gethostname (char *__name, size_t __len); +extern int __profil (unsigned short int *__sample_buffer, size_t __size, + size_t __offset, unsigned int __scale); +extern int __getdtablesize (void); +extern int __brk (void *__addr); /* This variable is set nonzero at startup if the process's effective |