From 13cd969552409e05c941829f2aabb15e2f4d9a1f Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 13 Sep 2011 21:09:35 -0400 Subject: fix various errors in function signatures/prototypes found by nsz --- include/aio.h | 4 ++-- include/spawn.h | 4 ++-- include/time.h | 2 +- include/unistd.h | 6 +++--- src/aio/aio_suspend.c | 2 +- src/process/posix_spawn.c | 8 +++++--- src/process/posix_spawnp.c | 5 +++-- src/unistd/readlink.c | 2 +- src/unistd/readlinkat.c | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/include/aio.h b/include/aio.h index c0dab9c5..cf94964f 100644 --- a/include/aio.h +++ b/include/aio.h @@ -43,10 +43,10 @@ struct aiocb { ssize_t aio_read(struct aiocb *); ssize_t aio_write(struct aiocb *); -int aio_error(struct aiocb *); +int aio_error(const struct aiocb *); ssize_t aio_return(struct aiocb *); int aio_cancel(int, struct aiocb *); -int aio_suspend(struct aiocb *const [], int, const struct timespec *); +int aio_suspend(const struct aiocb *const [], int, const struct timespec *); int aio_fsync(int, struct aiocb *); int lio_listio(int, struct aiocb *const [], int, struct sigevent *); diff --git a/include/spawn.h b/include/spawn.h index 1bcb1bbf..99ec6f1d 100644 --- a/include/spawn.h +++ b/include/spawn.h @@ -34,9 +34,9 @@ typedef struct { } posix_spawn_file_actions_t; int posix_spawn(pid_t *, const char *, const posix_spawn_file_actions_t *, - const posix_spawnattr_t *, char **, char **); + const posix_spawnattr_t *, char *const [], char *const []); int posix_spawnp(pid_t *, const char *, const posix_spawn_file_actions_t *, - const posix_spawnattr_t *, char **, char **); + const posix_spawnattr_t *, char *const [], char *const []); int posix_spawnattr_init(posix_spawnattr_t *); int posix_spawnattr_destroy(posix_spawnattr_t *); diff --git a/include/time.h b/include/time.h index 4cec647d..5b1ea91f 100644 --- a/include/time.h +++ b/include/time.h @@ -102,7 +102,7 @@ extern int daylight; extern long timezone; extern char *tzname[2]; extern int getdate_err; -extern struct tm *getdate (const char *); +struct tm *getdate (const char *); #endif diff --git a/include/unistd.h b/include/unistd.h index 35cfda8c..95b514ec 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -55,8 +55,8 @@ int link(const char *, const char *); int linkat(int, const char *, int, const char *, int); int symlink(const char *, const char *); int symlinkat(const char *, int, const char *); -int readlink(const char *, char *, size_t); -int readlinkat(int, const char *, char *, size_t); +ssize_t readlink(const char *, char *, size_t); +ssize_t readlinkat(int, const char *, char *, size_t); int unlink(const char *); int unlinkat(int, const char *, int); int rmdir(const char *); @@ -134,7 +134,7 @@ size_t confstr(int, char *, size_t); #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) int lockf(int, int, off_t); -int setpgrp(void); +pid_t setpgrp(void); char *crypt(const char *, const char *); void encrypt(char *, int); void swab(const void *, void *, ssize_t); diff --git a/src/aio/aio_suspend.c b/src/aio/aio_suspend.c index cb2539e9..39a1d3a2 100644 --- a/src/aio/aio_suspend.c +++ b/src/aio/aio_suspend.c @@ -16,7 +16,7 @@ void __aio_wake(void) __wake(&seq, -1, 1); } -int aio_suspend(struct aiocb *const cbs[], int cnt, const struct timespec *ts) +int aio_suspend(const struct aiocb *const cbs[], int cnt, const struct timespec *ts) { int i, last, first=1, ret=0; struct timespec at; diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c index b1a9fbde..9f2d7423 100644 --- a/src/process/posix_spawn.c +++ b/src/process/posix_spawn.c @@ -11,7 +11,8 @@ extern char **environ; int __posix_spawnx(pid_t *res, const char *path, int (*exec)(const char *, char *const *), const posix_spawn_file_actions_t *fa, - const posix_spawnattr_t *attr, char **argv, char **envp) + const posix_spawnattr_t *attr, + char *const argv[], char *const envp[]) { pid_t pid; sigset_t oldmask; @@ -81,7 +82,7 @@ int __posix_spawnx(pid_t *res, const char *path, sigprocmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK) ? &attr->__mask : &oldmask, 0); - if (envp) environ = envp; + if (envp) environ = (char **)envp; exec(path, argv); _exit(127); @@ -90,7 +91,8 @@ int __posix_spawnx(pid_t *res, const char *path, int posix_spawn(pid_t *res, const char *path, const posix_spawn_file_actions_t *fa, - const posix_spawnattr_t *attr, char **argv, char **envp) + const posix_spawnattr_t *attr, + char *const argv[], char *const envp[]) { return __posix_spawnx(res, path, execv, fa, attr, argv, envp); } diff --git a/src/process/posix_spawnp.c b/src/process/posix_spawnp.c index 7434bb69..04d768d0 100644 --- a/src/process/posix_spawnp.c +++ b/src/process/posix_spawnp.c @@ -4,11 +4,12 @@ int __posix_spawnx(pid_t *, const char *, int (*)(const char *, char *const *), const posix_spawn_file_actions_t *, - const posix_spawnattr_t *, char **, char **); + const posix_spawnattr_t *, char *const [], char *const []); int posix_spawnp(pid_t *res, const char *file, const posix_spawn_file_actions_t *fa, - const posix_spawnattr_t *attr, char **argv, char **envp) + const posix_spawnattr_t *attr, + char *const argv[], char *const envp[]) { return __posix_spawnx(res, file, execvp, fa, attr, argv, envp); } diff --git a/src/unistd/readlink.c b/src/unistd/readlink.c index 11f45c01..0c6d3861 100644 --- a/src/unistd/readlink.c +++ b/src/unistd/readlink.c @@ -1,7 +1,7 @@ #include #include "syscall.h" -int readlink(const char *path, char *buf, size_t bufsize) +ssize_t readlink(const char *path, char *buf, size_t bufsize) { return syscall(SYS_readlink, path, buf, bufsize); } diff --git a/src/unistd/readlinkat.c b/src/unistd/readlinkat.c index 9565b89a..e9498650 100644 --- a/src/unistd/readlinkat.c +++ b/src/unistd/readlinkat.c @@ -1,7 +1,7 @@ #include #include "syscall.h" -int readlinkat(int fd, const char *path, char *buf, size_t bufsize) +ssize_t readlinkat(int fd, const char *path, char *buf, size_t bufsize) { return syscall(SYS_readlinkat, fd, path, buf, bufsize); } -- cgit v1.2.1