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

When we don't have any meaningful value to print for the device sysctl

Browse Source 
tree, output an empty string instead of "?".  This is already what
happened with DEVICE_SYSCTL_LOCATION and DEVICE_SYSCTL_PNPINFO.  This
makes the output of "sysctl dev" much nicer (it won't display those
empty sysctls).

Reviewed by:	des
This commit is contained in:
mux 2004-06-05 11:39:05 +00:00
parent 3f808f2fdd
commit b7f9b2983e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/subr_bus.c
View File

@ -210,13 +210,11 @@ devclass_sysctl_handler(SYSCTL_HANDLER_ARGS)
buf = NULL;
switch (arg2) {
case DEVCLASS_SYSCTL_PARENT:
value = dc->parent ? dc->parent->name : NULL;
value = dc->parent ? dc->parent->name : "";
break;
default:
return (EINVAL);
}
if (value == NULL)
value = "?";
error = SYSCTL_OUT(req, value, strlen(value));
if (buf != NULL)
free(buf, M_BUS);
@ -258,10 +256,10 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS)
buf = NULL;
switch (arg2) {
case DEVICE_SYSCTL_DESC:
value = dev->desc;
value = dev->desc ? dev->desc : "";
break;
case DEVICE_SYSCTL_DRIVER:
value = dev->driver ? dev->driver->name : NULL;
value = dev->driver ? dev->driver->name : "";
break;
case DEVICE_SYSCTL_LOCATION:
value = buf = malloc(1024, M_BUS, M_WAITOK | M_ZERO);
@ -272,13 +270,11 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS)
bus_child_pnpinfo_str(dev, buf, 1024);
break;
case DEVICE_SYSCTL_PARENT:
value = dev->parent ? dev->parent->nameunit : NULL;
value = dev->parent ? dev->parent->nameunit : "";
break;
default:
return (EINVAL);
}
if (value == NULL)
value = "?";
error = SYSCTL_OUT(req, value, strlen(value));
if (buf != NULL)
free(buf, M_BUS);