提交 13cd9695 编写于 作者: R Rich Felker

fix various errors in function signatures/prototypes found by nsz

上级 5e9deea0
......@@ -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 *);
......
......@@ -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 *);
......
......@@ -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
......
......@@ -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);
......
......@@ -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;
......
......@@ -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);
}
......@@ -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);
}
#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);
}
#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);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册