splint fiddles.

CVS patchset: 7241
CVS date: 2004/04/19 12:06:30

diff --git a/lib/query.c b/lib/query.c
index d1a3770..33569d5 100644 (file)
--- a/lib/query.c
+++ b/lib/query.c
@@ -708,7 +708,7 @@ restart:
        } else if (*arg != '/') {
            const char *curDir = currentDirectory();
            fn = rpmGetPath(curDir, "/", arg, NULL);
-           _free(curDir);
+           curDir = _free(curDir);
        } else
            fn = xstrdup(arg);
        (void) rpmCleanPath(fn);

diff --git a/lib/transaction.c b/lib/transaction.c
index 240c0c1..4cb2ac8 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1384,6 +1384,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
     /* If we are in test mode, there is no need to rollback on
      * failure, nor acquire the transaction lock.
      */
+/*@-branchstate@*/
     if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) {
        rollbackOnFailure = 0;
     } else {
@@ -1391,6 +1392,7 @@ int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet)
        if (lock == NULL)
            return -1;  /* XXX W2DO? */
     }
+/*@=branchstate@*/
 
     if (rpmtsFlags(ts) & RPMTRANS_FLAG_NOSCRIPTS)
        (void) rpmtsSetFlags(ts, (rpmtsFlags(ts) | _noTransScripts | _noTransTriggers));