diff options
| author | timh <none@none> | 2005-08-16 11:27:01 -0700 |
|---|---|---|
| committer | timh <none@none> | 2005-08-16 11:27:01 -0700 |
| commit | 18fdaaef96cf74126ff84be8aa0b50a701a3f374 (patch) | |
| tree | d8cb3a05e4ff9226045204dba0629d8f6cb5c523 /usr/src | |
| parent | 8309866b5518fa787f5fd02152b9d81a5beea637 (diff) | |
| download | illumos-gate-18fdaaef96cf74126ff84be8aa0b50a701a3f374.tar.gz | |
6311141 Small leak in libtopo after putback of 6240456
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/fm/topo/prtopo/Makefile.com | 9 | ||||
| -rw-r--r-- | usr/src/lib/fm/libtopo/common/topo_parse.c | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/cmd/fm/topo/prtopo/Makefile.com b/usr/src/cmd/fm/topo/prtopo/Makefile.com index 7c1c308d04..d27c601172 100644 --- a/usr/src/cmd/fm/topo/prtopo/Makefile.com +++ b/usr/src/cmd/fm/topo/prtopo/Makefile.com @@ -19,8 +19,7 @@ # # CDDL HEADER END # -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -44,7 +43,7 @@ CPPFLAGS += -I../common CFLAGS += $(CTF_FLAGS) LDFLAGS += -R/usr/lib/fm -LDLIBS += -lnvpair -L$(ROOTLIB)/fm -ltopo +LDLIBS += -lnvpair -lumem -L$(ROOTLIB)/fm -ltopo ROOTPDIR = $(ROOT)/usr/lib/fm ROOTPROG = $(ROOTPDIR)/$(PROG) @@ -60,7 +59,7 @@ lint: $(LINTSRCS) $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) - $(CTFMRG) + $(CTFMERGE) -L VERSION -o $@ $(OBJS) $(POST_PROCESS) clean: @@ -80,4 +79,4 @@ $(ROOTPDIR)/%: % %.o: ../common/%.c $(COMPILE.c) $< - $(CTFCONVO) + $(CTFCONVERT_O) diff --git a/usr/src/lib/fm/libtopo/common/topo_parse.c b/usr/src/lib/fm/libtopo/common/topo_parse.c index 0c67a60fc3..ccec7bb60e 100644 --- a/usr/src/lib/fm/libtopo/common/topo_parse.c +++ b/usr/src/lib/fm/libtopo/common/topo_parse.c @@ -84,6 +84,7 @@ topo_tree_release(tnode_t *node) topo_free(cur); cur = nxt; } + topo_free(re); } tnode_destroy(ar); } |