mirror of
https://github.com/systemd/systemd.git
synced 2024-12-25 01:34:28 +03:00
core: replace hashmap_get() with hashmap_contains() where appropriate
This commit is contained in:
parent
735f0645db
commit
6112c86139
@ -380,7 +380,7 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
|
|||||||
if (strv_push_pair(&array, k->unit->id, (char*) job_type_to_string(k->type)) < 0)
|
if (strv_push_pair(&array, k->unit->id, (char*) job_type_to_string(k->type)) < 0)
|
||||||
log_oom();
|
log_oom();
|
||||||
|
|
||||||
if (!delete && hashmap_get(tr->jobs, k->unit) && !job_matters_to_anchor(k))
|
if (!delete && hashmap_contains(tr->jobs, k->unit) && !job_matters_to_anchor(k))
|
||||||
/* Ok, we can drop this one, so let's do so. */
|
/* Ok, we can drop this one, so let's do so. */
|
||||||
delete = k;
|
delete = k;
|
||||||
|
|
||||||
@ -629,7 +629,7 @@ static int transaction_apply(
|
|||||||
if (j->unit->ignore_on_isolate)
|
if (j->unit->ignore_on_isolate)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (hashmap_get(tr->jobs, j->unit))
|
if (hashmap_contains(tr->jobs, j->unit))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* Not invalidating recursively. Avoids triggering
|
/* Not invalidating recursively. Avoids triggering
|
||||||
@ -1110,7 +1110,7 @@ static bool shall_stop_on_isolate(Transaction *tr, Unit *u) {
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
/* Is there already something listed for this? */
|
/* Is there already something listed for this? */
|
||||||
if (hashmap_get(tr->jobs, u))
|
if (hashmap_contains(tr->jobs, u))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@ -1170,7 +1170,7 @@ int transaction_add_triggering_jobs(Transaction *tr, Unit *u) {
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* Is there already something listed for this? */
|
/* Is there already something listed for this? */
|
||||||
if (hashmap_get(tr->jobs, trigger))
|
if (hashmap_contains(tr->jobs, trigger))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
r = transaction_add_job_and_dependencies(tr, JOB_STOP, trigger, tr->anchor_job, true, false, false, false, NULL);
|
r = transaction_add_job_and_dependencies(tr, JOB_STOP, trigger, tr->anchor_job, true, false, false, false, NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user