diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-08-11 22:04:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-08-11 22:04:25 +0200 |
| commit | e364ad0628b5930a671ae5be863b960f4bd748a8 (patch) | |
| tree | 1427ac128d3530f696e49b6f5e482488399c9b6e /src/manager.c | |
| parent | 10f8e83cbb10c73b980c9b3b895ac044e600ba0c (diff) | |
clang: fix numerous little issues found with clang-analyzer
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/manager.c b/src/manager.c index 18b014004f..9684efac8b 100644 --- a/src/manager.c +++ b/src/manager.c @@ -791,7 +791,8 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) { d = j; else d = k; - } + } else + d = j; } else if (!j->matters_to_anchor) d = j; @@ -824,7 +825,7 @@ static int transaction_merge_jobs(Manager *m, DBusError *e) { t = j->type; LIST_FOREACH(transaction, k, j->transaction_next) { - if ((r = job_type_merge(&t, k->type)) >= 0) + if (job_type_merge(&t, k->type) >= 0) continue; /* OK, we could not merge all jobs for this @@ -1293,7 +1294,6 @@ rollback: static Job* transaction_add_one_job(Manager *m, JobType type, Unit *unit, bool override, bool *is_new) { Job *j, *f; - int r; assert(m); assert(unit); @@ -1326,7 +1326,7 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Unit *unit, bool o LIST_PREPEND(Job, transaction, f, j); - if ((r = hashmap_replace(m->transaction_jobs, unit, f)) < 0) { + if (hashmap_replace(m->transaction_jobs, unit, f) < 0) { job_free(j); return NULL; } |