From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Fri, 6 Mar 2026 12:29:54 +0000 (+0100)
Subject: import-fs: call all verb functions verb_*
X-Git-Tag: v261-rc1~809^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=095368238a107198bad61be20c107a6d167f43ba;p=thirdparty%2Fsystemd.git

import-fs: call all verb functions verb_*
---

diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index 46daf3acc05..db251744341 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -107,7 +107,7 @@ static int progress_bytes(uint64_t nbytes, uint64_t bps, void *userdata) {
         return 0;
 }
 
-static int import_fs(int argc, char *argv[], void *userdata) {
+static int verb_import_fs(int argc, char *argv[], void *userdata) {
         _cleanup_(rm_rf_subvolume_and_freep) char *temp_path = NULL;
         _cleanup_(progress_info_free) ProgressInfo progress = { .bps = UINT64_MAX };
         _cleanup_free_ char *l = NULL, *final_path = NULL;
@@ -265,8 +265,7 @@ static int import_fs(int argc, char *argv[], void *userdata) {
         return 0;
 }
 
-static int help(int argc, char *argv[], void *userdata) {
-
+static int help(void) {
         printf("%1$s [OPTIONS...] {COMMAND} ...\n"
                "\n%4$sImport container images from a file system directories.%5$s\n"
                "\n%2$sCommands:%3$s\n"
@@ -296,8 +295,11 @@ static int help(int argc, char *argv[], void *userdata) {
         return 0;
 }
 
-static int parse_argv(int argc, char *argv[]) {
+static int verb_help(int argc, char *argv[], void *userdata) {
+        return help();
+}
 
+static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_VERSION = 0x100,
                 ARG_FORCE,
@@ -338,7 +340,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 case 'h':
-                        return help(0, NULL, NULL);
+                        return help();
 
                 case ARG_VERSION:
                         return version();
@@ -417,8 +419,8 @@ static int parse_argv(int argc, char *argv[]) {
 static int import_fs_main(int argc, char *argv[]) {
 
         static const Verb verbs[] = {
-                { "help", VERB_ANY, VERB_ANY, 0, help      },
-                { "run",  2,        3,        0, import_fs },
+                { "help", VERB_ANY, VERB_ANY, 0, verb_help      },
+                { "run",  2,        3,        0, verb_import_fs },
                 {}
         };