Skip to content

Commit 35d8c19

Browse files
keszybzkeszybz
committed
pid1: drop now-unused path parameter to add_dependency_by_name()
1 parent 0c062fd commit 35d8c19

File tree

12 files changed

+28
-28
lines changed

12 files changed

+28
-28
lines changed

‎src/core/dbus-unit.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,7 +1572,7 @@ static int bus_unit_set_transient_property(
15721572
if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
15731573
_cleanup_free_ char *label = NULL;
15741574

1575-
r = unit_add_dependency_by_name(u, d, other, NULL, true, UNIT_DEPENDENCY_FILE);
1575+
r = unit_add_dependency_by_name(u, d, other, true, UNIT_DEPENDENCY_FILE);
15761576
if (r < 0)
15771577
return r;
15781578

‎src/core/device.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static int device_add_udev_wants(Unit *u, sd_device *dev) {
380380
return log_unit_error_errno(u, r, "Failed to mangle unit name \"%s\": %m", word);
381381
}
382382

383-
r = unit_add_dependency_by_name(u, UNIT_WANTS, k, NULL, true, UNIT_DEPENDENCY_UDEV);
383+
r = unit_add_dependency_by_name(u, UNIT_WANTS, k, true, UNIT_DEPENDENCY_UDEV);
384384
if (r < 0)
385385
return log_unit_error_errno(u, r, "Failed to add Wants= dependency: %m");
386386

‎src/core/load-dropin.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static int process_deps(Unit *u, UnitDependency dependency, const char *dir_suff
9292
log_unit_warning(u, "%s dependency dropin %s target %s has different name",
9393
unit_dependency_to_string(dependency), *p, target);
9494

95-
r = unit_add_dependency_by_name(u, dependency, entry, NULL, true, UNIT_DEPENDENCY_FILE);
95+
r = unit_add_dependency_by_name(u, dependency, entry, true, UNIT_DEPENDENCY_FILE);
9696
if (r < 0)
9797
log_unit_warning_errno(u, r, "Cannot add %s dependency on %s, ignoring: %m",
9898
unit_dependency_to_string(dependency), entry);

‎src/core/load-fragment.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ int config_parse_unit_deps(
135135
continue;
136136
}
137137

138-
r = unit_add_dependency_by_name(u, d, k, NULL, true, UNIT_DEPENDENCY_FILE);
138+
r = unit_add_dependency_by_name(u, d, k, true, UNIT_DEPENDENCY_FILE);
139139
if (r < 0)
140140
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to add dependency on %s, ignoring: %m", k);
141141
}
@@ -1770,7 +1770,7 @@ int config_parse_service_sockets(
17701770
if (r < 0)
17711771
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to add dependency on %s, ignoring: %m", k);
17721772

1773-
r = unit_add_dependency_by_name(UNIT(s), UNIT_TRIGGERED_BY, k, NULL, true, UNIT_DEPENDENCY_FILE);
1773+
r = unit_add_dependency_by_name(UNIT(s), UNIT_TRIGGERED_BY, k, true, UNIT_DEPENDENCY_FILE);
17741774
if (r < 0)
17751775
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to add dependency on %s, ignoring: %m", k);
17761776
}

‎src/core/mount.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ static int mount_add_default_dependencies(Mount *m) {
456456
* network.target, so that they are shut down only
457457
* after this mount unit is stopped. */
458458

459-
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_NETWORK_TARGET, NULL, true, mask);
459+
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_NETWORK_TARGET, true, mask);
460460
if (r < 0)
461461
return r;
462462

@@ -475,7 +475,7 @@ static int mount_add_default_dependencies(Mount *m) {
475475
} else
476476
after = SPECIAL_LOCAL_FS_PRE_TARGET;
477477

478-
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true, mask);
478+
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, true, mask);
479479
if (r < 0)
480480
return r;
481481

@@ -485,7 +485,7 @@ static int mount_add_default_dependencies(Mount *m) {
485485

486486
/* If this is a tmpfs mount then we have to unmount it before we try to deactivate swaps */
487487
if (streq_ptr(p->fstype, "tmpfs")) {
488-
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_SWAP_TARGET, NULL, true, mask);
488+
r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_SWAP_TARGET, true, mask);
489489
if (r < 0)
490490
return r;
491491
}
@@ -1436,11 +1436,11 @@ static int mount_setup_new_unit(
14361436
int r;
14371437

14381438
target = mount_is_network(p) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
1439-
r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT);
1439+
r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, true, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT);
14401440
if (r < 0)
14411441
return r;
14421442

1443-
r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT);
1443+
r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, true, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT);
14441444
if (r < 0)
14451445
return r;
14461446
}
@@ -1498,7 +1498,7 @@ static int mount_setup_existing_unit(
14981498
* in the dependency "Set*" objects who created a
14991499
* dependency), we can only add deps, never lose them,
15001500
* until the next full daemon-reload. */
1501-
unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_REMOTE_FS_TARGET, NULL, true, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT);
1501+
unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_REMOTE_FS_TARGET, true, UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT);
15021502
load_extras = true;
15031503
}
15041504

‎src/core/path.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static int path_add_default_dependencies(Path *p) {
298298
if (!UNIT(p)->default_dependencies)
299299
return 0;
300300

301-
r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_PATHS_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
301+
r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_PATHS_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
302302
if (r < 0)
303303
return r;
304304

‎src/core/service.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -617,15 +617,15 @@ static int service_add_default_dependencies(Service *s) {
617617
/* In the --user instance there's no sysinit.target,
618618
* in that case require basic.target instead. */
619619

620-
r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
620+
r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_BASIC_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
621621
if (r < 0)
622622
return r;
623623
}
624624

625625
/* Second, if the rest of the base system is in the same
626626
* transaction, order us after it, but do not pull it in or
627627
* even require it. */
628-
r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_BASIC_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
628+
r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_BASIC_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
629629
if (r < 0)
630630
return r;
631631

@@ -661,12 +661,12 @@ static int service_setup_bus_name(Service *s) {
661661
if (!s->bus_name)
662662
return 0;
663663

664-
r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true, UNIT_DEPENDENCY_FILE);
664+
r = unit_add_dependency_by_name(UNIT(s), UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, true, UNIT_DEPENDENCY_FILE);
665665
if (r < 0)
666666
return log_unit_error_errno(UNIT(s), r, "Failed to add dependency on " SPECIAL_DBUS_SOCKET ": %m");
667667

668668
/* We always want to be ordered against dbus.socket if both are in the transaction. */
669-
r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_DBUS_SOCKET, NULL, true, UNIT_DEPENDENCY_FILE);
669+
r = unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_DBUS_SOCKET, true, UNIT_DEPENDENCY_FILE);
670670
if (r < 0)
671671
return log_unit_error_errno(UNIT(s), r, "Failed to add dependency on " SPECIAL_DBUS_SOCKET ": %m");
672672

‎src/core/socket.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ static int socket_add_default_dependencies(Socket *s) {
301301
if (!UNIT(s)->default_dependencies)
302302
return 0;
303303

304-
r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
304+
r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
305305
if (r < 0)
306306
return r;
307307

‎src/core/swap.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static int swap_add_device_dependencies(Swap *s) {
197197
/* File based swap devices need to be ordered after
198198
* systemd-remount-fs.service, since they might need a
199199
* writable file system. */
200-
return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_FS_SERVICE, NULL, true, UNIT_DEPENDENCY_FILE);
200+
return unit_add_dependency_by_name(UNIT(s), UNIT_AFTER, SPECIAL_REMOUNT_FS_SERVICE, true, UNIT_DEPENDENCY_FILE);
201201
}
202202

203203
static int swap_add_default_dependencies(Swap *s) {
@@ -216,7 +216,7 @@ static int swap_add_default_dependencies(Swap *s) {
216216

217217
/* swap units generated for the swap dev links are missing the
218218
* ordering dep against the swap target. */
219-
r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SWAP_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
219+
r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SWAP_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
220220
if (r < 0)
221221
return r;
222222

‎src/core/timer.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static int timer_add_default_dependencies(Timer *t) {
8888
if (!UNIT(t)->default_dependencies)
8989
return 0;
9090

91-
r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_TIMERS_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
91+
r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_TIMERS_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
9292
if (r < 0)
9393
return r;
9494

@@ -99,7 +99,7 @@ static int timer_add_default_dependencies(Timer *t) {
9999

100100
LIST_FOREACH(value, v, t->values) {
101101
if (v->base == TIMER_CALENDAR) {
102-
r = unit_add_dependency_by_name(UNIT(t), UNIT_AFTER, SPECIAL_TIME_SYNC_TARGET, NULL, true, UNIT_DEPENDENCY_DEFAULT);
102+
r = unit_add_dependency_by_name(UNIT(t), UNIT_AFTER, SPECIAL_TIME_SYNC_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
103103
if (r < 0)
104104
return r;
105105
break;

0 commit comments

Comments
 (0)