verbs: Rename VERB_OFFLINE to VERB_ONLINE_ONLY, expand MUSTBEROOT

Followup to previous commit. Suggested by @poettering.
Reindented the `verbs[]` tables to match the apparent previous
whitespace rules (indent to one flag, allow multiple flags to overflow?).

diff --git a/src/basic/verbs.c b/src/basic/verbs.c
index 97bb59f5e7f347695e67ee550be5d42f95a36f5a..ce1d304d9f63556162ac2742bb18e676e529b85b 100644 (file)
--- a/src/basic/verbs.c
+++ b/src/basic/verbs.c
@@ -126,7 +126,7 @@ int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) {
                 return -EINVAL;
         }
 
-        if ((verb->flags & VERB_NOCHROOT) && running_in_chroot_or_offline()) {
+        if ((verb->flags & VERB_ONLINE_ONLY) && running_in_chroot_or_offline()) {
                 if (name)
                         log_info("Running in chroot, ignoring request: %s", name);
                 else
@@ -134,7 +134,7 @@ int dispatch_verb(int argc, char *argv[], const Verb verbs[], void *userdata) {
                 return 0;
         }
 
-        if (verb->flags & VERB_MUSTBEROOT) {
+        if (verb->flags & VERB_MUST_BE_ROOT) {
                 r = must_be_root();
                 if (r < 0)
                         return r;

diff --git a/src/basic/verbs.h b/src/basic/verbs.h
index a35a3a9fc00909db7f53ca9d2093d964049aee17..d9259fc45fbb5bee0d06b2a96984f99cc2cdca64 100644 (file)
--- a/src/basic/verbs.h
+++ b/src/basic/verbs.h
@@ -23,9 +23,9 @@
 #define VERB_ANY ((unsigned) -1)
 
 typedef enum VerbFlags {
-        VERB_DEFAULT    = 1 << 0,
-        VERB_NOCHROOT   = 1 << 1,
-        VERB_MUSTBEROOT = 1 << 2,
+        VERB_DEFAULT      = 1 << 0,
+        VERB_ONLINE_ONLY  = 1 << 1,
+        VERB_MUST_BE_ROOT = 1 << 2,
 } VerbFlags;
 
 typedef struct {