shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-08 20:58:20 +03:00
Code

coredumpctl: fetch JSON object by key instead of iterating

Browse Source 
Follow-up for d1b5a0c691
This commit is contained in:
Luca Boccassi 2021-04-07 10:38:56 +01:00
parent 1f2abb791e
commit b7ddd44497
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/coredump/coredumpctl.c
View File

@ -735,18 +735,9 @@ static int print_info(FILE *file, sd_journal *j, bool need_space) {
const char *module_name; const char *module_name;
JsonVariant *module_json; JsonVariant *module_json;
/* Cannot nest two JSON_VARIANT_OBJECT_FOREACH as they define the same JSON_VARIANT_OBJECT_FOREACH(module_name, module_json, v) {
* iterator variable '_state' */
for (struct json_variant_foreach_state _state2 = { (v), 0 }; \
json_variant_is_object(_state2.variant) && \
_state2.idx < json_variant_elements(_state2.variant) && \
({ module_name = json_variant_string(json_variant_by_index(_state2.variant, _state2.idx)); \
module_json = json_variant_by_index(_state2.variant, _state2.idx + 1); \
true; }); \
_state2.idx += 2) {
_cleanup_free_ char *module_basename = NULL, *exe_basename = NULL; _cleanup_free_ char *module_basename = NULL, *exe_basename = NULL;
const char *key; JsonVariant *build_id;
JsonVariant *w;
/* The module name, most likely parsed from the ELF core file, /* The module name, most likely parsed from the ELF core file,
* sometimes contains the full path and sometimes does not. */ * sometimes contains the full path and sometimes does not. */
@ -765,17 +756,9 @@ static int print_info(FILE *file, sd_journal *j, bool need_space) {
if (!streq(module_basename, exe_basename)) if (!streq(module_basename, exe_basename))
continue; continue;
JSON_VARIANT_OBJECT_FOREACH(key, w, module_json) { build_id = json_variant_by_key(module_json, "buildId");
if (!json_variant_is_string(w)) if (build_id)
continue; fprintf(file, " build-id: %s\n", json_variant_string(build_id));
if (!streq(key, "buildId"))
continue;
fprintf(file, " build-id: %s\n", json_variant_string(w));
break;
}
break; break;
} }