mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-12 11:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26147 from keszybz/silence-gcc-13-warning

Browse Source 
Silence gcc-13 warning
This commit is contained in:
Luca Boccassi 2023-01-23 00:44:41 +00:00 committed by GitHub
commit 901339702c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/shared/install.c
View File

@ -284,6 +284,9 @@ InstallChangeType install_changes_add(
assert(!changes == !n_changes);
assert(INSTALL_CHANGE_TYPE_VALID(type));
/* Message formatting requires <path> to be set. */
assert(path);
/* Register a change or error. Note that the return value may be the error
* that was passed in, or -ENOMEM generated internally. */
@ -339,7 +342,9 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes,
assert(verb || r >= 0);
for (size_t i = 0; i < n_changes; i++) {
assert(verb || changes[i].type >= 0);
if (changes[i].type < 0)
assert(verb);
assert(changes[i].path);
/* When making changes here, make sure to also change install_error() in dbus-manager.c. */
@ -376,7 +381,7 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes,
break;
case INSTALL_CHANGE_AUXILIARY_FAILED:
if (!quiet)
log_warning("Failed to enable auxiliary unit %s, ignoring.", changes[i].source);
log_warning("Failed to enable auxiliary unit %s, ignoring.", changes[i].path);
break;
case -EEXIST:
if (changes[i].source)
@ -2134,7 +2139,7 @@ static int install_context_apply(
q = install_info_traverse(ctx, lp, i, flags, NULL);
if (q < 0) {
if (i->auxiliary) {
q = install_changes_add(changes, n_changes, INSTALL_CHANGE_AUXILIARY_FAILED, NULL, i->name);
q = install_changes_add(changes, n_changes, INSTALL_CHANGE_AUXILIARY_FAILED, i->name, NULL);
if (q < 0)
return q;
continue;