diff options
| -rw-r--r-- | src/shared/logs-show.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index eade4dfbfd..f7fe3b3220 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -121,8 +121,8 @@ static int parse_fieldv(const void *data, size_t length, const ParseFieldVec *fi return 0; } -static int field_set_test(Set *fields, const char *name, size_t n) { - char *s = NULL; +static int field_set_test(const Set *fields, const char *name, size_t n) { + char *s; if (!fields) return 1; @@ -369,7 +369,7 @@ static int output_short( OutputMode mode, unsigned n_columns, OutputFlags flags, - Set *output_fields, + const Set *output_fields, const size_t highlight[2]) { int r; @@ -533,7 +533,7 @@ static int output_verbose( OutputMode mode, unsigned n_columns, OutputFlags flags, - Set *output_fields, + const Set *output_fields, const size_t highlight[2]) { const void *data; @@ -652,7 +652,7 @@ static int output_export( OutputMode mode, unsigned n_columns, OutputFlags flags, - Set *output_fields, + const Set *output_fields, const size_t highlight[2]) { sd_id128_t boot_id; @@ -849,7 +849,7 @@ static int update_json_data( static int update_json_data_split( Hashmap *h, OutputFlags flags, - Set *output_fields, + const Set *output_fields, const void *data, size_t size) { @@ -870,7 +870,7 @@ static int update_json_data_split( return 0; name = strndupa(data, eq - (const char*) data); - if (output_fields && !set_get(output_fields, name)) + if (output_fields && !set_contains(output_fields, name)) return 0; return update_json_data(h, flags, name, eq + 1, size - (eq - (const char*) data) - 1); @@ -882,7 +882,7 @@ static int output_json( OutputMode mode, unsigned n_columns, OutputFlags flags, - Set *output_fields, + const Set *output_fields, const size_t highlight[2]) { char sid[SD_ID128_STRING_MAX], usecbuf[DECIMAL_STR_MAX(usec_t)]; @@ -1073,7 +1073,7 @@ static int output_cat( OutputMode mode, unsigned n_columns, OutputFlags flags, - Set *output_fields, + const Set *output_fields, const size_t highlight[2]) { const char *field; @@ -1103,7 +1103,7 @@ static int (*output_funcs[_OUTPUT_MODE_MAX])( OutputMode mode, unsigned n_columns, OutputFlags flags, - Set *output_fields, + const Set *output_fields, const size_t highlight[2]) = { [OUTPUT_SHORT] = output_short, |