dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-12 22:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

export: call all verb functions verb_*

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-03-06 13:27:03 +01:00
committed by Luca Boccassi
parent 326824deeb
commit 8fb107aa99
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/import/export.c
View File

@@ -58,7 +58,7 @@ static void on_tar_finished(TarExport *export, int error, void *userdata) {
sd_event_exit(event, ABS(error));
}
static int export_tar(int argc, char *argv[], void *userdata) {
static int verb_export_tar(int argc, char *argv[], void *userdata) {
_cleanup_(tar_export_unrefp) TarExport *export = NULL;
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
_cleanup_(image_unrefp) Image *image = NULL;
@@ -139,7 +139,7 @@ static void on_raw_finished(RawExport *export, int error, void *userdata) {
sd_event_exit(event, ABS(error));
}
static int export_raw(int argc, char *argv[], void *userdata) {
static int verb_export_raw(int argc, char *argv[], void *userdata) {
_cleanup_(raw_export_unrefp) RawExport *export = NULL;
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
_cleanup_(image_unrefp) Image *image = NULL;
@@ -202,7 +202,7 @@ static int export_raw(int argc, char *argv[], void *userdata) {
return -r;
}
static int help(int argc, char *argv[], void *userdata) {
static int help(void) {
printf("%1$s [OPTIONS...] {COMMAND} ...\n"
"\n%4$sExport disk images.%5$s\n"
"\n%2$sCommands:%3$s\n"
@@ -225,6 +225,10 @@ static int help(int argc, char *argv[], void *userdata) {
return 0;
}
static int verb_help(int argc, char *argv[], void *userdata) {
return help();
}
static int parse_argv(int argc, char *argv[]) {
enum {
@@ -255,7 +259,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();
@@ -297,9 +301,9 @@ static int parse_argv(int argc, char *argv[]) {
static int export_main(int argc, char *argv[]) {
static const Verb verbs[] = {
{ "help", VERB_ANY, VERB_ANY, 0, help },
{ "tar", 2, 3, 0, export_tar },
{ "raw", 2, 3, 0, export_raw },
{ "help", VERB_ANY, VERB_ANY, 0, verb_help },
{ "tar", 2, 3, 0, verb_export_tar },
{ "raw", 2, 3, 0, verb_export_raw },
{}
};