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

pull: call all verb functions verb_*

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-03-06 13:32:05 +01:00
committed by Luca Boccassi
parent 095368238a
commit 5eccdf20ac
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/import/pull.c
View File

@@ -117,7 +117,7 @@ static void on_tar_finished(TarPull *pull, int error, void *userdata) {
sd_event_exit(event, ABS(error));
}
static int pull_tar(int argc, char *argv[], void *userdata) {
static int verb_pull_tar(int argc, char *argv[], void *userdata) {
_cleanup_free_ char *ll = NULL, *normalized = NULL;
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
_cleanup_(tar_pull_unrefp) TarPull *pull = NULL;
@@ -187,7 +187,7 @@ static void on_raw_finished(RawPull *pull, int error, void *userdata) {
sd_event_exit(event, ABS(error));
}
static int pull_raw(int argc, char *argv[], void *userdata) {
static int verb_pull_raw(int argc, char *argv[], void *userdata) {
_cleanup_free_ char *ll = NULL, *normalized = NULL;
_cleanup_(sd_event_unrefp) sd_event *event = NULL;
_cleanup_(raw_pull_unrefp) RawPull *pull = NULL;
@@ -256,7 +256,7 @@ static void on_oci_finished(OciPull *pull, int error, void *userdata) {
sd_event_exit(event, ABS(error));
}
static int pull_oci(int argc, char *argv[], void *userdata) {
static int verb_pull_oci(int argc, char *argv[], void *userdata) {
int r;
const char *ref = argv[1];
@@ -311,8 +311,7 @@ static int pull_oci(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$sDownload disk images.%5$s\n"
"\n%2$sCommands:%3$s\n"
@@ -357,8 +356,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,
@@ -418,7 +420,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();
@@ -659,10 +661,10 @@ static void parse_env(void) {
static int pull_main(int argc, char *argv[]) {
static const Verb verbs[] = {
{ "help", VERB_ANY, VERB_ANY, 0, help },
{ "tar", 2, 3, 0, pull_tar },
{ "raw", 2, 3, 0, pull_raw },
{ "oci", 2, 3, 0, pull_oci },
{ "help", VERB_ANY, VERB_ANY, 0, verb_help },
{ "tar", 2, 3, 0, verb_pull_tar },
{ "raw", 2, 3, 0, verb_pull_raw },
{ "oci", 2, 3, 0, verb_pull_oci },
{}
};