fix various errors in function signatures/prototypes found by nsz

diff --git a/include/aio.h b/include/aio.h
index c0dab9c5bbbb2cb4ef4215c2ff2c01faf1dc6c85..cf94964f87b69619613af7fc984562c95d9a8cad 100644 (file)
--- 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 1bcb1bbf34bc7c32235778c89e1e672273a0c8aa..99ec6f1d59113d8b4f18acab7771522f589fa785 100644 (file)
--- 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 4cec647d9041919adc3c27c5eb88e6ab7fdadda9..5b1ea91fed3d6d21283937e7a17dcd0eda2d2309 100644 (file)
--- 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 35cfda8c61f6d248ef10f8283d0bdeb310b0a415..95b514ec474dd38ddafb52d012da95fa5777b8e4 100644 (file)
--- 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 cb2539e9f73cbaa5779311ead215741ae792f085..39a1d3a228c8d0611f8fbe51f78d1116a90d200b 100644 (file)
--- 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 b1a9fbde52c9aafc8fe8a8725bc4439b3018a311..9f2d7423530c5faa034f9b179176ccd60ba3bef2 100644 (file)
--- 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 7434bb690b6402c5ddd8b697f164bb06f70851ec..04d768d03aaf7935e27baef8900026cf95b6977a 100644 (file)
--- 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 11f45c01d70286253639bd293e5e7c92d8ed30aa..0c6d3861392e2db286176655805980ed6cfa5ecd 100644 (file)
--- a/src/unistd/readlink.c
+++ b/src/unistd/readlink.c
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #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 9565b89a78d317b50c8152aea939a1b6b805b2a6..e9498650bf0972e3cb79dc4adbb56b3c3d98e06f 100644 (file)
--- a/src/unistd/readlinkat.c
+++ b/src/unistd/readlinkat.c
@@ -1,7 +1,7 @@
 #include <unistd.h>
 #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);
 }