networkctl: call all verb functions verb_*

diff --git a/src/network/networkctl-address-label.c b/src/network/networkctl-address-label.c
index 739c1d2e83964a0fd9418ab21e0753478048c6fc..048159bd2c26c407a75ec59036ee896b409ab999 100644 (file)
--- a/src/network/networkctl-address-label.c
+++ b/src/network/networkctl-address-label.c
@@ -89,7 +89,7 @@ static int dump_address_labels(sd_netlink *rtnl) {
         return 0;
 }
 
-int list_address_labels(int argc, char *argv[], void *userdata) {
+int verb_list_address_labels(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
         int r;
 

diff --git a/src/network/networkctl-address-label.h b/src/network/networkctl-address-label.h
index eb3c722744f1ed75402bd64568e6c2172386f10d..a5584806fbf3ff3c8e51387690291809eeb5961a 100644 (file)
--- a/src/network/networkctl-address-label.h
+++ b/src/network/networkctl-address-label.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int list_address_labels(int argc, char *argv[], void *userdata);
+int verb_list_address_labels(int argc, char *argv[], void *userdata);

diff --git a/src/network/networkctl-list.c b/src/network/networkctl-list.c
index 1ac6ad39a8a7e0c542ccb0385b82bd4d547a683c..a0b7b9a21f2ff7f68be6459fa0621bc307c14ecf 100644 (file)
--- a/src/network/networkctl-list.c
+++ b/src/network/networkctl-list.c
@@ -12,7 +12,7 @@
 #include "networkctl-list.h"
 #include "networkctl-util.h"
 
-int list_links(int argc, char *argv[], void *userdata) {
+int verb_list_links(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
         _cleanup_(link_info_array_freep) LinkInfo *links = NULL;
         _cleanup_(table_unrefp) Table *table = NULL;

diff --git a/src/network/networkctl-list.h b/src/network/networkctl-list.h
index 0ee8dba8941c7e3af7e1bdf8a88d19a31293d8a4..cb418e1cbc7d19f136ebf87dc2f65b148a99a8b2 100644 (file)
--- a/src/network/networkctl-list.h
+++ b/src/network/networkctl-list.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int list_links(int argc, char *argv[], void *userdata);
+int verb_list_links(int argc, char *argv[], void *userdata);

diff --git a/src/network/networkctl-lldp.c b/src/network/networkctl-lldp.c
index 300f7b26df9751f6eac38d11bd4a3123d8fcac93..433a5fc922606fc6e1b033dc47e0ba7885e5aae3 100644 (file)
--- a/src/network/networkctl-lldp.c
+++ b/src/network/networkctl-lldp.c
@@ -219,7 +219,7 @@ static int dump_lldp_neighbors_json(sd_json_variant *reply, char * const *patter
         return sd_json_variant_dump(v, arg_json_format_flags, NULL, NULL);
 }
 
-int link_lldp_status(int argc, char *argv[], void *userdata) {
+int verb_link_lldp_status(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_varlink_flush_close_unrefp) sd_varlink *vl = NULL;
         _cleanup_(table_unrefp) Table *table = NULL;
         sd_json_variant *reply;

diff --git a/src/network/networkctl-lldp.h b/src/network/networkctl-lldp.h
index 2225fc3abdc532c85393dd43f108907c00ae56c7..63f89a616548607f391666fa7b151fe827db997b 100644 (file)
--- a/src/network/networkctl-lldp.h
+++ b/src/network/networkctl-lldp.h
@@ -4,4 +4,4 @@
 #include "shared-forward.h"
 
 int dump_lldp_neighbors(sd_varlink *vl, Table *table, int ifindex);
-int link_lldp_status(int argc, char *argv[], void *userdata);
+int verb_link_lldp_status(int argc, char *argv[], void *userdata);

diff --git a/src/network/networkctl-misc.c b/src/network/networkctl-misc.c
index 73c79494a073b7cd4ecd301f99e2cc0d5b671021..47323b1d9faa6ef8d05827bead70e9b71561e994 100644 (file)
--- a/src/network/networkctl-misc.c
+++ b/src/network/networkctl-misc.c
@@ -46,7 +46,7 @@ static int parse_interfaces(sd_netlink **rtnl, char *argv[], OrderedSet **ret) {
         return 0;
 }
 
-int link_up_down(int argc, char *argv[], void *userdata) {
+int verb_link_up_down(int argc, char *argv[], void *userdata) {
         int r, ret = 0;
 
         bool up = streq_ptr(argv[0], "up");
@@ -75,7 +75,7 @@ int link_up_down(int argc, char *argv[], void *userdata) {
         return ret;
 }
 
-int link_delete(int argc, char *argv[], void *userdata) {
+int verb_link_delete(int argc, char *argv[], void *userdata) {
         int r, ret = 0;
 
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
@@ -104,7 +104,7 @@ int link_delete(int argc, char *argv[], void *userdata) {
         return ret;
 }
 
-int link_bus_simple_method(int argc, char *argv[], void *userdata) {
+int verb_link_bus_simple_method(int argc, char *argv[], void *userdata) {
         int r, ret = 0;
 
         typedef struct LinkBusAction {

diff --git a/src/network/networkctl-misc.h b/src/network/networkctl-misc.h
index 4860c99ce393c02003f536945a35deb21d673ad8..df7a6a6fc052e39d2db65db4e11726939e8d61fd 100644 (file)
--- a/src/network/networkctl-misc.h
+++ b/src/network/networkctl-misc.h
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int link_up_down(int argc, char *argv[], void *userdata);
-int link_delete(int argc, char *argv[], void *userdata);
-int link_bus_simple_method(int argc, char *argv[], void *userdata);
+int verb_link_up_down(int argc, char *argv[], void *userdata);
+int verb_link_delete(int argc, char *argv[], void *userdata);
+int verb_link_bus_simple_method(int argc, char *argv[], void *userdata);
 int verb_reload(int argc, char *argv[], void *userdata);
 int verb_persistent_storage(int argc, char *argv[], void *userdata);

diff --git a/src/network/networkctl-status-link.c b/src/network/networkctl-status-link.c
index 62f57c2b215d52379d3b769079dc3010f5efb109..e2db2c7553909e20ec3514542c563aba3573439f 100644 (file)
--- a/src/network/networkctl-status-link.c
+++ b/src/network/networkctl-status-link.c
@@ -939,7 +939,7 @@ static int link_status_one(
         return show_logs(info->ifindex, info->name);
 }
 
-int link_status(int argc, char *argv[], void *userdata) {
+int verb_link_status(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
         _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;

diff --git a/src/network/networkctl-status-link.h b/src/network/networkctl-status-link.h
index 1c1b4ea75a385ef1740863b55acd725fcc6ecca8..70cbf4f1604d042a69ef0681bf9048acc9240217 100644 (file)
--- a/src/network/networkctl-status-link.h
+++ b/src/network/networkctl-status-link.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int link_status(int argc, char *argv[], void *userdata);
+int verb_link_status(int argc, char *argv[], void *userdata);

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 68acdcf60a7a2b68aa177314511322892e6ee259..91379cc9308f5a5f8f7d6a59f89d80dc64c06d70 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -223,22 +223,22 @@ static int parse_argv(int argc, char *argv[]) {
 
 static int networkctl_main(int argc, char *argv[]) {
         static const Verb verbs[] = {
-                { "list",               VERB_ANY, VERB_ANY, VERB_DEFAULT|VERB_ONLINE_ONLY, list_links              },
-                { "status",             VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY,              link_status             },
-                { "lldp",               VERB_ANY, VERB_ANY, 0,                             link_lldp_status        },
-                { "label",              1,        1,        0,                             list_address_labels     },
-                { "delete",             2,        VERB_ANY, 0,                             link_delete             },
-                { "up",                 2,        VERB_ANY, 0,                             link_up_down            },
-                { "down",               2,        VERB_ANY, 0,                             link_up_down            },
-                { "renew",              2,        VERB_ANY, VERB_ONLINE_ONLY,              link_bus_simple_method  },
-                { "forcerenew",         2,        VERB_ANY, VERB_ONLINE_ONLY,              link_bus_simple_method  },
-                { "reconfigure",        2,        VERB_ANY, VERB_ONLINE_ONLY,              link_bus_simple_method  },
-                { "reload",             1,        1,        VERB_ONLINE_ONLY,              verb_reload             },
-                { "edit",               2,        VERB_ANY, 0,                             verb_edit               },
-                { "cat",                1,        VERB_ANY, 0,                             verb_cat                },
-                { "mask",               2,        VERB_ANY, 0,                             verb_mask               },
-                { "unmask",             2,        VERB_ANY, 0,                             verb_unmask             },
-                { "persistent-storage", 2,        2,        0,                             verb_persistent_storage },
+                { "list",               VERB_ANY, VERB_ANY, VERB_DEFAULT|VERB_ONLINE_ONLY, verb_list_links              },
+                { "status",             VERB_ANY, VERB_ANY, VERB_ONLINE_ONLY,              verb_link_status             },
+                { "lldp",               VERB_ANY, VERB_ANY, 0,                             verb_link_lldp_status        },
+                { "label",              1,        1,        0,                             verb_list_address_labels     },
+                { "delete",             2,        VERB_ANY, 0,                             verb_link_delete             },
+                { "up",                 2,        VERB_ANY, 0,                             verb_link_up_down            },
+                { "down",               2,        VERB_ANY, 0,                             verb_link_up_down            },
+                { "renew",              2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_bus_simple_method  },
+                { "forcerenew",         2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_bus_simple_method  },
+                { "reconfigure",        2,        VERB_ANY, VERB_ONLINE_ONLY,              verb_link_bus_simple_method  },
+                { "reload",             1,        1,        VERB_ONLINE_ONLY,              verb_reload                  },
+                { "edit",               2,        VERB_ANY, 0,                             verb_edit                    },
+                { "cat",                1,        VERB_ANY, 0,                             verb_cat                     },
+                { "mask",               2,        VERB_ANY, 0,                             verb_mask                    },
+                { "unmask",             2,        VERB_ANY, 0,                             verb_unmask                  },
+                { "persistent-storage", 2,        2,        0,                             verb_persistent_storage      },
                 {}
         };