d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize the use of sizeof according to style(9).

Browse Source 
Reviewed by:	md5(1)
This commit is contained in:
Dima Dorfman 2001-06-09 03:56:16 +00:00
parent 9b0a8ba37a
commit 31fb466194
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=77928
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sbin/sysctl/sysctl.c
View File

@ -186,7 +186,7 @@ parse(char *string)
case CTLTYPE_INT: case CTLTYPE_INT:
intval = (int) strtol(newval, NULL, 0); intval = (int) strtol(newval, NULL, 0);
newval = &intval; newval = &intval;
newsize = sizeof intval; newsize = sizeof(intval);
break; break;
break; break;
case CTLTYPE_STRING: case CTLTYPE_STRING:
@ -195,7 +195,7 @@ parse(char *string)
break; break;
sscanf(newval, "%qd", &quadval); sscanf(newval, "%qd", &quadval);
newval = &quadval; newval = &quadval;
newsize = sizeof quadval; newsize = sizeof(quadval);
break; break;
default: default:
errx(1, "oid '%s' is type %d," errx(1, "oid '%s' is type %d,"
@ -239,8 +239,8 @@ static int
S_clockinfo(int l2, void *p) S_clockinfo(int l2, void *p)
{ {
struct clockinfo *ci = (struct clockinfo*)p; struct clockinfo *ci = (struct clockinfo*)p;
if (l2 != sizeof *ci) if (l2 != sizeof(*ci))
err(1, "S_clockinfo %d != %d", l2, sizeof *ci); err(1, "S_clockinfo %d != %d", l2, sizeof(*ci));
printf("{ hz = %d, tick = %d, tickadj = %d, profhz = %d, stathz = %d }", printf("{ hz = %d, tick = %d, tickadj = %d, profhz = %d, stathz = %d }",
ci->hz, ci->tick, ci->tickadj, ci->profhz, ci->stathz); ci->hz, ci->tick, ci->tickadj, ci->profhz, ci->stathz);
return (0); return (0);
@ -251,8 +251,8 @@ S_loadavg(int l2, void *p)
{ {
struct loadavg *tv = (struct loadavg*)p; struct loadavg *tv = (struct loadavg*)p;
if (l2 != sizeof *tv) if (l2 != sizeof(*tv))
err(1, "S_loadavg %d != %d", l2, sizeof *tv); err(1, "S_loadavg %d != %d", l2, sizeof(*tv));
printf("{ %.2f %.2f %.2f }", printf("{ %.2f %.2f %.2f }",
(double)tv->ldavg[0]/(double)tv->fscale, (double)tv->ldavg[0]/(double)tv->fscale,
@ -268,8 +268,8 @@ S_timeval(int l2, void *p)
time_t tv_sec; time_t tv_sec;
char *p1, *p2; char *p1, *p2;
if (l2 != sizeof *tv) if (l2 != sizeof(*tv))
err(1, "S_timeval %d != %d", l2, sizeof *tv); err(1, "S_timeval %d != %d", l2, sizeof(*tv));
printf("{ sec = %ld, usec = %ld } ", printf("{ sec = %ld, usec = %ld } ",
tv->tv_sec, tv->tv_usec); tv->tv_sec, tv->tv_usec);
tv_sec = tv->tv_sec; tv_sec = tv->tv_sec;
@ -285,8 +285,8 @@ static int
T_dev_t(int l2, void *p) T_dev_t(int l2, void *p)
{ {
dev_t *d = (dev_t *)p; dev_t *d = (dev_t *)p;
if (l2 != sizeof *d) if (l2 != sizeof(*d))
err(1, "T_dev_T %d != %d", l2, sizeof *d); err(1, "T_dev_T %d != %d", l2, sizeof(*d));
if ((int)(*d) != -1) { if ((int)(*d) != -1) {
if (minor(*d) > 255 || minor(*d) < 0) if (minor(*d) > 255 || minor(*d) < 0)
printf("{ major = %d, minor = 0x%x }", printf("{ major = %d, minor = 0x%x }",
@ -317,11 +317,11 @@ name2oid(char *name, int *oidp)
oid[0] = 0; oid[0] = 0;
oid[1] = 3; oid[1] = 3;
j = CTL_MAXNAME * sizeof (int); j = CTL_MAXNAME * sizeof(int);
i = sysctl(oid, 2, oidp, &j, name, strlen(name)); i = sysctl(oid, 2, oidp, &j, name, strlen(name));
if (i < 0) if (i < 0)
return i; return i;
j /= sizeof (int); j /= sizeof(int);
return (j); return (j);
} }
@ -337,7 +337,7 @@ oidfmt(int *oid, int len, char *fmt, u_int *kind)
qoid[1] = 4; qoid[1] = 4;
memcpy(qoid + 2, oid, len * sizeof(int)); memcpy(qoid + 2, oid, len * sizeof(int));
j = sizeof buf; j = sizeof(buf);
i = sysctl(qoid, len + 2, buf, &j, 0, 0); i = sysctl(qoid, len + 2, buf, &j, 0, 0);
if (i) if (i)
err(1, "sysctl fmt %d %d %d", i, j, errno); err(1, "sysctl fmt %d %d %d", i, j, errno);
@ -373,7 +373,7 @@ show_var(int *oid, int nlen)
memcpy(qoid + 2, oid, nlen * sizeof(int)); memcpy(qoid + 2, oid, nlen * sizeof(int));
qoid[1] = 1; qoid[1] = 1;
j = sizeof name; j = sizeof(name);
i = sysctl(qoid, nlen + 2, name, &j, 0, 0); i = sysctl(qoid, nlen + 2, name, &j, 0, 0);
if (i || !j) if (i || !j)
err(1, "sysctl name %d %d %d", i, j, errno); err(1, "sysctl name %d %d %d", i, j, errno);
@ -400,7 +400,7 @@ show_var(int *oid, int nlen)
} }
qoid[1] = 4; qoid[1] = 4;
j = sizeof buf; j = sizeof(buf);
i = sysctl(qoid, nlen + 2, buf, &j, 0, 0); i = sysctl(qoid, nlen + 2, buf, &j, 0, 0);
if (i || !j) if (i || !j)
err(1, "sysctl fmt %d %d %d", i, j, errno); err(1, "sysctl fmt %d %d %d", i, j, errno);
@ -500,14 +500,14 @@ sysctl_all (int *oid, int len)
name1[1] = 2; name1[1] = 2;
l1 = 2; l1 = 2;
if (len) { if (len) {
memcpy(name1+2, oid, len*sizeof (int)); memcpy(name1+2, oid, len * sizeof(int));
l1 += len; l1 += len;
} else { } else {
name1[2] = 1; name1[2] = 1;
l1++; l1++;
} }
for (;;) { for (;;) {
l2 = sizeof name2; l2 = sizeof(name2);
j = sysctl(name1, l1, name2, &l2, 0, 0); j = sysctl(name1, l1, name2, &l2, 0, 0);
if (j < 0) { if (j < 0) {
if (errno == ENOENT) if (errno == ENOENT)
@ -516,7 +516,7 @@ sysctl_all (int *oid, int len)
err(1, "sysctl(getnext) %d %d", j, l2); err(1, "sysctl(getnext) %d %d", j, l2);
} }
l2 /= sizeof (int); l2 /= sizeof(int);
if (l2 < len) if (l2 < len)
return 0; return 0;
@ -529,7 +529,7 @@ sysctl_all (int *oid, int len)
if (!i && !bflag) if (!i && !bflag)
putchar('\n'); putchar('\n');
memcpy(name1+2, name2, l2*sizeof (int)); memcpy(name1+2, name2, l2 * sizeof(int));
l1 = 2 + l2; l1 = 2 + l2;
} }
} }