diff options
| author | eschrock <none@none> | 2005-11-18 22:47:38 -0800 |
|---|---|---|
| committer | eschrock <none@none> | 2005-11-18 22:47:38 -0800 |
| commit | 088e9d477eee66081e407fbc5a33c4da25f66f6a (patch) | |
| tree | 423960171a4e0c675a396bff1dd67d8f3f66c107 /usr/src/cmd/availdevs | |
| parent | 9ac8606f19e304e832a685ae7060cc3c284b9779 (diff) | |
| download | illumos-joyent-088e9d477eee66081e407fbc5a33c4da25f66f6a.tar.gz | |
6344502 placeholder bug for the remaining Makefile cleanup work for ZFS
6343938 ::spa -v tried to read NULL vdev
6345206 zpool iostat doesn't always line up
Diffstat (limited to 'usr/src/cmd/availdevs')
| -rw-r--r-- | usr/src/cmd/availdevs/Makefile | 28 | ||||
| -rw-r--r-- | usr/src/cmd/availdevs/availdevs.c | 8 |
2 files changed, 14 insertions, 22 deletions
diff --git a/usr/src/cmd/availdevs/Makefile b/usr/src/cmd/availdevs/Makefile index 99015803ba..d962ff85e7 100644 --- a/usr/src/cmd/availdevs/Makefile +++ b/usr/src/cmd/availdevs/Makefile @@ -27,39 +27,31 @@ # PROG= availdevs -OBJS_COMMON= availdevs.o -OBJS= $(OBJS_COMMON) -SRCS= $(OBJS_COMMON:%.o=%.c) include ../Makefile.cmd ROOTCMDDIR= $(ROOTLIB)/zfs -INCS += -I../../lib/libzfs_jni/common \ - -I/usr/include/libxml2 +INCS += -I/usr/include/libxml2 + +# +# There is no lint library for libxml2, so we need to avoid linking against +# it during lint, as well as turning off the warnings lint would generate. +# +LDLIBS += -lzfs_jni +all install := LDLIBS += -lxml2 +LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2 -LDLIBS += -lzfs_jni -lxml2 CPPFLAGS += $(INCS) -D_LARGEFILE64_SOURCE=1 -D_REENTRANT .KEEP_STATE: -.PARALLEL: - all: $(PROG) -$(PROG): $(OBJS) - $(LINK.c) -o $@ $(OBJS) $(LDLIBS) - $(POST_PROCESS) - -%.o: %.c - $(COMPILE.c) -o $@ $< - $(POST_PROCESS_O) - install: all $(ROOTCMD) clean: - $(RM) $(OBJS) -FRC: +lint: lint_PROG include ../Makefile.targ diff --git a/usr/src/cmd/availdevs/availdevs.c b/usr/src/cmd/availdevs/availdevs.c index e11f449b2e..f17e475b2d 100644 --- a/usr/src/cmd/availdevs/availdevs.c +++ b/usr/src/cmd/availdevs/availdevs.c @@ -63,7 +63,7 @@ add_disk_to_xml(dmgt_disk_t *dp, void *data) available, NULL, (xmlChar *)ELEMENT_DISK, NULL); xmlSetProp(disk, (xmlChar *)ATTR_DISK_NAME, (xmlChar *)dp->name); - snprintf(tmp, sizeof (tmp), "%llu", dp->size); + (void) snprintf(tmp, sizeof (tmp), "%llu", dp->size); xmlSetProp(disk, (xmlChar *)ATTR_DISK_SIZE, (xmlChar *)tmp); if (dp->aliases != NULL) { @@ -84,11 +84,11 @@ add_disk_to_xml(dmgt_disk_t *dp, void *data) xmlSetProp(slice, (xmlChar *)ATTR_SLICE_NAME, (xmlChar *)sp->name); - snprintf(tmp, sizeof (tmp), "%llu", sp->size); + (void) snprintf(tmp, sizeof (tmp), "%llu", sp->size); xmlSetProp(slice, (xmlChar *)ATTR_SLICE_SIZE, (xmlChar *)tmp); - snprintf(tmp, sizeof (tmp), "%llu", sp->start); + (void) snprintf(tmp, sizeof (tmp), "%llu", sp->start); xmlSetProp(slice, (xmlChar *)ATTR_SLICE_START, (xmlChar *)tmp); @@ -127,7 +127,7 @@ add_pool_to_xml(char *name, uint64_t guid, xmlSetProp(pool, (xmlChar *)ATTR_POOL_STATE, (xmlChar *)state); xmlSetProp(pool, (xmlChar *)ATTR_POOL_HEALTH, (xmlChar *)health); - snprintf(tmp, sizeof (tmp), "%llu", guid); + (void) snprintf(tmp, sizeof (tmp), "%llu", guid); xmlSetProp(pool, (xmlChar *)ATTR_POOL_ID, (xmlChar *)tmp); return (0); |