From a06cfef38d804627bd0e2af6029c20fdede9f05b Mon Sep 17 00:00:00 2001 From: Nicolas Joly Date: Mon, 6 Oct 2008 14:53:01 +0000 Subject: [PATCH] Cleanup. Reduce diffs against netbsd32 syscalls.master. - Remove const keyword for pointer types. - Update some argument types. --- sys/compat/linux32/arch/amd64/syscalls.master | 90 +++++++++++++-------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/sys/compat/linux32/arch/amd64/syscalls.master b/sys/compat/linux32/arch/amd64/syscalls.master index 92c8dd97a1f..4b6de7b5c02 100644 --- a/sys/compat/linux32/arch/amd64/syscalls.master +++ b/sys/compat/linux32/arch/amd64/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.36 2008/07/24 12:09:56 njoly Exp $ + $NetBSD: syscalls.master,v 1.37 2008/09/22 13:07:46 njoly Exp $ ; NetBSD i386 COMPAT_LINUX32 system call name/number "master" file. ; (See syscalls.conf to see what it is processed into.) @@ -68,24 +68,24 @@ 3 NOARGS { netbsd32_ssize_t netbsd32_read(int fd, \ netbsd32_voidp buf, netbsd32_size_t nbyte); } 4 NOARGS { netbsd32_ssize_t netbsd32_write(int fd, \ - const netbsd32_voidp buf, netbsd32_size_t nbyte); } -5 STD { int linux32_sys_open(const netbsd32_charp path, int flags, \ + netbsd32_voidp buf, netbsd32_size_t nbyte); } +5 STD { int linux32_sys_open(netbsd32_charp path, int flags, \ int mode); } 6 NOARGS { int netbsd32_close(int fd); } 7 STD { int linux32_sys_waitpid(int pid, netbsd32_intp status, \ int options);} -8 STD { int linux32_sys_creat(const netbsd32_charp path, int mode); } -9 NOARGS { int netbsd32_link(const netbsd32_charp path, \ - const netbsd32_charp link); } -10 STD { int linux32_sys_unlink(const netbsd32_charp path); } -11 NOARGS { int netbsd32_execve(const netbsd32_charp path, \ +8 STD { int linux32_sys_creat(netbsd32_charp path, int mode); } +9 NOARGS { int netbsd32_link(netbsd32_charp path, \ + netbsd32_charp link); } +10 STD { int linux32_sys_unlink(netbsd32_charp path); } +11 NOARGS { int netbsd32_execve(netbsd32_charp path, \ netbsd32_charpp argp, netbsd32_charpp envp); } -12 NOARGS { int netbsd32_chdir(const netbsd32_charp path); } +12 NOARGS { int netbsd32_chdir(netbsd32_charp path); } 13 STD { int linux32_sys_time(linux32_timep_t t); } -14 STD { int linux32_sys_mknod(const netbsd32_charp path, \ +14 STD { int linux32_sys_mknod(netbsd32_charp path, \ int mode, int dev); } -15 NOARGS { int netbsd32_chmod(const netbsd32_charp path, int mode); } -16 STD { int linux32_sys_lchown16(const netbsd32_charp path, \ +15 NOARGS { int netbsd32_chmod(netbsd32_charp path, int mode); } +16 STD { int linux32_sys_lchown16(netbsd32_charp path, \ linux32_uid16_t uid, linux32_gid16_t gid); } 17 STD { int linux32_sys_break(netbsd32_charp nsize); } 18 OBSOL ostat @@ -102,20 +102,20 @@ 27 STD { int linux32_sys_alarm(unsigned int secs); } 28 OBSOL ofstat 29 NOARGS { int linux_sys_pause(void); } -30 STD { int linux32_sys_utime(const netbsd32_charp path, \ +30 STD { int linux32_sys_utime(netbsd32_charp path, \ linux32_utimbufp_t times); } 31 OBSOL stty 32 OBSOL gtty -33 NOARGS { int netbsd32_access(const netbsd32_charp path, \ +33 NOARGS { int netbsd32_access(netbsd32_charp path, \ int flags); } 34 STD { int linux32_sys_nice(int incr); } 35 OBSOL ftime 36 NOARGS { int sys_sync(void); } 37 STD { int linux32_sys_kill(int pid, int signum); } -38 NOARGS { int netbsd32___posix_rename(const netbsd32_charp from, \ - const netbsd32_charp to); } -39 NOARGS { int netbsd32_mkdir(const netbsd32_charp path, int mode); } -40 NOARGS { int netbsd32_rmdir(const netbsd32_charp path); } +38 NOARGS { int netbsd32___posix_rename(netbsd32_charp from, \ + netbsd32_charp to); } +39 NOARGS { int netbsd32_mkdir(netbsd32_charp path, int mode); } +40 NOARGS { int netbsd32_rmdir(netbsd32_charp path); } 41 NOARGS { int netbsd32_dup(u_int fd); } 42 STD { int linux32_sys_pipe(netbsd32_intp fd); } 43 STD { int linux32_sys_times(linux32_tmsp_t tms); } @@ -142,7 +142,7 @@ 60 NOARGS { int netbsd32_umask(int newmask); } 61 NOARGS { int netbsd32_chroot(netbsd32_charp path); } 62 UNIMPL ustat -63 NOARGS { int netbsd32_dup2(u_int from, u_int to); } +63 NOARGS { int netbsd32_dup2(int from, int to); } 64 STD { pid_t linux_sys_getppid(void); } 65 NOARGS { int sys_getpgrp(void); } 66 NOARGS { int sys_setsid(void); } @@ -173,11 +173,11 @@ linux32_gid16p_t gidset); } 82 STD { int linux32_sys_oldselect(linux32_oldselectp_t lsp); } 83 NOARGS { int netbsd32_symlink(netbsd32_charp path, \ - const netbsd32_charp link); } -84 NOARGS { int compat_43_netbsd32_lstat43(const netbsd32_charp \ + netbsd32_charp link); } +84 NOARGS { int compat_43_netbsd32_lstat43(netbsd32_charp \ path, netbsd32_stat43p_t ub); } -85 NOARGS { int netbsd32_readlink(const netbsd32_charp name, \ - netbsd32_charp buf, int count); } +85 NOARGS { int netbsd32_readlink(netbsd32_charp name, \ + netbsd32_charp buf, netbsd32_size_t count); } 86 UNIMPL uselib 87 STD { int linux32_sys_swapon(netbsd32_charp name); } 88 STD { int linux32_sys_reboot(int magic1, int magic2, int cmd, \ @@ -185,8 +185,9 @@ 89 STD { int linux32_sys_readdir(int fd, netbsd32_voidp dent, \ unsigned int count); } 90 STD { int linux32_sys_old_mmap(linux32_oldmmapp lmp); } -91 NOARGS { int netbsd32_munmap(netbsd32_caddr_t addr, int len); } -92 NOARGS { int compat_43_netbsd32_otruncate(const netbsd32_charp path, \ +91 NOARGS { int netbsd32_munmap(netbsd32_voidp addr, \ + netbsd32_size_t len); } +92 NOARGS { int compat_43_netbsd32_otruncate(netbsd32_charp path, \ netbsd32_long length); } 93 NOARGS { int compat_43_netbsd32_oftruncate(int fd, \ netbsd32_long length); } @@ -196,15 +197,15 @@ 96 STD { int linux32_sys_getpriority(int which, int who); } 97 NOARGS { int netbsd32_setpriority(int which, int who, int prio); } 98 UNIMPL profil -99 STD { int linux32_sys_statfs(const netbsd32_charp path, \ +99 STD { int linux32_sys_statfs(netbsd32_charp path, \ linux32_statfsp sp); } 100 UNIMPL fstatfs 101 UNIMPL ioperm 102 STD { int linux32_sys_socketcall(int what, netbsd32_voidp args); } 103 UNIMPL syslog -104 NOARGS { int netbsd32_setitimer(u_int which, \ +104 NOARGS { int netbsd32_setitimer(int which, \ netbsd32_itimervalp_t itv, netbsd32_itimervalp_t oitv); } -105 NOARGS { int netbsd32_getitimer(u_int which, \ +105 NOARGS { int netbsd32_getitimer(int which, \ netbsd32_itimervalp_t itv); } 106 UNIMPL stat 107 UNIMPL lstat @@ -216,7 +217,7 @@ 113 UNIMPL vm86old 114 STD { int linux32_sys_wait4(int pid, netbsd32_intp status, \ int options, netbsd32_rusagep_t rusage); } -115 STD { int linux32_sys_swapoff(const netbsd32_charp path); } +115 STD { int linux32_sys_swapoff(netbsd32_charp path); } 116 STD { int linux32_sys_sysinfo(linux32_sysinfop_t arg); } 117 STD { int linux32_sys_ipc(int what, int a1, int a2, int a3, \ netbsd32_voidp ptr); } @@ -256,9 +257,9 @@ 144 NOARGS { int netbsd32___msync13(netbsd32_voidp addr, \ netbsd32_size_t len, int flags); } 145 NOARGS { int netbsd32_readv(int fd, \ - const netbsd32_iovecp_t iovp, u_int iovcnt); } + netbsd32_iovecp_t iovp, int iovcnt); } 146 NOARGS { netbsd32_ssize_t netbsd32_writev(int fd, \ - const netbsd32_iovecp_t iovp, int iovcnt); } + netbsd32_iovecp_t iovp, int iovcnt); } 147 NOARGS { pid_t netbsd32_getsid(pid_t pid); } 148 STD { int linux32_sys_fdatasync(int fd); } 149 STD { int linux32_sys___sysctl(linux32___sysctlp_t lsp); } @@ -272,17 +273,16 @@ 155 STD { int linux32_sys_sched_getparam(pid_t pid, \ linux32_sched_paramp_t sp); } 156 STD { int linux32_sys_sched_setscheduler(pid_t pid, \ - int policy, const linux32_sched_paramp_t sp); } + int policy, linux32_sched_paramp_t sp); } 157 STD { int linux32_sys_sched_getscheduler(pid_t pid); } 158 NOARGS { int linux_sys_sched_yield(void); } 159 UNIMPL sched_get_priority_max 160 UNIMPL sched_get_priority_min 161 UNIMPL sched_rr_get_interval -162 NOARGS { int netbsd32_nanosleep(const \ - netbsd32_timespecp_t rqtp \ +162 NOARGS { int netbsd32_nanosleep(netbsd32_timespecp_t rqtp \ netbsd32_timespecp_t rmtp); } 163 STD { int linux32_sys_mremap(netbsd32_voidp old_address, \ - netbsd32_size_t old_size , netbsd32_size_t new_size, \ + netbsd32_size_t old_size, netbsd32_size_t new_size, \ netbsd32_u_long flags); } 164 STD { int linux32_sys_setresuid16(linux32_uid16_t ruid, \ linux32_uid16_t euid, linux32_uid16_t suid); } @@ -300,11 +300,11 @@ 172 UNIMPL prctl 173 STD { int linux32_sys_rt_sigreturn(linux32_ucontextp_t ucp); } 174 STD { int linux32_sys_rt_sigaction(int signum, \ - const linux32_sigactionp_t nsa, \ + linux32_sigactionp_t nsa, \ linux32_sigactionp_t osa, \ netbsd32_size_t sigsetsize); } 175 STD { int linux32_sys_rt_sigprocmask(int how, \ - const linux32_sigsetp_t set, \ + linux32_sigsetp_t set, \ linux32_sigsetp_t oset, \ netbsd32_size_t sigsetsize); } 176 STD { int linux32_sys_rt_sigpending(linux32_sigsetp_t set, \ @@ -317,9 +317,9 @@ netbsd32_voidp buf, netbsd32_size_t nbyte, \ linux32_off_t offset); } 181 STD { netbsd32_ssize_t linux32_sys_pwrite(int fd, \ - const netbsd32_voidp buf, netbsd32_size_t nbyte, \ + netbsd32_voidp buf, netbsd32_size_t nbyte, \ linux32_off_t offset); } -182 STD { int linux32_sys_chown16(const netbsd32_charp path, \ +182 STD { int linux32_sys_chown16(netbsd32_charp path, \ linux32_uid16_t uid, linux32_gid16_t gid); } 183 NOARGS { int netbsd32___getcwd(netbsd32_charp bufp, \ netbsd32_size_t length); } @@ -337,14 +337,14 @@ linux32_off_t offset); } 193 UNIMPL truncate64 194 UNIMPL ftruncate64 -195 STD { int linux32_sys_stat64(const netbsd32_charp path, \ +195 STD { int linux32_sys_stat64(netbsd32_charp path, \ linux32_stat64p sp); } -196 STD { int linux32_sys_lstat64(const netbsd32_charp path, \ +196 STD { int linux32_sys_lstat64(netbsd32_charp path, \ linux32_stat64p sp); } 197 STD { int linux32_sys_fstat64(int fd, \ linux32_stat64p sp); } -198 NOARGS { int netbsd32___posix_lchown(const netbsd32_charp path, \ - int uid, int gid); } +198 NOARGS { int netbsd32___posix_lchown(netbsd32_charp path, \ + uid_t uid, gid_t gid); } 199 NOARGS { uid_t sys_getuid(void); } 200 NOARGS { gid_t sys_getgid(void); } 201 NOARGS { uid_t sys_geteuid(void); } @@ -362,8 +362,8 @@ 210 STD { int linux32_sys_setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } 211 UNIMPL getresgid -212 NOARGS { int netbsd32___posix_chown(const netbsd32_charp path, \ - int uid, int gid); } +212 NOARGS { int netbsd32___posix_chown(netbsd32_charp path, \ + uid_t uid, gid_t gid); } 213 NOARGS { int netbsd32_setuid(uid_t uid); } 214 NOARGS { int netbsd32_setgid(gid_t gid); } 215 STD { int linux32_sys_setfsuid(uid_t uid); } -- 2.11.4.GIT