Return explicit NULL from various fooFree() functions everywhere

3 files changed, 12 insertions, 6 deletions

diff --git a/build/spec.c b/build/spec.c
index a0749bfd0..0159c2077 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -167,7 +167,8 @@ static inline speclines freeSl(speclines sl)
     for (i = 0; i < sl->sl_nlines; i++)
 	sl->sl_lines[i] = _free(sl->sl_lines[i]);
     sl->sl_lines = _free(sl->sl_lines);
-    return _free(sl);
+    _free(sl);
+    return NULL;
 }
 
 /**
@@ -182,7 +183,8 @@ static inline spectags freeSt(spectags st)
 	t->t_msgid = _free(t->t_msgid);
     }
     st->st_t = _free(st->st_t);
-    return _free(st);
+    _free(st);
+    return NULL;
 }
 
 rpmSpec newSpec(void)
diff --git a/lib/fsm.c b/lib/fsm.c
index 2040d7691..59ff7d087 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -544,8 +544,9 @@ static hardLink_t freeHardLink(hardLink_t li)
     if (li) {
 	li->nsuffix = _free(li->nsuffix);	/* XXX elements are shared */
 	li->filex = _free(li->filex);
+	_free(li);
     }
-    return _free(li);
+    return NULL;
 }
 
 FSM_t newFSM(cpioMapFlags mapflags)
@@ -567,8 +568,9 @@ FSM_t freeFSM(FSM_t fsm)
 	fsm->dnlx = _free(fsm->dnlx);
 	fsm->ldn = _free(fsm->ldn);
 	fsm->iter = mapFreeIterator(fsm->iter);
+	_free(fsm);
     }
-    return _free(fsm);
+    return NULL;
 }
 
 /* forward declaration*/
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 380ff00c3..c6c846f0f 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -955,9 +955,11 @@ rpmts rpmtsCreate(void)
 rpmtsi rpmtsiFree(rpmtsi tsi)
 {
     /* XXX watchout: a funky recursion segfaults here iff nrefs is wrong. */
-    if (tsi)
+    if (tsi) {
 	tsi->ts = rpmtsFree(tsi->ts);
-    return _free(tsi);
+	_free(tsi);
+    }
+    return NULL;
 }
 
 rpmtsi rpmtsiInit(rpmts ts)