tree-wide: extend verbs functions with extra per-verb data parameter

We often have a pattern where the same verb function is used for
multiple actions. This leads to an antipattern where we figure out what
action needs to be taken from argv[0] multiple times: often once in
parse_argv() to figure out what options are allowed, then once again
implicitly in dispatch_verb(), and then again in the action verb itself.
Let's allow passing a parameter into the verb to simplify this.

This matches a pattern we have in conf-parser.h, where we have both
void *userdata (more global) and void *data (per-config item). Here,
I opted for uintptr_t userdata. It seems that most of the time we'll
want to just pass an enum value. This works OK with no casts. I also
tried a void* and union. In both cases, much more boilerplate is needed:
either a cast or a macro to help avoid compiler warnings. uintptr_t
seems generic enough to cover foreseeable usecases with no fuss.

This is a noop refactoring. See next commit for an example.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-03-18 10:28:47 +00:00
committed by Luca Boccassi
parent 9e8babc8ab
commit 31ddd87da0
216 changed files with 745 additions and 573 deletions
+4 -4
View File
@@ -109,7 +109,7 @@ static int parse_argv(int argc, char *argv[]) {
return 1;
}
static int verb_status(int argc, char *argv[], void *userdata) {
static int verb_status(int argc, char *argv[], uintptr_t _data, void *userdata) {
static const int exit_status_table[_FACTORY_RESET_MODE_MAX] = {
/* Report current mode also as via exit status, but only return a subset of states */
[FACTORY_RESET_UNSUPPORTED] = EXIT_SUCCESS,
@@ -130,7 +130,7 @@ static int verb_status(int argc, char *argv[], void *userdata) {
return exit_status_table[f];
}
static int verb_request(int argc, char *argv[], void *userdata) {
static int verb_request(int argc, char *argv[], uintptr_t _data, void *userdata) {
int r;
FactoryResetMode f = factory_reset_mode();
@@ -197,7 +197,7 @@ static int verb_request(int argc, char *argv[], void *userdata) {
return 0;
}
static int verb_cancel(int argc, char *argv[], void *userdata) {
static int verb_cancel(int argc, char *argv[], uintptr_t _data, void *userdata) {
int r;
FactoryResetMode f = factory_reset_mode();
@@ -269,7 +269,7 @@ static int retrigger_block_devices(void) {
return 0;
}
static int verb_complete(int argc, char *argv[], void *userdata) {
static int verb_complete(int argc, char *argv[], uintptr_t _data, void *userdata) {
int r;
FactoryResetMode f = factory_reset_mode();