diff --git a/src/shared/varlink-idl.c b/src/shared/varlink-idl.c index 42151316cc..5c0d720459 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); diff --git a/src/shared/varlink-idl.h b/src/shared/varlink-idl.h index f2d4892eee..6d0b3490fb 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, ...) \