From 901519d583a1cb9b8f0029d99f52bcf2917b16ea Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 26 Apr 2024 17:43:42 +0200 Subject: [PATCH 1/2] varlink-idl: align continuation line character \ --- src/shared/varlink-idl.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/shared/varlink-idl.h b/src/shared/varlink-idl.h index f2d4892eee2..6d0b3490fb2 100644 --- a/src/shared/varlink-idl.h +++ b/src/shared/varlink-idl.h @@ -82,25 +82,25 @@ struct VarlinkInterface { const VarlinkSymbol *symbols[]; }; -#define VARLINK_DEFINE_FIELD(_name, _field_type, _field_flags) \ +#define VARLINK_DEFINE_FIELD(_name, _field_type, _field_flags) \ { .name = #_name, .field_type = (_field_type), .field_flags = (_field_flags) } -#define VARLINK_DEFINE_FIELD_BY_TYPE(_name, _named_type, _field_flags) \ +#define VARLINK_DEFINE_FIELD_BY_TYPE(_name, _named_type, _field_flags) \ { .name = #_name, .field_type = VARLINK_NAMED_TYPE, .named_type = #_named_type, .symbol = &vl_type_ ## _named_type, .field_flags = (_field_flags) } -#define VARLINK_DEFINE_INPUT(_name, _field_type, _field_flags) \ +#define VARLINK_DEFINE_INPUT(_name, _field_type, _field_flags) \ { .name = #_name, .field_type = (_field_type), .field_flags = (_field_flags), .field_direction = VARLINK_INPUT } -#define VARLINK_DEFINE_INPUT_BY_TYPE(_name, _named_type, _field_flags) \ +#define VARLINK_DEFINE_INPUT_BY_TYPE(_name, _named_type, _field_flags) \ { .name = #_name, .field_type = VARLINK_NAMED_TYPE, .named_type = #_named_type, .symbol = &vl_type_ ## _named_type, .field_flags = (_field_flags), .field_direction = VARLINK_INPUT } -#define VARLINK_DEFINE_OUTPUT(_name, _field_type, _field_flags) \ +#define VARLINK_DEFINE_OUTPUT(_name, _field_type, _field_flags) \ { .name = #_name, .field_type = (_field_type), .field_flags = (_field_flags), .field_direction = VARLINK_OUTPUT } #define VARLINK_DEFINE_OUTPUT_BY_TYPE(_name, _named_type, _field_flags) \ { .name = #_name, .field_type = VARLINK_NAMED_TYPE, .named_type = #_named_type, .symbol = &vl_type_ ## _named_type, .field_flags = (_field_flags), .field_direction = VARLINK_OUTPUT } -#define VARLINK_DEFINE_ENUM_VALUE(_name) \ +#define VARLINK_DEFINE_ENUM_VALUE(_name) \ { .name = #_name, .field_type = VARLINK_ENUM_VALUE } #define VARLINK_DEFINE_METHOD(_name, ...) \ From c16ac6ce94ae36b859295a831575b3e7dbd54b74 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 23 May 2024 11:01:31 +0200 Subject: [PATCH 2/2] varlink-idl: include line/column in a parse log msg --- src/shared/varlink-idl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared/varlink-idl.c b/src/shared/varlink-idl.c index 42151316ccc..5c0d7204591 100644 --- a/src/shared/varlink-idl.c +++ b/src/shared/varlink-idl.c @@ -516,7 +516,10 @@ static int varlink_idl_subparse_token( l = token_match(*p, allowed_delimiters, allowed_chars); if (l == 0) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "Couldn't find token of allowed chars '%s' or allowed delimiters '%s'.", strempty(allowed_chars), strempty(allowed_delimiters)); + return varlink_idl_log( + SYNTHETIC_ERRNO(EBADMSG), + "%u:%u: Couldn't find token of allowed chars '%s' or allowed delimiters '%s'.", + *line, *column, strempty(allowed_chars), strempty(allowed_delimiters)); } t = strndup(*p, l);