Perform random drive-by style cleanups, and rewrite a while loop that
offended my artistic sensibilities.
This commit is contained in:
parent
14bdfcd285
commit
a89ab9bbe4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=77332
@ -367,7 +367,7 @@ show_var(int *oid, int nlen)
|
|||||||
int i;
|
int i;
|
||||||
size_t j, len;
|
size_t j, len;
|
||||||
u_int kind;
|
u_int kind;
|
||||||
int (*func)(int, void *) = 0;
|
int (*func)(int, void *);
|
||||||
|
|
||||||
qoid[0] = 0;
|
qoid[0] = 0;
|
||||||
memcpy(qoid + 2, oid, nlen * sizeof(int));
|
memcpy(qoid + 2, oid, nlen * sizeof(int));
|
||||||
@ -428,8 +428,8 @@ show_var(int *oid, int nlen)
|
|||||||
else
|
else
|
||||||
printf("%s%d", val, *(int *)p);
|
printf("%s%d", val, *(int *)p);
|
||||||
val = " ";
|
val = " ";
|
||||||
len -= sizeof (int);
|
len -= sizeof(int);
|
||||||
p += sizeof (int);
|
p += sizeof(int);
|
||||||
}
|
}
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
@ -444,8 +444,8 @@ show_var(int *oid, int nlen)
|
|||||||
else
|
else
|
||||||
printf("%s%ld", val, *(long *)p);
|
printf("%s%ld", val, *(long *)p);
|
||||||
val = " ";
|
val = " ";
|
||||||
len -= sizeof (long);
|
len -= sizeof(long);
|
||||||
p += sizeof (long);
|
p += sizeof(long);
|
||||||
}
|
}
|
||||||
return (0);
|
return (0);
|
||||||
|
|
||||||
@ -458,10 +458,16 @@ show_var(int *oid, int nlen)
|
|||||||
case 'T':
|
case 'T':
|
||||||
case 'S':
|
case 'S':
|
||||||
i = 0;
|
i = 0;
|
||||||
if (!strcmp(fmt, "S,clockinfo")) func = S_clockinfo;
|
if (strcmp(fmt, "S,clockinfo") == 0)
|
||||||
else if (!strcmp(fmt, "S,timeval")) func = S_timeval;
|
func = S_clockinfo;
|
||||||
else if (!strcmp(fmt, "S,loadavg")) func = S_loadavg;
|
else if (strcmp(fmt, "S,timeval") == 0)
|
||||||
else if (!strcmp(fmt, "T,dev_t")) func = T_dev_t;
|
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 (func) {
|
||||||
if (!nflag)
|
if (!nflag)
|
||||||
printf("%s: ", name);
|
printf("%s: ", name);
|
||||||
@ -474,15 +480,10 @@ show_var(int *oid, int nlen)
|
|||||||
if (!nflag)
|
if (!nflag)
|
||||||
printf("%s: ", name);
|
printf("%s: ", name);
|
||||||
printf("Format:%s Length:%d Dump:0x", fmt, len);
|
printf("Format:%s Length:%d Dump:0x", fmt, len);
|
||||||
while (len--) {
|
while (len-- && (xflag || p < val + 16))
|
||||||
printf("%02x", *p++);
|
printf("%02x", *p++);
|
||||||
if (xflag || p < val+16)
|
if (!xflag && len > 16)
|
||||||
continue;
|
|
||||||
if (len == 16)
|
|
||||||
break;
|
|
||||||
printf("...");
|
printf("...");
|
||||||
break;
|
|
||||||
}
|
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
return (1);
|
return (1);
|
||||||
@ -505,7 +506,7 @@ sysctl_all (int *oid, int len)
|
|||||||
name1[2] = 1;
|
name1[2] = 1;
|
||||||
l1++;
|
l1++;
|
||||||
}
|
}
|
||||||
while (1) {
|
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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user