From: Jelle van der Waa Date: Tue, 6 May 2025 09:52:24 +0000 (+0200) Subject: sd-varlink: sd_varlink_dispatch rename table to dispatch_table X-Git-Tag: v258-rc1~680^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52068c1e9c541038f1d7fd9a3a488feef0dcc35c;p=thirdparty%2Fsystemd.git sd-varlink: sd_varlink_dispatch rename table to dispatch_table Follow the argument style used throughout the codebase. --- diff --git a/src/factory-reset/factory-reset-tool.c b/src/factory-reset/factory-reset-tool.c index e5eaed2efaa..b32839656a2 100644 --- a/src/factory-reset/factory-reset-tool.c +++ b/src/factory-reset/factory-reset-tool.c @@ -305,7 +305,7 @@ static int vl_method_get_factory_reset_mode(sd_varlink *link, sd_json_variant *p assert(parameters); - r = sd_varlink_dispatch(link, parameters, /* table= */ NULL, /* userdata= */ NULL); + r = sd_varlink_dispatch(link, parameters, /* dispatch_table= */ NULL, /* userdata= */ NULL); if (r != 0) return r; @@ -321,7 +321,7 @@ static int vl_method_can_request_factory_reset(sd_varlink *link, sd_json_variant assert(parameters); - r = sd_varlink_dispatch(link, parameters, /* table= */ NULL, /* userdata= */ NULL); + r = sd_varlink_dispatch(link, parameters, /* dispatch_table= */ NULL, /* userdata= */ NULL); if (r != 0) return r; diff --git a/src/systemd/sd-varlink.h b/src/systemd/sd-varlink.h index 450f29d85bb..c584112bfaf 100644 --- a/src/systemd/sd-varlink.h +++ b/src/systemd/sd-varlink.h @@ -183,7 +183,7 @@ int sd_varlink_get_current_method(sd_varlink *v, const char **ret); int sd_varlink_get_current_parameters(sd_varlink *v, sd_json_variant **ret); /* Parsing incoming data via json_dispatch() and generate a nice error on parse errors */ -int sd_varlink_dispatch(sd_varlink *v, sd_json_variant *parameters, const sd_json_dispatch_field table[], void *userdata); +int sd_varlink_dispatch(sd_varlink *v, sd_json_variant *parameters, const sd_json_dispatch_field dispatch_table[], void *userdata); /* Write outgoing fds into the socket (to be associated with the next enqueued message) */ int sd_varlink_push_fd(sd_varlink *v, int fd);