Index: subr_bus.c =================================================================== RCS file: /space2/ncvs/src/sys/kern/subr_bus.c,v retrieving revision 1.148 diff -u -p -r1.148 subr_bus.c --- subr_bus.c 4 Jun 2004 10:23:00 -0000 1.148 +++ subr_bus.c 4 Jun 2004 23:26:21 -0000 @@ -210,13 +210,11 @@ devclass_sysctl_handler(SYSCTL_HANDLER_A 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_ARG 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_ARG 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);