diff options
author | des <des@FreeBSD.org> | 2003-03-03 09:17:12 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2003-03-03 09:17:12 +0000 |
commit | 3c182bd3cd14b38db69ecb7fbaa4fbad85bf23c4 (patch) | |
tree | 60276925092cec90d0959942b4beda059d93328f /sys/compat | |
parent | 021faa11ac3e8868e33ee981995319d77cba1b58 (diff) | |
download | FreeBSD-src-3c182bd3cd14b38db69ecb7fbaa4fbad85bf23c4.zip FreeBSD-src-3c182bd3cd14b38db69ecb7fbaa4fbad85bf23c4.tar.gz |
Clean up whitespace and remove register keyword.
Diffstat (limited to 'sys/compat')
-rw-r--r-- | sys/compat/linux/linux_file.c | 32 | ||||
-rw-r--r-- | sys/compat/linux/linux_ipc.c | 32 | ||||
-rw-r--r-- | sys/compat/linux/linux_misc.c | 14 | ||||
-rw-r--r-- | sys/compat/linux/linux_socket.c | 4 | ||||
-rw-r--r-- | sys/compat/linux/linux_stats.c | 12 | ||||
-rw-r--r-- | sys/compat/linux/linux_sysctl.c | 2 |
6 files changed, 48 insertions, 48 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 56b1fc8..1831361 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -97,7 +97,7 @@ linux_open(struct thread *td, struct linux_open_args *args) bsd_flags = 0; if (args->flags & LINUX_O_RDONLY) bsd_flags |= O_RDONLY; - if (args->flags & LINUX_O_WRONLY) + if (args->flags & LINUX_O_WRONLY) bsd_flags |= O_WRONLY; if (args->flags & LINUX_O_RDWR) bsd_flags |= O_RDWR; @@ -245,7 +245,7 @@ static int getdents_common(struct thread *td, struct linux_getdents64_args *args, int is64bit) { - register struct dirent *bdp; + struct dirent *bdp; struct vnode *vp; caddr_t inp, buf; /* BSD-format */ int len, reclen; /* BSD-format */ @@ -735,23 +735,23 @@ int linux_mount(struct thread *td, struct linux_mount_args *args) { struct ufs_args ufs; - char fstypename[MFSNAMELEN]; - char mntonname[MNAMELEN], mntfromname[MNAMELEN]; + char fstypename[MFSNAMELEN]; + char mntonname[MNAMELEN], mntfromname[MNAMELEN]; int error; int fsflags; const char *fstype; void *fsdata; - error = copyinstr(args->filesystemtype, fstypename, MFSNAMELEN - 1, + error = copyinstr(args->filesystemtype, fstypename, MFSNAMELEN - 1, NULL); if (error) - return (error); - error = copyinstr(args->specialfile, mntfromname, MFSNAMELEN - 1, NULL); + return (error); + error = copyinstr(args->specialfile, mntfromname, MFSNAMELEN - 1, NULL); if (error) - return (error); - error = copyinstr(args->dir, mntonname, MFSNAMELEN - 1, NULL); + return (error); + error = copyinstr(args->dir, mntonname, MFSNAMELEN - 1, NULL); if (error) - return (error); + return (error); #ifdef DEBUG if (ldebug(mount)) @@ -782,15 +782,15 @@ linux_mount(struct thread *td, struct linux_mount_args *args) * FreeBSD has is !ASYNC, which is our default. */ if (args->rwflag & LINUX_MS_RDONLY) - fsflags |= MNT_RDONLY; + fsflags |= MNT_RDONLY; if (args->rwflag & LINUX_MS_NOSUID) - fsflags |= MNT_NOSUID; + fsflags |= MNT_NOSUID; if (args->rwflag & LINUX_MS_NODEV) - fsflags |= MNT_NODEV; + fsflags |= MNT_NODEV; if (args->rwflag & LINUX_MS_NOEXEC) - fsflags |= MNT_NOEXEC; + fsflags |= MNT_NOEXEC; if (args->rwflag & LINUX_MS_REMOUNT) - fsflags |= MNT_UPDATE; + fsflags |= MNT_UPDATE; } return (vfs_mount(td, fstype, mntonname, fsflags, fsdata)); diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 1a6d3d7..64a496c 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -260,7 +260,7 @@ linux_ipc_perm_to_ipc64_perm(struct l_ipc_perm *in, struct l_ipc64_perm *out) out->mode = in->mode; out->seq = in->seq; } - + static int linux_msqid_pullup(l_int ver, struct l_msqid_ds *linux_msqid, caddr_t uaddr) { @@ -531,7 +531,7 @@ linux_semctl(struct thread *td, struct linux_semctl_args *args) error = __semctl(td, &bsd_args); if (error) return error; - td->td_retval[0] = IXSEQ_TO_IPCID(bsd_args.semid, + td->td_retval[0] = IXSEQ_TO_IPCID(bsd_args.semid, unptr->buf->sem_perm); bsd_to_linux_semid_ds(unptr->buf, &linux_semid); return (linux_semid_pushdown(args->cmd & LINUX_IPC_64, @@ -567,10 +567,10 @@ int linux_msgsnd(struct thread *td, struct linux_msgsnd_args *args) { struct msgsnd_args /* { - int msqid; - void *msgp; - size_t msgsz; - int msgflg; + int msqid; + void *msgp; + size_t msgsz; + int msgflg; } */ bsd_args; bsd_args.msqid = args->msqid; @@ -583,13 +583,13 @@ linux_msgsnd(struct thread *td, struct linux_msgsnd_args *args) int linux_msgrcv(struct thread *td, struct linux_msgrcv_args *args) { - struct msgrcv_args /* { - int msqid; - void *msgp; - size_t msgsz; - long msgtyp; - int msgflg; - } */ bsd_args; + struct msgrcv_args /* { + int msqid; + void *msgp; + size_t msgsz; + long msgtyp; + int msgflg; + } */ bsd_args; bsd_args.msqid = args->msqid; bsd_args.msgp = args->msgp; @@ -604,7 +604,7 @@ linux_msgget(struct thread *td, struct linux_msgget_args *args) { struct msgget_args /* { key_t key; - int msgflg; + int msgflg; } */ bsd_args; bsd_args.key = args->key; @@ -616,7 +616,7 @@ int linux_msgctl(struct thread *td, struct linux_msgctl_args *args) { struct msgctl_args /* { - int msqid; + int msqid; int cmd; struct msqid_ds *buf; } */ bsd_args; diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index c2130db..c16ae88 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -566,20 +566,20 @@ select_out: return error; } -int +int linux_mremap(struct thread *td, struct linux_mremap_args *args) { struct munmap_args /* { void *addr; size_t len; - } */ bsd_args; + } */ bsd_args; int error = 0; - + #ifdef DEBUG if (ldebug(mremap)) printf(ARGS(mremap, "%p, %08lx, %08lx, %08lx"), - (void *)args->addr, - (unsigned long)args->old_len, + (void *)args->addr, + (unsigned long)args->old_len, (unsigned long)args->new_len, (unsigned long)args->flags); #endif @@ -913,9 +913,9 @@ linux_setitimer(struct thread *td, struct linux_setitimer_args *args) return error; #ifdef DEBUG if (ldebug(setitimer)) { - printf("setitimer: value: sec: %ld, usec: %ld\n", + printf("setitimer: value: sec: %ld, usec: %ld\n", foo.it_value.tv_sec, foo.it_value.tv_usec); - printf("setitimer: interval: sec: %ld, usec: %ld\n", + printf("setitimer: interval: sec: %ld, usec: %ld\n", foo.it_interval.tv_sec, foo.it_interval.tv_usec); } #endif diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 7e7d3fc..e9dcb4b 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -551,7 +551,7 @@ linux_socket(struct thread *td, struct linux_socket_args *args) /* * XXX: Avoid undefined symbol error with an IPv4 only * kernel. - */ + */ && ip6_v6only #endif ) { diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index dcb15cf..07a962b 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -141,7 +141,7 @@ linux_newlstat(struct thread *td, struct linux_newlstat_args *args) LFREEPATH(path); if (error) return (error); - NDFREE(&nd, NDF_ONLY_PNBUF); + NDFREE(&nd, NDF_ONLY_PNBUF); error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); vput(nd.ni_vp); @@ -264,7 +264,7 @@ linux_statfs(struct thread *td, struct linux_statfs_args *args) linux_statfs.f_blocks = bsd_statfs->f_blocks; linux_statfs.f_bfree = bsd_statfs->f_bfree; linux_statfs.f_bavail = bsd_statfs->f_bavail; - linux_statfs.f_ffree = bsd_statfs->f_ffree; + linux_statfs.f_ffree = bsd_statfs->f_ffree; linux_statfs.f_files = bsd_statfs->f_files; linux_statfs.f_fsid.val[0] = bsd_statfs->f_fsid.val[0]; linux_statfs.f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; @@ -308,7 +308,7 @@ linux_fstatfs(struct thread *td, struct linux_fstatfs_args *args) linux_statfs.f_blocks = bsd_statfs->f_blocks; linux_statfs.f_bfree = bsd_statfs->f_bfree; linux_statfs.f_bavail = bsd_statfs->f_bavail; - linux_statfs.f_ffree = bsd_statfs->f_ffree; + linux_statfs.f_ffree = bsd_statfs->f_ffree; linux_statfs.f_files = bsd_statfs->f_files; linux_statfs.f_fsid.val[0] = bsd_statfs->f_fsid.val[0]; linux_statfs.f_fsid.val[1] = bsd_statfs->f_fsid.val[1]; @@ -318,7 +318,7 @@ linux_fstatfs(struct thread *td, struct linux_fstatfs_args *args) return error; } -struct l_ustat +struct l_ustat { l_daddr_t f_tfree; l_ino_t f_tinode; @@ -460,7 +460,7 @@ linux_lstat64(struct thread *td, struct linux_lstat64_args *args) LFREEPATH(filename); if (error) return (error); - NDFREE(&nd, NDF_ONLY_PNBUF); + NDFREE(&nd, NDF_ONLY_PNBUF); error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); vput(nd.ni_vp); diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 4e08402..94ecc47 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the |