morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

core/swap: rename variable 'new' -> 'new_unit'

Browse Source 
Follow-up for ba31a5018f

'new' is already used as a macro for memory allocation.
Let's avoid the confusion here.

Addresses https://github.com/systemd/systemd/pull/31902#discussion_r1557672858
This commit is contained in:
Mike Yuan
2024-05-15 21:52:47 +08:00
parent ad450ebab7
commit bb33c5da87
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/swap.c
View File

@@ -374,7 +374,7 @@ static int swap_setup_unit(
int priority,
bool set_flags) {
_cleanup_(unit_freep) Unit *new = NULL;
_cleanup_(unit_freep) Unit *new_unit = NULL;
_cleanup_free_ char *e = NULL;
Unit *u;
Swap *s;
@@ -398,11 +398,11 @@ static int swap_setup_unit(
"Swap appeared twice with different device paths %s and %s, refusing.",
s->parameters_proc_swaps.what, what_proc_swaps);
} else {
r = unit_new_for_name(m, sizeof(Swap), e, &new);
r = unit_new_for_name(m, sizeof(Swap), e, &new_unit);
if (r < 0)
return log_warning_errno(r, "Failed to load swap unit '%s': %m", e);
u = new;
u = new_unit;
s = ASSERT_PTR(SWAP(u));
s->what = strdup(what);
@@ -438,7 +438,7 @@ static int swap_setup_unit(
p->priority_set = true;
unit_add_to_dbus_queue(u);
TAKE_PTR(new);
TAKE_PTR(new_unit);
return 0;
}