dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared/logs-show: constify Set *fields

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-04-29 14:47:48 +02:00
parent 476a63e9c0
commit 2f063186d5
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/logs-show.c
View File

@@ -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,