| Index: native_client_sdk/src/libraries/nacl_io/kernel_intercept.h
|
| diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_intercept.h b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.h
|
| index 65d269bb61f03748e4ab2b5ff4eb233dce8f8e2d..e75deb5e16426830d0908d2aaa927fa1c63e9c90 100644
|
| --- a/native_client_sdk/src/libraries/nacl_io/kernel_intercept.h
|
| +++ b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.h
|
| @@ -52,7 +52,6 @@ int ki_init_ppapi(void* kernel_proxy,
|
| PP_Instance instance,
|
| PPB_GetInterface get_browser_interface);
|
|
|
| -
|
| /*
|
| * ki_init_interface() is a variant of ki_init() that can be called with
|
| * a PepperInterface object.
|
| @@ -78,14 +77,17 @@ int ki_fchmod(int fd, mode_t mode);
|
| int ki_stat(const char* path, struct stat* buf);
|
| int ki_mkdir(const char* path, mode_t mode);
|
| int ki_rmdir(const char* path);
|
| -int ki_mount(const char* source, const char* target, const char* filesystemtype,
|
| - unsigned long mountflags, const void *data);
|
| +int ki_mount(const char* source,
|
| + const char* target,
|
| + const char* filesystemtype,
|
| + unsigned long mountflags,
|
| + const void* data);
|
| int ki_umount(const char* path);
|
| int ki_open(const char* path, int oflag);
|
| int ki_pipe(int pipefds[2]);
|
| ssize_t ki_read(int fd, void* buf, size_t nbyte);
|
| ssize_t ki_write(int fd, const void* buf, size_t nbyte);
|
| -int ki_fstat(int fd, struct stat *buf);
|
| +int ki_fstat(int fd, struct stat* buf);
|
| int ki_getdents(int fd, void* buf, unsigned int count);
|
| int ki_fsync(int fd);
|
| int ki_fdatasync(int fd);
|
| @@ -101,9 +103,13 @@ int ki_link(const char* oldpath, const char* newpath);
|
| int ki_rename(const char* oldpath, const char* newpath);
|
| int ki_symlink(const char* oldpath, const char* newpath);
|
| int ki_access(const char* path, int amode);
|
| -int ki_readlink(const char *path, char *buf, size_t count);
|
| -int ki_utimes(const char *path, const struct timeval times[2]);
|
| -void* ki_mmap(void* addr, size_t length, int prot, int flags, int fd,
|
| +int ki_readlink(const char* path, char* buf, size_t count);
|
| +int ki_utimes(const char* path, const struct timeval times[2]);
|
| +void* ki_mmap(void* addr,
|
| + size_t length,
|
| + int prot,
|
| + int flags,
|
| + int fd,
|
| off_t offset);
|
| int ki_munmap(void* addr, size_t length);
|
| int ki_open_resource(const char* file);
|
| @@ -114,17 +120,20 @@ int ki_fchown(int fd, uid_t owner, gid_t group);
|
| int ki_lchown(const char* path, uid_t owner, gid_t group);
|
| int ki_utime(const char* filename, const struct utimbuf* times);
|
|
|
| -int ki_poll(struct pollfd *fds, nfds_t nfds, int timeout);
|
| -int ki_select(int nfds, fd_set* readfds, fd_set* writefds,
|
| - fd_set* exceptfds, struct timeval* timeout);
|
| +int ki_poll(struct pollfd* fds, nfds_t nfds, int timeout);
|
| +int ki_select(int nfds,
|
| + fd_set* readfds,
|
| + fd_set* writefds,
|
| + fd_set* exceptfds,
|
| + struct timeval* timeout);
|
|
|
| int ki_tcflush(int fd, int queue_selector);
|
| int ki_tcgetattr(int fd, struct termios* termios_p);
|
| -int ki_tcsetattr(int fd, int optional_actions,
|
| - const struct termios *termios_p);
|
| +int ki_tcsetattr(int fd, int optional_actions, const struct termios* termios_p);
|
| int ki_kill(pid_t pid, int sig);
|
| int ki_killpg(pid_t pid, int sig);
|
| -int ki_sigaction(int signum, const struct sigaction* action,
|
| +int ki_sigaction(int signum,
|
| + const struct sigaction* action,
|
| struct sigaction* oaction);
|
| int ki_sigpause(int sigmask);
|
| int ki_sigpending(sigset_t* set);
|
| @@ -137,24 +146,36 @@ sighandler_t ki_sigset(int signum, sighandler_t handler);
|
| int ki_accept(int fd, struct sockaddr* addr, socklen_t* len);
|
| int ki_bind(int fd, const struct sockaddr* addr, socklen_t len);
|
| int ki_connect(int fd, const struct sockaddr* addr, socklen_t len);
|
| -void ki_freeaddrinfo(struct addrinfo *res);
|
| -int ki_getaddrinfo(const char *node, const char *service,
|
| - const struct addrinfo *hints,
|
| - struct addrinfo **res);
|
| +void ki_freeaddrinfo(struct addrinfo* res);
|
| +int ki_getaddrinfo(const char* node,
|
| + const char* service,
|
| + const struct addrinfo* hints,
|
| + struct addrinfo** res);
|
| struct hostent* ki_gethostbyname(const char* name);
|
| int ki_getpeername(int fd, struct sockaddr* addr, socklen_t* len);
|
| int ki_getsockname(int fd, struct sockaddr* addr, socklen_t* len);
|
| int ki_getsockopt(int fd, int lvl, int optname, void* optval, socklen_t* len);
|
| int ki_listen(int fd, int backlog);
|
| ssize_t ki_recv(int fd, void* buf, size_t len, int flags);
|
| -ssize_t ki_recvfrom(int fd, void* buf, size_t len, int flags,
|
| - struct sockaddr* addr, socklen_t* addrlen);
|
| +ssize_t ki_recvfrom(int fd,
|
| + void* buf,
|
| + size_t len,
|
| + int flags,
|
| + struct sockaddr* addr,
|
| + socklen_t* addrlen);
|
| ssize_t ki_recvmsg(int fd, struct msghdr* msg, int flags);
|
| ssize_t ki_send(int fd, const void* buf, size_t len, int flags);
|
| -ssize_t ki_sendto(int fd, const void* buf, size_t len, int flags,
|
| - const struct sockaddr* addr, socklen_t addrlen);
|
| +ssize_t ki_sendto(int fd,
|
| + const void* buf,
|
| + size_t len,
|
| + int flags,
|
| + const struct sockaddr* addr,
|
| + socklen_t addrlen);
|
| ssize_t ki_sendmsg(int fd, const struct msghdr* msg, int flags);
|
| -int ki_setsockopt(int fd, int lvl, int optname, const void* optval,
|
| +int ki_setsockopt(int fd,
|
| + int lvl,
|
| + int optname,
|
| + const void* optval,
|
| socklen_t len);
|
| int ki_shutdown(int fd, int how);
|
| int ki_socket(int domain, int type, int protocol);
|
|
|