From 139f16505d9810879cbf63e5ea12a392d81eb3af Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Thu, 9 Jun 2005 05:50:01 +0000 Subject: Simplify the code a bit after the bzero(). --- sys/kern/subr_bus.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 1d7f3ebc73ea..265204c81168 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3957,22 +3957,13 @@ sysctl_devices(SYSCTL_HANDLER_ARGS) bzero(&udev, sizeof(udev)); udev.dv_handle = (uintptr_t)dev; udev.dv_parent = (uintptr_t)dev->parent; - if (dev->nameunit == NULL) - udev.dv_name[0] = '\0'; - else + if (dev->nameunit != NULL) strlcpy(udev.dv_name, dev->nameunit, sizeof(udev.dv_name)); - - if (dev->desc == NULL) - udev.dv_desc[0] = '\0'; - else + if (dev->desc != NULL) strlcpy(udev.dv_desc, dev->desc, sizeof(udev.dv_desc)); - if (dev->driver == NULL || dev->driver->name == NULL) - udev.dv_drivername[0] = '\0'; - else + if (dev->driver != NULL && dev->driver->name != NULL) strlcpy(udev.dv_drivername, dev->driver->name, sizeof(udev.dv_drivername)); - udev.dv_pnpinfo[0] = '\0'; - udev.dv_location[0] = '\0'; bus_child_pnpinfo_str(dev, udev.dv_pnpinfo, sizeof(udev.dv_pnpinfo)); bus_child_location_str(dev, udev.dv_location, sizeof(udev.dv_location)); udev.dv_devflags = dev->devflags; -- cgit v1.2.3