svn commit: r219162 - stable/8/sys/compat/linux
Dmitry Chagin
dchagin at FreeBSD.org
Wed Mar 2 06:06:38 UTC 2011
Author: dchagin
Date: Wed Mar 2 06:06:38 2011
New Revision: 219162
URL: http://svn.freebsd.org/changeset/base/219162
Log:
MFC r218031:
Style(9) fixes.
Modified:
stable/8/sys/compat/linux/linux_misc.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/8/sys/compat/linux/linux_misc.c Wed Mar 2 06:03:54 2011 (r219161)
+++ stable/8/sys/compat/linux/linux_misc.c Wed Mar 2 06:06:38 2011 (r219162)
@@ -160,7 +160,7 @@ linux_sysinfo(struct thread *td, struct
sysinfo.freebig = 0;
sysinfo.mem_unit = 1;
- return copyout(&sysinfo, args->info, sizeof(sysinfo));
+ return (copyout(&sysinfo, args->info, sizeof(sysinfo)));
}
int
@@ -216,7 +216,7 @@ linux_brk(struct thread *td, struct linu
else
td->td_retval[0] = (long)old;
- return 0;
+ return (0);
}
#if defined(__i386__)
@@ -468,7 +468,7 @@ cleanup:
vm_map_remove(kernel_map, (vm_offset_t)a_out,
(vm_offset_t)a_out + PAGE_SIZE);
- return error;
+ return (error);
}
#endif /* __i386__ */
@@ -562,7 +562,7 @@ select_out:
if (ldebug(select))
printf(LMSG("select_out -> %d"), error);
#endif
- return error;
+ return (error);
}
int
@@ -602,7 +602,7 @@ linux_mremap(struct thread *td, struct l
if (args->new_len > args->old_len) {
td->td_retval[0] = 0;
- return ENOMEM;
+ return (ENOMEM);
}
if (args->new_len < args->old_len) {
@@ -613,7 +613,7 @@ linux_mremap(struct thread *td, struct l
}
td->td_retval[0] = error ? 0 : (uintptr_t)args->addr;
- return error;
+ return (error);
}
#define LINUX_MS_ASYNC 0x0001
@@ -629,7 +629,7 @@ linux_msync(struct thread *td, struct li
bsd_args.len = (uintptr_t)args->len;
bsd_args.flags = args->fl & ~LINUX_MS_SYNC;
- return msync(td, &bsd_args);
+ return (msync(td, &bsd_args));
}
int
@@ -647,9 +647,9 @@ linux_time(struct thread *td, struct lin
microtime(&tv);
tm = tv.tv_sec;
if (args->tm && (error = copyout(&tm, args->tm, sizeof(tm))))
- return error;
+ return (error);
td->td_retval[0] = tm;
- return 0;
+ return (0);
}
struct l_times_argv {
@@ -702,12 +702,12 @@ linux_times(struct thread *td, struct li
tms.tms_cstime = CONVTCK(cstime);
if ((error = copyout(&tms, args->buf, sizeof(tms))))
- return error;
+ return (error);
}
microuptime(&tv);
td->td_retval[0] = (int)CONVTCK(tv);
- return 0;
+ return (0);
}
int
@@ -766,7 +766,7 @@ linux_utime(struct thread *td, struct li
if (args->times) {
if ((error = copyin(args->times, &lut, sizeof lut))) {
LFREEPATH(fname);
- return error;
+ return (error);
}
tv[0].tv_sec = lut.l_actime;
tv[0].tv_usec = 0;
@@ -1003,11 +1003,11 @@ linux_personality(struct thread *td, str
printf(ARGS(personality, "%lu"), (unsigned long)args->per);
#endif
if (args->per != 0)
- return EINVAL;
+ return (EINVAL);
/* Yes Jim, it's still a Linux... */
td->td_retval[0] = 0;
- return 0;
+ return (0);
}
struct l_itimerval {
@@ -1085,7 +1085,7 @@ linux_nice(struct thread *td, struct lin
bsd_args.which = PRIO_PROCESS;
bsd_args.who = 0; /* current process */
bsd_args.prio = args->inc;
- return setpriority(td, &bsd_args);
+ return (setpriority(td, &bsd_args));
}
int
@@ -1312,12 +1312,12 @@ linux_sched_setscheduler(struct thread *
bsd.policy = SCHED_RR;
break;
default:
- return EINVAL;
+ return (EINVAL);
}
bsd.pid = args->pid;
bsd.param = (struct sched_param *)args->param;
- return sched_setscheduler(td, &bsd);
+ return (sched_setscheduler(td, &bsd));
}
int
@@ -1347,7 +1347,7 @@ linux_sched_getscheduler(struct thread *
break;
}
- return error;
+ return (error);
}
int
@@ -1372,9 +1372,9 @@ linux_sched_get_priority_max(struct thre
bsd.policy = SCHED_RR;
break;
default:
- return EINVAL;
+ return (EINVAL);
}
- return sched_get_priority_max(td, &bsd);
+ return (sched_get_priority_max(td, &bsd));
}
int
@@ -1399,9 +1399,9 @@ linux_sched_get_priority_min(struct thre
bsd.policy = SCHED_RR;
break;
default:
- return EINVAL;
+ return (EINVAL);
}
- return sched_get_priority_min(td, &bsd);
+ return (sched_get_priority_min(td, &bsd));
}
#define REBOOT_CAD_ON 0x89abcdef
@@ -1426,7 +1426,7 @@ linux_reboot(struct thread *td, struct l
#endif
if (args->magic1 != REBOOT_MAGIC1)
- return EINVAL;
+ return (EINVAL);
switch (args->magic2) {
case REBOOT_MAGIC2:
@@ -1434,7 +1434,7 @@ linux_reboot(struct thread *td, struct l
case REBOOT_MAGIC2B:
break;
default:
- return EINVAL;
+ return (EINVAL);
}
switch (args->cmd) {
@@ -1452,9 +1452,9 @@ linux_reboot(struct thread *td, struct l
bsd_args.opt = RB_POWEROFF;
break;
default:
- return EINVAL;
+ return (EINVAL);
}
- return reboot(td, &bsd_args);
+ return (reboot(td, &bsd_args));
}
@@ -1592,7 +1592,7 @@ linux_getsid(struct thread *td, struct l
#endif
bsd.pid = args->pid;
- return getsid(td, &bsd);
+ return (getsid(td, &bsd));
}
int
@@ -1617,7 +1617,7 @@ linux_getpriority(struct thread *td, str
bsd_args.who = args->who;
error = getpriority(td, &bsd_args);
td->td_retval[0] = 20 - td->td_retval[0];
- return error;
+ return (error);
}
int
More information about the svn-src-stable-8
mailing list