Eliminate a few more dead rpmdsFree() NULL assignments
authorPanu Matilainen <pmatilai@redhat.com>
Fri, 27 May 2011 09:36:47 +0000 (12:36 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Fri, 27 May 2011 12:10:30 +0000 (15:10 +0300)
- No real chance of accidental misuse of freed data here...

build/rpmfc.c

index 8b2434b..1daab18 100644 (file)
@@ -882,15 +882,15 @@ rpmRC rpmfcApply(rpmfc fc)
        switch (deptype) {
        default:
            break;
-       case 'P':       
+       case 'P':
            ds = rpmdsSingle(RPMTAG_PROVIDENAME, N, EVR, Flags);
            dix = rpmdsFind(fc->provides, ds);
-           ds = rpmdsFree(ds);
+           rpmdsFree(ds);
            break;
        case 'R':
            ds = rpmdsSingle(RPMTAG_REQUIRENAME, N, EVR, Flags);
            dix = rpmdsFind(fc->requires, ds);
-           ds = rpmdsFree(ds);
+           rpmdsFree(ds);
            break;
        }
 
@@ -1137,7 +1137,7 @@ static void printDeps(Header h)
 
     for (dm = DepMsgs; dm->msg != NULL; dm++) {
        if (dm->ntag != -1) {
-           ds = rpmdsFree(ds);
+           rpmdsFree(ds);
            ds = rpmdsNew(h, dm->ntag, 0);
        }
        if (dm->ftag == 0)
@@ -1165,7 +1165,7 @@ static void printDeps(Header h)
        if (bingo)
            rpmlog(RPMLOG_NOTICE, "\n");
     }
-    ds = rpmdsFree(ds);
+    rpmdsFree(ds);
 }
 
 /**