summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2004-04-19 12:06:30 +0000
committerjbj <devnull@localhost>2004-04-19 12:06:30 +0000
commitb687c65d77a2efa630a46206682c7d5495549de3 (patch)
treef95b97aabfc1bd1907e8509cbbde1aed9fe33164 /lib
parent2296caaece3b4b5f17f483c80655d354a5bdb1d2 (diff)
downloadlibrpm-tizen-b687c65d77a2efa630a46206682c7d5495549de3.tar.gz
librpm-tizen-b687c65d77a2efa630a46206682c7d5495549de3.tar.bz2
librpm-tizen-b687c65d77a2efa630a46206682c7d5495549de3.zip
splint fiddles.
CVS patchset: 7241 CVS date: 2004/04/19 12:06:30
Diffstat (limited to 'lib')
-rw-r--r--lib/query.c2
-rw-r--r--lib/transaction.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/query.c b/lib/query.c
index d1a37708e..33569d5e0 100644
--- 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 240c0c1b4..4cb2ac8f5 100644
--- 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));