From: Daan De Meyer Date: Mon, 19 May 2025 13:07:34 +0000 (+0200) Subject: sd-varlink: Fix argument names of sd_varlink_idl_parse() X-Git-Tag: v258-rc1~574^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34f714349be3bf5fd636cef7f824fa2350da94e9;p=thirdparty%2Fsystemd.git sd-varlink: Fix argument names of sd_varlink_idl_parse() --- diff --git a/src/libsystemd/sd-varlink/sd-varlink-idl.c b/src/libsystemd/sd-varlink/sd-varlink-idl.c index 3acb5a0eb6e..0a57e2eb5d3 100644 --- a/src/libsystemd/sd-varlink/sd-varlink-idl.c +++ b/src/libsystemd/sd-varlink/sd-varlink-idl.c @@ -1141,8 +1141,8 @@ static int varlink_idl_resolve_types(sd_varlink_interface *interface) { int varlink_idl_parse( const char *text, - unsigned *line, - unsigned *column, + unsigned *reterr_line, + unsigned *reterr_column, sd_varlink_interface **ret) { _cleanup_(varlink_interface_freep) sd_varlink_interface *interface = NULL; @@ -1166,18 +1166,18 @@ int varlink_idl_parse( const char **p = &text; int r; - if (!line) - line = &_line; - if (!column) - column = &_column; + if (!reterr_line) + reterr_line = &_line; + if (!reterr_column) + reterr_column = &_column; while (state != STATE_DONE) { _cleanup_free_ char *token = NULL; r = varlink_idl_subparse_token( p, - line, - column, + reterr_line, + reterr_column, allowed_delimiters, allowed_chars, &token); @@ -1188,11 +1188,11 @@ int varlink_idl_parse( case STATE_PRE_INTERFACE: if (!token) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *line, *column); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *reterr_line, *reterr_column); if (streq(token, "#")) { _cleanup_free_ char *comment = NULL; - r = varlink_idl_subparse_comment(&text, line, column, &comment); + r = varlink_idl_subparse_comment(&text, reterr_line, reterr_column, &comment); if (r < 0) return r; @@ -1213,12 +1213,12 @@ int varlink_idl_parse( allowed_delimiters = NULL; allowed_chars = VALID_CHARS_INTERFACE_NAME; } else - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Unexpected token '%s'.", *line, *column, token); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Unexpected token '%s'.", *reterr_line, *reterr_column, token); break; case STATE_INTERFACE: if (!token) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *line, *column); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *reterr_line, *reterr_column); r = varlink_interface_realloc(&interface, n_symbols); if (r < 0) @@ -1241,7 +1241,7 @@ int varlink_idl_parse( if (streq(token, "#")) { _cleanup_free_ char *comment = NULL; - r = varlink_idl_subparse_comment(&text, line, column, &comment); + r = varlink_idl_subparse_comment(&text, reterr_line, reterr_column, &comment); if (r < 0) return r; @@ -1268,7 +1268,7 @@ int varlink_idl_parse( state = STATE_ERROR; allowed_chars = VALID_CHARS_IDENTIFIER; } else - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Unexpected token '%s'.", *line, *column, token); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Unexpected token '%s'.", *reterr_line, *reterr_column, token); break; @@ -1277,7 +1277,7 @@ int varlink_idl_parse( n_fields = 0; if (!token) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *line, *column); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *reterr_line, *reterr_column); r = varlink_symbol_realloc(&symbol, n_fields); if (r < 0) @@ -1286,7 +1286,7 @@ int varlink_idl_parse( symbol->symbol_type = SD_VARLINK_METHOD; symbol->name = TAKE_PTR(token); - r = varlink_idl_subparse_struct_or_enum(&text, line, column, &symbol, &n_fields, SD_VARLINK_INPUT, 0); + r = varlink_idl_subparse_struct_or_enum(&text, reterr_line, reterr_column, &symbol, &n_fields, SD_VARLINK_INPUT, 0); if (r < 0) return r; @@ -1298,12 +1298,12 @@ int varlink_idl_parse( assert(symbol); if (!token) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *line, *column); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *reterr_line, *reterr_column); if (!streq(token, "->")) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Unexpected token '%s'.", *line, *column, token); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Unexpected token '%s'.", *reterr_line, *reterr_column, token); - r = varlink_idl_subparse_struct_or_enum(&text, line, column, &symbol, &n_fields, SD_VARLINK_OUTPUT, 0); + r = varlink_idl_subparse_struct_or_enum(&text, reterr_line, reterr_column, &symbol, &n_fields, SD_VARLINK_OUTPUT, 0); if (r < 0) return r; @@ -1322,7 +1322,7 @@ int varlink_idl_parse( n_fields = 0; if (!token) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *line, *column); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *reterr_line, *reterr_column); r = varlink_symbol_realloc(&symbol, n_fields); if (r < 0) @@ -1331,7 +1331,7 @@ int varlink_idl_parse( symbol->symbol_type = _SD_VARLINK_SYMBOL_TYPE_INVALID; /* don't know yet if enum or struct, will be field in by varlink_idl_subparse_struct_or_enum() */ symbol->name = TAKE_PTR(token); - r = varlink_idl_subparse_struct_or_enum(&text, line, column, &symbol, &n_fields, SD_VARLINK_REGULAR, 0); + r = varlink_idl_subparse_struct_or_enum(&text, reterr_line, reterr_column, &symbol, &n_fields, SD_VARLINK_REGULAR, 0); if (r < 0) return r; @@ -1350,7 +1350,7 @@ int varlink_idl_parse( n_fields = 0; if (!token) - return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *line, *column); + return varlink_idl_log(SYNTHETIC_ERRNO(EBADMSG), "%u:%u: Premature EOF.", *reterr_line, *reterr_column); r = varlink_symbol_realloc(&symbol, n_fields); if (r < 0) @@ -1359,7 +1359,7 @@ int varlink_idl_parse( symbol->symbol_type = SD_VARLINK_ERROR; symbol->name = TAKE_PTR(token); - r = varlink_idl_subparse_struct_or_enum(&text, line, column, &symbol, &n_fields, SD_VARLINK_REGULAR, 0); + r = varlink_idl_subparse_struct_or_enum(&text, reterr_line, reterr_column, &symbol, &n_fields, SD_VARLINK_REGULAR, 0); if (r < 0) return r;