Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 12 Aug 2010 09:37:54 -0700
From:      mdf@FreeBSD.org
To:        Jung-uk Kim <jkim@freebsd.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org
Subject:   Re: svn commit: r211228 - head/sys/kern
Message-ID:  <AANLkTinPO8eZy8YH8qjwvg9sCMDt10K9v62KzyGjnPug@mail.gmail.com>
In-Reply-To: <201008121613.o7CGDOij028986@svn.freebsd.org>
References:  <201008121613.o7CGDOij028986@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help 
On Thu, Aug 12, 2010 at 9:13 AM, Jung-uk Kim <jkim@freebsd.org> wrote:
> Author: jkim
> Date: Thu Aug 12 16:13:24 2010
> New Revision: 211228
> URL: http://svn.freebsd.org/changeset/base/211228
>
> Log:
> =A0Provide description for 'machdep.disable_rtc_set' sysctl. =A0Clean up =
style(9)
> =A0nits. =A0Remove a redundant return statement and an unnecessary variab=
le.
>
> Modified:
> =A0head/sys/kern/subr_rtc.c
>
> Modified: head/sys/kern/subr_rtc.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/kern/subr_rtc.c =A0 =A0Thu Aug 12 15:46:15 2010 =A0 =A0 =A0 =
=A0(r211227)
> +++ head/sys/kern/subr_rtc.c =A0 =A0Thu Aug 12 16:13:24 2010 =A0 =A0 =A0 =
=A0(r211228)
> @@ -65,8 +65,8 @@ static long clock_res;
>
> =A0/* XXX: should be kern. now, it's no longer machdep. =A0*/
> =A0static int disable_rtc_set;
> -SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
> - =A0 =A0 =A0 CTLFLAG_RW, &disable_rtc_set, 0, "");
> +SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set, CTLFLAG_RW, &disable_rtc=
_set,
> + =A0 =A00, "Disallow adjusting time-of-day clock");
>
> =A0void
> =A0clock_register(device_t dev, long res) /* res has units of microsecond=
s */
> @@ -74,26 +74,22 @@ clock_register(device_t dev, long res) =A0 =A0 =A0/
>
> =A0 =A0 =A0 =A0if (clock_dev !=3D NULL) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (clock_res > res) {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (bootverbose) {
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (bootverbose)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0device_pri=
ntf(dev, "not installed as "
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"t=
ime-of-day clock: clock %s has higher "
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"r=
esolution\n", device_get_name(clock_dev));
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }

While the device_printf() is a single statement, it spans multiple
lines.  It seems in this instance that clarity is preserved better by
using braces even though not required by C.

Quoting style(9):

Space after keywords (if, while, for, return, switch).  No braces ('{'
and '}') are used for control statements with zero or only a single
statement unless that statement is more than a single line in which case
they are permitted.

So both styles are accepted, and I would think that changing this is
needless code churn.

Thanks,
matthew

> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return;
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (bootverbose) {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 device_prin=
tf(clock_dev, "removed as "
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "ti=
me-of-day clock: clock %s has higher "
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "re=
solution\n", device_get_name(dev));
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (bootverbose)
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 device_printf(clock_dev, "r=
emoved as "
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "time-of-day clock:=
 clock %s has higher "
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "resolution\n", dev=
ice_get_name(dev));
> =A0 =A0 =A0 =A0}
> =A0 =A0 =A0 =A0clock_dev =3D dev;
> =A0 =A0 =A0 =A0clock_res =3D res;
> - =A0 =A0 =A0 if (bootverbose) {
> + =A0 =A0 =A0 if (bootverbose)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0device_printf(dev, "registered as a time-o=
f-day clock "
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"(resolution %ldus)\n", res);
> - =A0 =A0 =A0 }
> =A0}
>
> =A0/*
> @@ -109,7 +105,7 @@ clock_register(device_t dev, long res) =A0 =A0 =A0/
> =A0void
> =A0inittodr(time_t base)
> =A0{
> - =A0 =A0 =A0 struct timespec ref, ts;
> + =A0 =A0 =A0 struct timespec ts;
> =A0 =A0 =A0 =A0int error;
>
> =A0 =A0 =A0 =A0if (clock_dev =3D=3D NULL) {
> @@ -136,9 +132,9 @@ inittodr(time_t base)
>
> =A0wrong_time:
> =A0 =A0 =A0 =A0if (base > 0) {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 ref.tv_sec =3D base;
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 ref.tv_nsec =3D 0;
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 tc_setclock(&ref);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 ts.tv_sec =3D base;
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 ts.tv_nsec =3D 0;
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 tc_setclock(&ts);
> =A0 =A0 =A0 =A0}
> =A0}
>
> @@ -157,9 +153,7 @@ resettodr(void)
> =A0 =A0 =A0 =A0getnanotime(&ts);
> =A0 =A0 =A0 =A0ts.tv_sec -=3D utc_offset();
> =A0 =A0 =A0 =A0/* XXX: We should really set all registered RTCs */
> - =A0 =A0 =A0 if ((error =3D CLOCK_SETTIME(clock_dev, &ts)) !=3D 0) {
> + =A0 =A0 =A0 if ((error =3D CLOCK_SETTIME(clock_dev, &ts)) !=3D 0)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0printf("warning: clock_settime failed (%d)=
, time-of-day clock "
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"not adjusted to system time\n", e=
rror);
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return;
> - =A0 =A0 =A0 }
> =A0}
>

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTinPO8eZy8YH8qjwvg9sCMDt10K9v62KzyGjnPug>