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

Perform random drive-by style cleanups, and rewrite a while loop that

Browse Source 
offended my artistic sensibilities.
This commit is contained in:
Dag-Erling Smørgrav 2001-05-28 12:35:40 +00:00
parent 14bdfcd285
commit a89ab9bbe4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=77332
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sbin/sysctl/sysctl.c
View File

@ -367,7 +367,7 @@ show_var(int *oid, int nlen)
int i;
size_t j, len;
u_int kind;
int (*func)(int, void *) = 0;
int (*func)(int, void *);
qoid[0] = 0;
memcpy(qoid + 2, oid, nlen * sizeof(int));
@ -428,8 +428,8 @@ show_var(int *oid, int nlen)
else
printf("%s%d", val, *(int *)p);
val = " ";
len -= sizeof (int);
p += sizeof (int);
len -= sizeof(int);
p += sizeof(int);
}
return (0);
@ -444,8 +444,8 @@ show_var(int *oid, int nlen)
else
printf("%s%ld", val, *(long *)p);
val = " ";
len -= sizeof (long);
p += sizeof (long);
len -= sizeof(long);
p += sizeof(long);
}
return (0);
@ -458,10 +458,16 @@ show_var(int *oid, int nlen)
case 'T':
case 'S':
i = 0;
if (!strcmp(fmt, "S,clockinfo")) func = S_clockinfo;
else if (!strcmp(fmt, "S,timeval")) func = S_timeval;
else if (!strcmp(fmt, "S,loadavg")) func = S_loadavg;
else if (!strcmp(fmt, "T,dev_t")) func = T_dev_t;
if (strcmp(fmt, "S,clockinfo") == 0)
func = S_clockinfo;
else if (strcmp(fmt, "S,timeval") == 0)
func = S_timeval;
else if (strcmp(fmt, "S,loadavg") == 0)
func = S_loadavg;
else if (strcmp(fmt, "T,dev_t") == 0)
func = T_dev_t;
else
func = NULL;
if (func) {
if (!nflag)
printf("%s: ", name);
@ -474,15 +480,10 @@ show_var(int *oid, int nlen)
if (!nflag)
printf("%s: ", name);
printf("Format:%s Length:%d Dump:0x", fmt, len);
while (len--) {
while (len-- && (xflag || p < val + 16))
printf("%02x", *p++);
if (xflag || p < val+16)
continue;
if (len == 16)
break;
if (!xflag && len > 16)
printf("...");
break;
}
return (0);
}
return (1);
@ -505,7 +506,7 @@ sysctl_all (int *oid, int len)
name1[2] = 1;
l1++;
}
while (1) {
for (;;) {
l2 = sizeof name2;
j = sysctl(name1, l1, name2, &l2, 0, 0);
if (j < 0) {