analyze: systematically name verb entry point functions verb_xyz()

Some of the functions so far were named do_xyz(), others dump_xyz() and
even others test_xyz(). let's instead name them exactly like the verb
exposed in the command line, just prefixed with verb_

diff --git a/src/analyze/analyze-blame.c b/src/analyze/analyze-blame.c
index 6e0e560377d5c8cee3d5f99b1ee0e77b3217b909..6cd6846956de2ca1a4dfe319c23d6818bc0d9aed 100644 (file)
--- a/src/analyze/analyze-blame.c
+++ b/src/analyze/analyze-blame.c
@@ -5,7 +5,7 @@
 #include "analyze-time-data.h"
 #include "format-table.h"
 
-int analyze_blame(int argc, char *argv[], void *userdata) {
+int verb_blame(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(unit_times_free_arrayp) UnitTimes *times = NULL;
         _cleanup_(table_unrefp) Table *table = NULL;

diff --git a/src/analyze/analyze-blame.h b/src/analyze/analyze-blame.h
index f099343bc1022e5899c8ee0c4f3c4662f52a63f1..d9aa985c1e611fd9dc3cd1ad24f464fb352be904 100644 (file)
--- a/src/analyze/analyze-blame.h
+++ b/src/analyze/analyze-blame.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int analyze_blame(int argc, char *argv[], void *userdata);
+int verb_blame(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-calendar.c b/src/analyze/analyze-calendar.c
index ac71af93c0d7b6c9de9e6e7745e430ced93be3ae..ed4697f8659c354fe93b7ca8314d032721efbd28 100644 (file)
--- a/src/analyze/analyze-calendar.c
+++ b/src/analyze/analyze-calendar.c
@@ -122,7 +122,7 @@ static int test_calendar_one(usec_t n, const char *p) {
         return table_print(table, NULL);
 }
 
-int test_calendar(int argc, char *argv[], void *userdata) {
+int verb_calendar(int argc, char *argv[], void *userdata) {
         int ret = 0, r;
         char **p;
         usec_t n;

diff --git a/src/analyze/analyze-calendar.h b/src/analyze/analyze-calendar.h
index 7b73fce9300578b67015d822f549571ba2bb97b3..3d6eac200ddaceafe0e9b91dc585844d76f3faf1 100644 (file)
--- a/src/analyze/analyze-calendar.h
+++ b/src/analyze/analyze-calendar.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int test_calendar(int argc, char *argv[], void *userdata);
+int verb_calendar(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-capability.c b/src/analyze/analyze-capability.c
index a24ebdc9f24b2ab2a8c27da0f3b49c5e3a65b3fc..ebb205e7f2c493ffe3085fba9276f0fb8f3332ed 100644 (file)
--- a/src/analyze/analyze-capability.c
+++ b/src/analyze/analyze-capability.c
@@ -6,7 +6,7 @@
 #include "capability-util.h"
 #include "format-table.h"
 
-int dump_capabilities(int argc, char *argv[], void *userdata) {
+int verb_capabilities(int argc, char *argv[], void *userdata) {
         _cleanup_(table_unrefp) Table *table = NULL;
         unsigned last_cap;
         int r;

diff --git a/src/analyze/analyze-capability.h b/src/analyze/analyze-capability.h
index f770f93f782a9d82b8d750bb20172a52bc899fc8..07ff0887fd948fa7580bbfab1f6c95fe47aba9f2 100644 (file)
--- a/src/analyze/analyze-capability.h
+++ b/src/analyze/analyze-capability.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dump_capabilities(int argc, char *argv[], void *userdata);
+int verb_capabilities(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-cat-config.c b/src/analyze/analyze-cat-config.c
index e7cc33132e04aa8069249bb4f090eec824af2f81..079cad311b9d46aa63ef8105593d21270f682ec1 100644 (file)
--- a/src/analyze/analyze-cat-config.c
+++ b/src/analyze/analyze-cat-config.c
@@ -9,7 +9,7 @@
 #include "pretty-print.h"
 #include "strv.h"
 
-int cat_config(int argc, char *argv[], void *userdata) {
+int verb_cat_config(int argc, char *argv[], void *userdata) {
         char **arg, **list;
         int r;
 

diff --git a/src/analyze/analyze-cat-config.h b/src/analyze/analyze-cat-config.h
index 8c16c2da2a51a040b83be8b4bf1c734b03485341..64e87a3a6d4fe2514031603ac2ed514992f8c0f4 100644 (file)
--- a/src/analyze/analyze-cat-config.h
+++ b/src/analyze/analyze-cat-config.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int cat_config(int argc, char *argv[], void *userdata);
+int verb_cat_config(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-condition.c b/src/analyze/analyze-condition.c
index 0343e69d8fab11dfea911173c15b4db8efc4fb68..a382c356dcccb34835c58d88e2fa96488d2340ba 100644 (file)
--- a/src/analyze/analyze-condition.c
+++ b/src/analyze/analyze-condition.c
@@ -138,6 +138,6 @@ static int verify_conditions(char **lines, UnitFileScope scope, const char *unit
         return r > 0 && q > 0 ? 0 : -EIO;
 }
 
-int do_condition(int argc, char *argv[], void *userdata) {
+int verb_condition(int argc, char *argv[], void *userdata) {
         return verify_conditions(strv_skip(argv, 1), arg_scope, arg_unit, arg_root);
 }

diff --git a/src/analyze/analyze-condition.h b/src/analyze/analyze-condition.h
index 9cf62041946f9384df2825ec6e0c84a8a589e4d9..28ef51a45337395d6c18cbf4f38424a8fb1e2314 100644 (file)
--- a/src/analyze/analyze-condition.h
+++ b/src/analyze/analyze-condition.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int do_condition(int argc, char *argv[], void *userdata);
+int verb_condition(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-critical-chain.c b/src/analyze/analyze-critical-chain.c
index 3e2c5e7c98ca95cb501c90d73c433719c9d466a2..d3169791d9f2494871c51186ecdc51f0c5ccc793 100644 (file)
--- a/src/analyze/analyze-critical-chain.c
+++ b/src/analyze/analyze-critical-chain.c
@@ -195,7 +195,7 @@ static int list_dependencies(sd_bus *bus, const char *name) {
         return list_dependencies_one(bus, name, 0, &units, 0);
 }
 
-int analyze_critical_chain(int argc, char *argv[], void *userdata) {
+int verb_critical_chain(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(unit_times_free_arrayp) UnitTimes *times = NULL;
         Hashmap *h;

diff --git a/src/analyze/analyze-critical-chain.h b/src/analyze/analyze-critical-chain.h
index a5a8e2d76f14ace7f1970d27fe584a7b59af43d9..844249c911eeb0350031da77bbb8ed4a029058ae 100644 (file)
--- a/src/analyze/analyze-critical-chain.h
+++ b/src/analyze/analyze-critical-chain.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int analyze_critical_chain(int argc, char *argv[], void *userdata);
+int verb_critical_chain(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-dot.c b/src/analyze/analyze-dot.c
index 08f99103689ba3fc8a87cce99556a25bef5ffb52..3a1fe043fc90d698503a8fd471a1af2813f6abf8 100644 (file)
--- a/src/analyze/analyze-dot.c
+++ b/src/analyze/analyze-dot.c
@@ -123,7 +123,7 @@ static int expand_patterns(sd_bus *bus, char **patterns, char ***ret) {
         return 0;
 }
 
-int dot(int argc, char *argv[], void *userdata) {
+int verb_dot(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;

diff --git a/src/analyze/analyze-dot.h b/src/analyze/analyze-dot.h
index 9017c1878a6985a6c1d3305231bf1c788d45d0df..144b43d1ef74f1ce6842ebc1c4bcae3275eeed67 100644 (file)
--- a/src/analyze/analyze-dot.h
+++ b/src/analyze/analyze-dot.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dot(int argc, char *argv[], void *userdata);
+int verb_dot(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-dump.c b/src/analyze/analyze-dump.c
index 549e2cd08ce3a23f9053db5252eeeb9ccb390f6d..24094ce6149dca6f9b601842271aafc7d4369f65 100644 (file)
--- a/src/analyze/analyze-dump.c
+++ b/src/analyze/analyze-dump.c
@@ -29,7 +29,7 @@ static int dump_fallback(sd_bus *bus) {
         return 0;
 }
 
-int dump(int argc, char *argv[], void *userdata) {
+int verb_dump(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;

diff --git a/src/analyze/analyze-dump.h b/src/analyze/analyze-dump.h
index 2fd35c457d994c70f35aed5bb85063e32efaa6e7..5d6107cb589ac12d67eb91c3da9ac9f4b275e759 100644 (file)
--- a/src/analyze/analyze-dump.h
+++ b/src/analyze/analyze-dump.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dump(int argc, char *argv[], void *userdata);
+int verb_dump(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-exit-status.c b/src/analyze/analyze-exit-status.c
index d3d9aded8ea9f613c53bc1fb25839acdd34bfcde..a3f21c60eaf0e30527932abd9fc1f99f0448e975 100644 (file)
--- a/src/analyze/analyze-exit-status.c
+++ b/src/analyze/analyze-exit-status.c
@@ -5,7 +5,7 @@
 #include "exit-status.h"
 #include "format-table.h"
 
-int dump_exit_status(int argc, char *argv[], void *userdata) {
+int verb_exit_status(int argc, char *argv[], void *userdata) {
         _cleanup_(table_unrefp) Table *table = NULL;
         int r;
 

diff --git a/src/analyze/analyze-exit-status.h b/src/analyze/analyze-exit-status.h
index d26db235a1012c9141111595e16a8a33a7d403e5..ce14cdbb96de62c9c9ca50518c58093c9cb80902 100644 (file)
--- a/src/analyze/analyze-exit-status.h
+++ b/src/analyze/analyze-exit-status.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dump_exit_status(int argc, char *argv[], void *userdata);
+int verb_exit_status(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-filesystems.c b/src/analyze/analyze-filesystems.c
index bdb64e78230145cdc4dc23d81f3cd32d22e3461b..28b2fc13391ba4017ca3655e711234a1930a99f8 100644 (file)
--- a/src/analyze/analyze-filesystems.c
+++ b/src/analyze/analyze-filesystems.c
@@ -108,7 +108,7 @@ static void dump_filesystem_set(const FilesystemSet *set) {
         }
 }
 
-int dump_filesystems(int argc, char *argv[], void *userdata) {
+int verb_filesystems(int argc, char *argv[], void *userdata) {
         bool first = true;
 
 #if ! HAVE_LIBBPF

diff --git a/src/analyze/analyze-filesystems.h b/src/analyze/analyze-filesystems.h
index 04606c2ea450cd9ffaf03de22f048a1223648716..09045716d0a1cef4a4c6e99fb29dd3d3632a386c 100644 (file)
--- a/src/analyze/analyze-filesystems.h
+++ b/src/analyze/analyze-filesystems.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dump_filesystems(int argc, char *argv[], void *userdata);
+int verb_filesystems(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-inspect-elf.c b/src/analyze/analyze-inspect-elf.c
index 966c2eff936bcf0fadc80fa34b43ac7ad42be2ab..cf953cd37b129325928ecbf808f3621a21bcc23d 100644 (file)
--- a/src/analyze/analyze-inspect-elf.c
+++ b/src/analyze/analyze-inspect-elf.c
@@ -128,7 +128,7 @@ static int analyze_elf(char **filenames, JsonFormatFlags json_flags) {
         return 0;
 }
 
-int do_elf_inspection(int argc, char *argv[], void *userdata) {
+int verb_elf_inspection(int argc, char *argv[], void *userdata) {
         pager_open(arg_pager_flags);
 
         return analyze_elf(strv_skip(argv, 1), arg_json_format_flags);

diff --git a/src/analyze/analyze-inspect-elf.h b/src/analyze/analyze-inspect-elf.h
index fa8e1b7ee906bf6b72ea1c4c60da67d8a49e9f52..a790eae6bb68e2e9f85970c87d44430f0cc8759d 100644 (file)
--- a/src/analyze/analyze-inspect-elf.h
+++ b/src/analyze/analyze-inspect-elf.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int do_elf_inspection(int argc, char *argv[], void *userdata);
+int verb_elf_inspection(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-plot.c b/src/analyze/analyze-plot.c
index d2acf36273f8ca9c30d0a30771f685549d0de26e..d663a6561cc9ae3168cd27c7b9032d020e318a88 100644 (file)
--- a/src/analyze/analyze-plot.c
+++ b/src/analyze/analyze-plot.c
@@ -178,7 +178,7 @@ static int plot_unit_times(UnitTimes *u, double width, int y) {
         return 1;
 }
 
-int analyze_plot(int argc, char *argv[], void *userdata) {
+int verb_plot(int argc, char *argv[], void *userdata) {
         _cleanup_(free_host_infop) HostInfo *host = NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(unit_times_free_arrayp) UnitTimes *times = NULL;

diff --git a/src/analyze/analyze-plot.h b/src/analyze/analyze-plot.h
index 65414b69d0f20795cbde599dae9d103a516a7bda..eb2e398b3109a160d29a758d99a109aed4da17c4 100644 (file)
--- a/src/analyze/analyze-plot.h
+++ b/src/analyze/analyze-plot.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int analyze_plot(int argc, char *argv[], void *userdata);
+int verb_plot(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index 642c4f5d1c29a47a7867d71e95461765b7fb96be..f1d3ff748053f2625d6d1ec536ce63f109a030aa 100644 (file)
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -2890,7 +2890,7 @@ static int analyze_security(sd_bus *bus,
         return ret;
 }
 
-int do_security(int argc, char *argv[], void *userdata) {
+int verb_security(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_(json_variant_unrefp) JsonVariant *policy = NULL;
         int r;

diff --git a/src/analyze/analyze-security.h b/src/analyze/analyze-security.h
index 84436c7dadc9c27f0873a851a2cda5c8578ba6ec..82f4c7fdeea7f2715ba9b297f122a6b58b71624f 100644 (file)
--- a/src/analyze/analyze-security.h
+++ b/src/analyze/analyze-security.h
@@ -7,4 +7,4 @@ typedef enum AnalyzeSecurityFlags {
         ANALYZE_SECURITY_ONLY_LONG_RUNNING = 1 << 2,
 } AnalyzeSecurityFlags;
 
-int do_security(int argc, char *argv[], void *userdata);
+int verb_security(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-service-watchdogs.c b/src/analyze/analyze-service-watchdogs.c
index 7b804bd90b10a7170f4713c9b21475c81c620460..96aed32b55f6bd2eb152ae49d8f13223232bb1c1 100644 (file)
--- a/src/analyze/analyze-service-watchdogs.c
+++ b/src/analyze/analyze-service-watchdogs.c
@@ -6,7 +6,7 @@
 #include "bus-locator.h"
 #include "parse-util.h"
 
-int service_watchdogs(int argc, char *argv[], void *userdata) {
+int verb_service_watchdogs(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int b, r;

diff --git a/src/analyze/analyze-service-watchdogs.h b/src/analyze/analyze-service-watchdogs.h
index 11a53dbbf1908a1469b42009f1260034e938b326..2f59f5a3f437627108f29b3e34b77ef3252e08eb 100644 (file)
--- a/src/analyze/analyze-service-watchdogs.h
+++ b/src/analyze/analyze-service-watchdogs.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int service_watchdogs(int argc, char *argv[], void *userdata);
+int verb_service_watchdogs(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-syscall-filter.c b/src/analyze/analyze-syscall-filter.c
index eea7a9880efdb7c8b7f180bc47ee7a3fc3c0a46d..efe82c1a34c331bb86b8c97d593eafae1f938624 100644 (file)
--- a/src/analyze/analyze-syscall-filter.c
+++ b/src/analyze/analyze-syscall-filter.c
@@ -86,7 +86,7 @@ static void dump_syscall_filter(const SyscallFilterSet *set) {
                 printf("    %s%s%s\n", syscall[0] == '@' ? ansi_underline() : "", syscall, ansi_normal());
 }
 
-int dump_syscall_filters(int argc, char *argv[], void *userdata) {
+int verb_syscall_filters(int argc, char *argv[], void *userdata) {
         bool first = true;
 
         pager_open(arg_pager_flags);

diff --git a/src/analyze/analyze-syscall-filter.h b/src/analyze/analyze-syscall-filter.h
index 37048755721f26effa5a12f71cdce0ce85b5b3ce..3a1af85a69456f3405fe10871c50cd59bc0ad61a 100644 (file)
--- a/src/analyze/analyze-syscall-filter.h
+++ b/src/analyze/analyze-syscall-filter.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dump_syscall_filters(int argc, char *argv[], void *userdata);
+int verb_syscall_filters(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-time.c b/src/analyze/analyze-time.c
index cbf000db427bc5de33f51f3b818312ad209ef94b..e5744a218ef2cb21b556bec3f214f4c43ab8ad25 100644 (file)
--- a/src/analyze/analyze-time.c
+++ b/src/analyze/analyze-time.c
@@ -4,7 +4,7 @@
 #include "analyze-time.h"
 #include "analyze-time-data.h"
 
-int analyze_time(int argc, char *argv[], void *userdata) {
+int verb_time(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         _cleanup_free_ char *buf = NULL;
         int r;

diff --git a/src/analyze/analyze-time.h b/src/analyze/analyze-time.h
index 4bc4f1426b3d38ff239cad4b656cd35b98240148..a8f8575c3b6f7b5ec8d3755b5b315a87a9be97a6 100644 (file)
--- a/src/analyze/analyze-time.h
+++ b/src/analyze/analyze-time.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int analyze_time(int argc, char *argv[], void *userdata);
+int verb_time(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-timespan.c b/src/analyze/analyze-timespan.c
index 8a0fbe534c799a70948481f00f6ef0e0f26f62c7..8d7cd2ddd5924632952c023cc5f6d13c90cb045e 100644 (file)
--- a/src/analyze/analyze-timespan.c
+++ b/src/analyze/analyze-timespan.c
@@ -8,7 +8,7 @@
 #include "strv.h"
 #include "terminal-util.h"
 
-int dump_timespan(int argc, char *argv[], void *userdata) {
+int verb_timespan(int argc, char *argv[], void *userdata) {
         char **input_timespan;
 
         STRV_FOREACH(input_timespan, strv_skip(argv, 1)) {

diff --git a/src/analyze/analyze-timespan.h b/src/analyze/analyze-timespan.h
index 32ad1923f159d8dbf64d761b2f4ce07ec8c693dd..46d22956008199cc07b8b7e4bde4c6be6676f0ad 100644 (file)
--- a/src/analyze/analyze-timespan.h
+++ b/src/analyze/analyze-timespan.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dump_timespan(int argc, char *argv[], void *userdata);
+int verb_timespan(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-timestamp.c b/src/analyze/analyze-timestamp.c
index 2600acaf827c4c05fa552d3bf53176c52f268a14..91282073389903ee1c33e89a52951e0ced69eb35 100644 (file)
--- a/src/analyze/analyze-timestamp.c
+++ b/src/analyze/analyze-timestamp.c
@@ -78,7 +78,7 @@ static int test_timestamp_one(const char *p) {
         return table_print(table, NULL);
 }
 
-int test_timestamp(int argc, char *argv[], void *userdata) {
+int verb_timestamp(int argc, char *argv[], void *userdata) {
         int ret = 0, r;
         char **p;
 

diff --git a/src/analyze/analyze-timestamp.h b/src/analyze/analyze-timestamp.h
index 583d0c7e65e6be57440bbdccf82a282ae226c005..43e4b57d2a330407471624d460d9d649ffb8c60d 100644 (file)
--- a/src/analyze/analyze-timestamp.h
+++ b/src/analyze/analyze-timestamp.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int test_timestamp(int argc, char *argv[], void *userdata);
+int verb_timestamp(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-unit-files.c b/src/analyze/analyze-unit-files.c
index bfb3edf839255dc657d6c69265135170d5ec11a3..81714914e32c1c5c67de207eb050544e5b6ec999 100644 (file)
--- a/src/analyze/analyze-unit-files.c
+++ b/src/analyze/analyze-unit-files.c
@@ -15,7 +15,7 @@ static bool strv_fnmatch_strv_or_empty(char* const* patterns, char **strv, int f
         return false;
 }
 
-int do_unit_files(int argc, char *argv[], void *userdata) {
+int verb_unit_files(int argc, char *argv[], void *userdata) {
         _cleanup_hashmap_free_ Hashmap *unit_ids = NULL, *unit_names = NULL;
         _cleanup_(lookup_paths_free) LookupPaths lp = {};
         char **patterns = strv_skip(argv, 1);

diff --git a/src/analyze/analyze-unit-files.h b/src/analyze/analyze-unit-files.h
index 33bccc1c27ad07f49190fd65de6b2f69b0e2bd4a..c193fd82746a6e9c9ebec37fc6b74a30aa504af0 100644 (file)
--- a/src/analyze/analyze-unit-files.h
+++ b/src/analyze/analyze-unit-files.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int do_unit_files(int argc, char *argv[], void *userdata);
+int verb_unit_files(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-unit-paths.c b/src/analyze/analyze-unit-paths.c
index f18a10ef34d911b386d9537e358e85d77f84d61d..e2e8c66b7e2625af54b38d4ed88168b69760514d 100644 (file)
--- a/src/analyze/analyze-unit-paths.c
+++ b/src/analyze/analyze-unit-paths.c
@@ -5,7 +5,7 @@
 #include "path-lookup.h"
 #include "strv.h"
 
-int dump_unit_paths(int argc, char *argv[], void *userdata) {
+int verb_unit_paths(int argc, char *argv[], void *userdata) {
         _cleanup_(lookup_paths_free) LookupPaths paths = {};
         int r;
         char **p;

diff --git a/src/analyze/analyze-unit-paths.h b/src/analyze/analyze-unit-paths.h
index c3c5156e48a780e9c14ac6a9c009f253b4feca8d..b8d46e87d00a7915a8db6410f66181a4a5598d70 100644 (file)
--- a/src/analyze/analyze-unit-paths.h
+++ b/src/analyze/analyze-unit-paths.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int dump_unit_paths(int argc, char *argv[], void *userdata);
+int verb_unit_paths(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index 05fd8a6336f3024f74788ee9152f33a8d4c8f15e..d97b6ed9c821d562298d7f62eddfac1cb320796d 100644 (file)
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -54,7 +54,7 @@ static int process_aliases(char *argv[], char *tempdir, char ***ret) {
         return 0;
 }
 
-int do_verify(int argc, char *argv[], void *userdata) {
+int verb_verify(int argc, char *argv[], void *userdata) {
         _cleanup_strv_free_ char **filenames = NULL;
         _cleanup_(rm_rf_physical_and_freep) char *tempdir = NULL;
         int r;

diff --git a/src/analyze/analyze-verify.h b/src/analyze/analyze-verify.h
index 1193a0e38c3f0fe2994ba86357d985ccd7079115..4892c9aa4f532b171493a5fa9b9034fdc52cd4ca 100644 (file)
--- a/src/analyze/analyze-verify.h
+++ b/src/analyze/analyze-verify.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-int do_verify(int argc, char *argv[], void *userdata);
+int verb_verify(int argc, char *argv[], void *userdata);

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 1cb981feb681028947d19200bb32d40a6beb7469..5c64bf6b4c03c9ad3724187eaf3bc8bbeee7b0c7 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -541,11 +541,11 @@ static int run(int argc, char *argv[]) {
 
         static const Verb verbs[] = {
                 { "help",              VERB_ANY, VERB_ANY, 0,            help                   },
-                { "time",              VERB_ANY, 1,        VERB_DEFAULT, analyze_time           },
-                { "blame",             VERB_ANY, 1,        0,            analyze_blame          },
-                { "critical-chain",    VERB_ANY, VERB_ANY, 0,            analyze_critical_chain },
-                { "plot",              VERB_ANY, 1,        0,            analyze_plot           },
-                { "dot",               VERB_ANY, VERB_ANY, 0,            dot                    },
+                { "time",              VERB_ANY, 1,        VERB_DEFAULT, verb_time              },
+                { "blame",             VERB_ANY, 1,        0,            verb_blame             },
+                { "critical-chain",    VERB_ANY, VERB_ANY, 0,            verb_critical_chain    },
+                { "plot",              VERB_ANY, 1,        0,            verb_plot              },
+                { "dot",               VERB_ANY, VERB_ANY, 0,            verb_dot               },
                 /* ↓ The following seven verbs are deprecated, from here … ↓ */
                 { "log-level",         VERB_ANY, 2,        0,            verb_log_control       },
                 { "log-target",        VERB_ANY, 2,        0,            verb_log_control       },
@@ -553,23 +553,23 @@ static int run(int argc, char *argv[]) {
                 { "get-log-level",     VERB_ANY, 1,        0,            verb_log_control       },
                 { "set-log-target",    2,        2,        0,            verb_log_control       },
                 { "get-log-target",    VERB_ANY, 1,        0,            verb_log_control       },
-                { "service-watchdogs", VERB_ANY, 2,        0,            service_watchdogs      },
+                { "service-watchdogs", VERB_ANY, 2,        0,            verb_service_watchdogs },
                 /* ↑ … until here ↑ */
-                { "dump",              VERB_ANY, 1,        0,            dump                   },
-                { "cat-config",        2,        VERB_ANY, 0,            cat_config             },
-                { "unit-files",        VERB_ANY, VERB_ANY, 0,            do_unit_files          },
-                { "unit-paths",        1,        1,        0,            dump_unit_paths        },
-                { "exit-status",       VERB_ANY, VERB_ANY, 0,            dump_exit_status       },
-                { "syscall-filter",    VERB_ANY, VERB_ANY, 0,            dump_syscall_filters   },
-                { "capability",        VERB_ANY, VERB_ANY, 0,            dump_capabilities      },
-                { "filesystems",       VERB_ANY, VERB_ANY, 0,            dump_filesystems       },
-                { "condition",         VERB_ANY, VERB_ANY, 0,            do_condition           },
-                { "verify",            2,        VERB_ANY, 0,            do_verify              },
-                { "calendar",          2,        VERB_ANY, 0,            test_calendar          },
-                { "timestamp",         2,        VERB_ANY, 0,            test_timestamp         },
-                { "timespan",          2,        VERB_ANY, 0,            dump_timespan          },
-                { "security",          VERB_ANY, VERB_ANY, 0,            do_security            },
-                { "inspect-elf",       2,        VERB_ANY, 0,            do_elf_inspection      },
+                { "dump",              VERB_ANY, 1,        0,            verb_dump              },
+                { "cat-config",        2,        VERB_ANY, 0,            verb_cat_config        },
+                { "unit-files",        VERB_ANY, VERB_ANY, 0,            verb_unit_files        },
+                { "unit-paths",        1,        1,        0,            verb_unit_paths        },
+                { "exit-status",       VERB_ANY, VERB_ANY, 0,            verb_exit_status       },
+                { "syscall-filter",    VERB_ANY, VERB_ANY, 0,            verb_syscall_filters   },
+                { "capability",        VERB_ANY, VERB_ANY, 0,            verb_capabilities      },
+                { "filesystems",       VERB_ANY, VERB_ANY, 0,            verb_filesystems       },
+                { "condition",         VERB_ANY, VERB_ANY, 0,            verb_condition         },
+                { "verify",            2,        VERB_ANY, 0,            verb_verify            },
+                { "calendar",          2,        VERB_ANY, 0,            verb_calendar          },
+                { "timestamp",         2,        VERB_ANY, 0,            verb_timestamp         },
+                { "timespan",          2,        VERB_ANY, 0,            verb_timespan          },
+                { "security",          VERB_ANY, VERB_ANY, 0,            verb_security          },
+                { "inspect-elf",       2,        VERB_ANY, 0,            verb_elf_inspection    },
                 {}
         };