diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/nlist.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getsysstats.c | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sleep.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysinfo.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 14 |
5 files changed, 16 insertions, 21 deletions
diff --git a/sysdeps/unix/nlist.c b/sysdeps/unix/nlist.c index b40aedbc82..ffdd21d796 100644 --- a/sysdeps/unix/nlist.c +++ b/sysdeps/unix/nlist.c @@ -26,9 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ which is terminated by an element with a NULL `n_un.n_name' member, and fill in the elements of NL. */ int -nlist (file, nl) - const char *file; - struct nlist *nl; +nlist (const char *file, struct nlist *nl) { FILE *f; struct exec header; diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index c4c6fd78f6..349da98e90 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -33,14 +33,11 @@ get_proc_path (char *buffer, size_t bufsize) FILE *fp; struct mntent mount_point; struct mntent *entry; - char *result; + char *result = NULL; /* First find the mount point of the proc filesystem. */ fp = __setmntent (_PATH_MNTTAB, "r"); - if (fp == NULL) - /* Cannot find mount table file. */ - result = NULL; - else + if (fp != NULL) { while ((entry = __getmntent_r (fp, &mount_point, buffer, bufsize)) != NULL) @@ -108,7 +105,7 @@ weak_alias (__get_nprocs, get_nprocs) /* As far as I know Linux has no separate numbers for configured and available processors. So make the `get_nprocs_conf' function an - prototype. */ + alias. */ strong_alias (__get_nprocs, __get_nprocs_conf) weak_alias (__get_nprocs, get_nprocs_conf) diff --git a/sysdeps/unix/sysv/linux/sleep.c b/sysdeps/unix/sysv/linux/sleep.c index 1094df5129..a4cf47bb0b 100644 --- a/sysdeps/unix/sysv/linux/sleep.c +++ b/sysdeps/unix/sysv/linux/sleep.c @@ -26,7 +26,7 @@ sleep (unsigned int seconds) struct timespec ts = { tv_sec: (long int) seconds, tv_nsec: 0 }; unsigned int result; - if (nanosleep (&ts, &ts) == 0) + if (__nanosleep (&ts, &ts) == 0) result = 0; else /* Round remaining time. */ diff --git a/sysdeps/unix/sysv/linux/sys/sysinfo.h b/sysdeps/unix/sysv/linux/sys/sysinfo.h index 1fabb06392..fbdb1def2b 100644 --- a/sysdeps/unix/sysv/linux/sys/sysinfo.h +++ b/sysdeps/unix/sysv/linux/sys/sysinfo.h @@ -29,12 +29,12 @@ extern int sysinfo __P ((struct sysinfo *__info)); /* Return number of configured processors. */ -extern int __get_nproc_conf __P ((void)); -extern int get_nproc_conf __P ((void)); +extern int __get_nprocs_conf __P ((void)); +extern int get_nprocs_conf __P ((void)); /* Return number of available processors. */ -extern int __get_nproc __P ((void)); -extern int get_nproc __P ((void)); +extern int __get_nprocs __P ((void)); +extern int get_nprocs __P ((void)); /* Return number of physical pages of memory in the system. */ diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 3601b5f357..f831b41072 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -1,6 +1,6 @@ # File name Caller Syscall name # args Strong name Weak names -adjtimex adjtime adjtimex 1 __adjtimex +adjtimex adjtime adjtimex 1 __adjtimex adjtimex bdflush EXTRA bdflush 2 bdflush create_module EXTRA create_module 3 create_module delete_module EXTRA delete_module 3 delete_module @@ -20,13 +20,13 @@ iopl - iopl 1 iopl ipc msgget ipc 5 __ipc klogctl EXTRA syslog 3 klogctl llseek EXTRA _llseek 5 llseek -mlock - mlock 2 __mlock mlock -mlockall - mlockall 1 __mlockall mlockall +mlock EXTRA mlock 2 __mlock mlock +mlockall EXTRA mlockall 1 __mlockall mlockall mount EXTRA mount 5 __mount mount -mremap - mremap 4 __mremap mremap -munlock - munlock 2 __munlock munlock -munlockall - munlockall 0 __munlockall munlockall -nanosleep - nanosleep 2 __libc_nanosleep nanosleep +mremap EXTRA mremap 4 __mremap mremap +munlock EXTRA munlock 2 __munlock munlock +munlockall EXTRA munlockall 0 __munlockall munlockall +nanosleep - nanosleep 2 __libc_nanosleep __nanosleep nanosleep pause - pause 0 __libc_pause pause personality init-first personality 1 __personality personality pipe - pipe 1 __pipe pipe |