diff options
| author | imp <imp@FreeBSD.org> | 2005-06-09 05:50:01 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-06-09 05:50:01 +0000 |
| commit | 6bc1b07ae1951eb76e704851dbff3e9811eca1ae (patch) | |
| tree | 180b55ae0f46b6f16620cf2aab2c1b82ca722802 | |
| parent | 6d5213bf8c97f943893d4b431c3fc4f81a5bb32b (diff) | |
| download | FreeBSD-src-6bc1b07ae1951eb76e704851dbff3e9811eca1ae.zip FreeBSD-src-6bc1b07ae1951eb76e704851dbff3e9811eca1ae.tar.gz | |
Simplify the code a bit after the bzero().
| -rw-r--r-- | sys/kern/subr_bus.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 1d7f3eb..265204c 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; |
