diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/drive.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/entry.c | 19 | ||||
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/events.c | 8 | ||||
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/inuse_mnt.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libdiskmgt/common/media.c | 2 |
5 files changed, 15 insertions, 20 deletions
diff --git a/usr/src/lib/libdiskmgt/common/drive.c b/usr/src/lib/libdiskmgt/common/drive.c index eb6e1e114d..9d68f2b34a 100644 --- a/usr/src/lib/libdiskmgt/common/drive.c +++ b/usr/src/lib/libdiskmgt/common/drive.c @@ -973,7 +973,7 @@ get_disk_kstats(kstat_ctl_t *kc, char *diskname, char *classname, while (*ename && *ename != ',') { *dname++ = *ename++; } - *dname = NULL; + *dname = '\0'; if (libdiskmgt_str_eq(diskname, kstat_name)) { (void) kstat_read(kc, ksp, NULL); diff --git a/usr/src/lib/libdiskmgt/common/entry.c b/usr/src/lib/libdiskmgt/common/entry.c index e64e61ef65..425255ae45 100644 --- a/usr/src/lib/libdiskmgt/common/entry.c +++ b/usr/src/lib/libdiskmgt/common/entry.c @@ -69,7 +69,7 @@ dm_free_descriptor(dm_descriptor_t desc) { descriptor_t *dp; - if (desc == NULL) { + if (desc == 0) { return; } dp = (descriptor_t *)(uintptr_t)desc; @@ -253,7 +253,7 @@ dm_get_attributes(dm_descriptor_t desc, int *errp) dm_descriptor_t dm_get_descriptor_by_name(dm_desc_type_t desc_type, char *name, int *errp) { - dm_descriptor_t desc = NULL; + dm_descriptor_t desc = 0; cache_wlock(); @@ -516,7 +516,7 @@ dm_get_slices(char *drive, dm_descriptor_t **slices, int *errp) * values will be NULL if an error occured in these calls. */ - if (alias != NULL) { + if (alias != 0) { disk = dm_get_associated_descriptors(alias, DM_DRIVE, errp); dm_free_descriptor(alias); if (disk != NULL) { @@ -551,9 +551,8 @@ dm_get_slice_stats(char *slice, nvlist_t **dev_stats, int *errp) * values will be NULL if an error occured in these calls. */ devp = dm_get_descriptor_by_name(DM_SLICE, slice, errp); - if (devp != NULL) { - *dev_stats = dm_get_stats(devp, DM_SLICE_STAT_USE, - errp); + if (devp != 0) { + *dev_stats = dm_get_stats(devp, DM_SLICE_STAT_USE, errp); dm_free_descriptor(devp); } } @@ -566,7 +565,7 @@ dm_get_slice_stats(char *slice, nvlist_t **dev_stats, int *errp) int dm_isoverlapping(char *slicename, char **overlaps_with, int *errp) { - dm_descriptor_t slice = NULL; + dm_descriptor_t slice = 0; dm_descriptor_t *media = NULL; dm_descriptor_t *slices = NULL; int i = 0; @@ -580,7 +579,7 @@ dm_isoverlapping(char *slicename, char **overlaps_with, int *errp) int ret = 0; slice = dm_get_descriptor_by_name(DM_SLICE, slicename, errp); - if (slice == NULL) + if (slice == 0) goto out; /* @@ -588,11 +587,11 @@ dm_isoverlapping(char *slicename, char **overlaps_with, int *errp) * associated slices. */ media = dm_get_associated_descriptors(slice, DM_MEDIA, errp); - if (media == NULL || *media == NULL || *errp != 0) + if (media == NULL || *media == 0 || *errp != 0) goto out; slices = dm_get_associated_descriptors(*media, DM_SLICE, errp); - if (slices == NULL || *slices == NULL || *errp != 0) + if (slices == NULL || *slices == 0 || *errp != 0) goto out; media_attrs = dm_get_attributes(*media, errp); diff --git a/usr/src/lib/libdiskmgt/common/events.c b/usr/src/lib/libdiskmgt/common/events.c index e6dc869d2a..134abe1846 100644 --- a/usr/src/lib/libdiskmgt/common/events.c +++ b/usr/src/lib/libdiskmgt/common/events.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <stropts.h> @@ -151,7 +149,7 @@ dm_init_event_queue(void (*cb)(nvlist_t *, int), int *errp) /* installing a cb; we didn't have one before */ thread_t watch_thread; - *errp = thr_create(NULL, NULL, + *errp = thr_create(NULL, 0, (void *(*)(void *))cb_watch_events, NULL, THR_DAEMON, &watch_thread); } @@ -171,7 +169,7 @@ dm_init_event_queue(void (*cb)(nvlist_t *, int), int *errp) callback = cb; - *errp = thr_create(NULL, NULL, + *errp = thr_create(NULL, 0, (void *(*)(void *))cb_watch_events, NULL, THR_DAEMON, &watch_thread); } @@ -445,7 +443,7 @@ walk_devtree() switch (walker_state) { case WALK_NONE: - if (thr_create(NULL, NULL, (void *(*)(void *))walker, NULL, + if (thr_create(NULL, 0, (void *(*)(void *))walker, NULL, THR_DAEMON, &walk_thread) == 0) { walker_state = WALK_WAITING; } diff --git a/usr/src/lib/libdiskmgt/common/inuse_mnt.c b/usr/src/lib/libdiskmgt/common/inuse_mnt.c index 7923dcfa99..a0c921c9a7 100644 --- a/usr/src/lib/libdiskmgt/common/inuse_mnt.c +++ b/usr/src/lib/libdiskmgt/common/inuse_mnt.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Creates and maintains a cache of mount points. */ @@ -91,7 +89,7 @@ inuse_mnt(char *slice, nvlist_t *attrs, int *errp) if (*errp == 0) { /* start a thread to monitor the mnttab */ - *errp = thr_create(NULL, NULL, (void *(*)(void *))watch_mnttab, + *errp = thr_create(NULL, 0, (void *(*)(void *))watch_mnttab, NULL, THR_NEW_LWP | THR_DAEMON, &mnttab_thread); } diff --git a/usr/src/lib/libdiskmgt/common/media.c b/usr/src/lib/libdiskmgt/common/media.c index 853ac8c69a..7487e931e8 100644 --- a/usr/src/lib/libdiskmgt/common/media.c +++ b/usr/src/lib/libdiskmgt/common/media.c @@ -549,7 +549,7 @@ get_rmm_name(disk_t *dp, char *mname, int size) struct extvtoc vtoc; if (read_extvtoc(fd, &vtoc) >= 0) { - if (vtoc.v_volume[0] != NULL) { + if (vtoc.v_volume[0] != '\0') { if (LEN_DKL_VVOL < size) { (void) strlcpy(mname, vtoc.v_volume, |