tree-wide: normalize comment style
This commit is contained in:
@@ -406,7 +406,7 @@ int pattern_match(const char *pattern, const char *s, InstanceMetadata *ret) {
|
||||
if (strlen(t) != sizeof(found.sha256sum) * 2)
|
||||
goto nope;
|
||||
|
||||
r = unhexmem_full(t, sizeof(found.sha256sum) * 2, /* secure = */ false, &d, &l);
|
||||
r = unhexmem_full(t, sizeof(found.sha256sum) * 2, /* secure= */ false, &d, &l);
|
||||
if (r == -ENOMEM)
|
||||
return r;
|
||||
if (r < 0)
|
||||
|
||||
@@ -402,7 +402,7 @@ static int resource_load_from_web(
|
||||
if (p[0] == '\\')
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "File names with escapes not supported in manifest at line %zu, refusing.", line_nr);
|
||||
|
||||
r = unhexmem_full(p, 64, /* secure = */ false, &h, &hlen);
|
||||
r = unhexmem_full(p, 64, /* secure= */ false, &h, &hlen);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to parse digest at manifest line %zu, refusing.", line_nr);
|
||||
|
||||
|
||||
@@ -683,7 +683,7 @@ int transfer_resolve_paths(
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = resource_resolve_path(&t->target, root, /*relative_to_directory=*/ NULL, node);
|
||||
r = resource_resolve_path(&t->target, root, /* relative_to_directory= */ NULL, node);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
||||
@@ -974,7 +974,7 @@ static int context_on_acquire_progress(const Transfer *t, const Instance *inst,
|
||||
assert(overall <= 100);
|
||||
|
||||
log_debug("Transfer %zu/%zu is %u%% complete (%u%% overall).", i+1, n, percentage, overall);
|
||||
return sd_notifyf(/* unset_environment=*/ false, "X_SYSUPDATE_PROGRESS=%u\n"
|
||||
return sd_notifyf(/* unset_environment= */ false, "X_SYSUPDATE_PROGRESS=%u\n"
|
||||
"X_SYSUPDATE_TRANSFERS_LEFT=%zu\n"
|
||||
"X_SYSUPDATE_TRANSFERS_DONE=%zu\n"
|
||||
"STATUS=Updating to '%s' (%u%% complete).",
|
||||
@@ -1031,7 +1031,7 @@ static int context_apply(
|
||||
|
||||
log_info("Selected update '%s' for install.", us->version);
|
||||
|
||||
(void) sd_notifyf(/* unset_environment=*/ false,
|
||||
(void) sd_notifyf(/* unset_environment= */ false,
|
||||
"READY=1\n"
|
||||
"X_SYSUPDATE_VERSION=%s\n"
|
||||
"STATUS=Making room for '%s'.", us->version, us->version);
|
||||
@@ -1041,15 +1041,15 @@ static int context_apply(
|
||||
* download succeeded already, in which case we shouldn't remove it just to acquire it again */
|
||||
r = context_vacuum(
|
||||
c,
|
||||
/* space = */ 1,
|
||||
/* extra_protected_version = */ us->version);
|
||||
/* space= */ 1,
|
||||
/* extra_protected_version= */ us->version);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (arg_sync)
|
||||
sync();
|
||||
|
||||
(void) sd_notifyf(/* unset_environment=*/ false,
|
||||
(void) sd_notifyf(/* unset_environment= */ false,
|
||||
"STATUS=Updating to '%s'.", us->version);
|
||||
|
||||
/* There should now be one instance picked for each transfer, and the order is the same */
|
||||
@@ -1074,7 +1074,7 @@ static int context_apply(
|
||||
if (arg_sync)
|
||||
sync();
|
||||
|
||||
(void) sd_notifyf(/* unset_environment=*/ false,
|
||||
(void) sd_notifyf(/* unset_environment= */ false,
|
||||
"STATUS=Installing '%s'.", us->version);
|
||||
|
||||
for (size_t i = 0; i < c->n_transfers; i++) {
|
||||
@@ -1091,7 +1091,7 @@ static int context_apply(
|
||||
|
||||
log_info("%s Successfully installed update '%s'.", glyph(GLYPH_SPARKLES), us->version);
|
||||
|
||||
(void) sd_notifyf(/* unset_environment=*/ false,
|
||||
(void) sd_notifyf(/* unset_environment= */ false,
|
||||
"STATUS=Installed '%s'.", us->version);
|
||||
|
||||
if (ret_applied)
|
||||
|
||||
@@ -238,8 +238,8 @@ static int job_parse_child_output(int _fd, sd_json_variant **ret) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
r = sd_json_parse_file_at(/* f = */ NULL, fd, /* path = */ NULL, /* flags = */ 0,
|
||||
&v, /* reterr_line = */ NULL, /* reterr_column = */ NULL);
|
||||
r = sd_json_parse_file_at(/* f= */ NULL, fd, /* path= */ NULL, /* flags= */ 0,
|
||||
&v, /* reterr_line= */ NULL, /* reterr_column= */ NULL);
|
||||
if (r < 0)
|
||||
return log_debug_errno(r, "Failed to parse child output as JSON: %m");
|
||||
|
||||
@@ -1959,7 +1959,7 @@ static int method_list_appstream(sd_bus_message *msg, void *userdata, sd_bus_err
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = strv_extend_strv_consume(&urls, target_appstream, /* filter_duplicates = */ true);
|
||||
r = strv_extend_strv_consume(&urls, target_appstream, /* filter_duplicates= */ true);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user