From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Sep 2017 14:58:43 +0000 (+0200)
Subject: core: usually our enum's _INVALID and _MAX special values are named after the full... 
X-Git-Tag: v235~36^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72fd17682d799f9192fb77d3f17bfe19a8f1266d;p=thirdparty%2Fsystemd.git

core: usually our enum's _INVALID and _MAX special values are named after the full type

In most cases we followed the rule that the special _INVALID and _MAX
values we use in our enums use the full type name as prefix (in contrast
to regular values that we often make shorter), do so for
ExecDirectoryType as well.

No functional changes, just a little bit of renaming to make this code
more like the rest.
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index a8cdae5bf2f..40f6d9a3ffa 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -2193,7 +2193,7 @@ int bus_exec_context_set_transient_property(
                         if (streq(name, "UMask"))
                                 c->umask = m;
                         else
-                                for (i = 0; i < _EXEC_DIRECTORY_MAX; i++)
+                                for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++)
                                         if (startswith(name, exec_directory_type_to_string(i))) {
                                                 c->directories[i].mode = m;
                                                 break;
@@ -2222,7 +2222,7 @@ int bus_exec_context_set_transient_property(
                         char ***dirs = NULL;
                         ExecDirectoryType i;
 
-                        for (i = 0; i < _EXEC_DIRECTORY_MAX; i++)
+                        for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++)
                                 if (streq(name, exec_directory_type_to_string(i))) {
                                         dirs = &c->directories[i].paths;
                                         break;
diff --git a/src/core/execute.c b/src/core/execute.c
index ce0ae7d9b55..e7dfbfd0108 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1898,7 +1898,7 @@ static int setup_exec_directory(
                 ExecDirectoryType type,
                 int *exit_status) {
 
-        static const int exit_status_table[_EXEC_DIRECTORY_MAX] = {
+        static const int exit_status_table[_EXEC_DIRECTORY_TYPE_MAX] = {
                 [EXEC_DIRECTORY_RUNTIME] = EXIT_RUNTIME_DIRECTORY,
                 [EXEC_DIRECTORY_STATE] = EXIT_STATE_DIRECTORY,
                 [EXEC_DIRECTORY_CACHE] = EXIT_CACHE_DIRECTORY,
@@ -1910,7 +1910,7 @@ static int setup_exec_directory(
 
         assert(context);
         assert(params);
-        assert(type >= 0 && type < _EXEC_DIRECTORY_MAX);
+        assert(type >= 0 && type < _EXEC_DIRECTORY_TYPE_MAX);
         assert(exit_status);
 
         if (!params->prefix[type])
@@ -2008,11 +2008,11 @@ static int compile_read_write_paths(
          * the explicitly configured paths, plus all runtime directories. */
 
         if (strv_isempty(context->read_write_paths)) {
-                for (i = 0; i < _EXEC_DIRECTORY_MAX; i++)
+                for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++)
                         if (!strv_isempty(context->directories[i].paths))
                                 break;
 
-                if (i == _EXEC_DIRECTORY_MAX) {
+                if (i == _EXEC_DIRECTORY_TYPE_MAX) {
                         *ret = NULL; /* NOP if neither is set */
                         return 0;
                 }
@@ -2022,7 +2022,7 @@ static int compile_read_write_paths(
         if (!l)
                 return -ENOMEM;
 
-        for (i = 0; i < _EXEC_DIRECTORY_MAX; i++) {
+        for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++) {
                 if (!params->prefix[i])
                         continue;
 
@@ -2707,7 +2707,7 @@ static int exec_child(
                 }
         }
 
-        for (dt = 0; dt < _EXEC_DIRECTORY_MAX; dt++) {
+        for (dt = 0; dt < _EXEC_DIRECTORY_TYPE_MAX; dt++) {
                 r = setup_exec_directory(context, params, uid, gid, dt, exit_status);
                 if (r < 0)
                         return log_unit_error_errno(unit, r, "Failed to set up special execution directory in %s: %m", params->prefix[dt]);
@@ -3247,7 +3247,7 @@ void exec_context_init(ExecContext *c) {
         c->ignore_sigpipe = true;
         c->timer_slack_nsec = NSEC_INFINITY;
         c->personality = PERSONALITY_INVALID;
-        for (i = 0; i < _EXEC_DIRECTORY_MAX; i++)
+        for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++)
                 c->directories[i].mode = 0755;
         c->capability_bounding_set = CAP_ALL;
         c->restrict_namespaces = NAMESPACE_FLAGS_ALL;
@@ -3300,7 +3300,7 @@ void exec_context_done(ExecContext *c) {
         c->syscall_archs = set_free(c->syscall_archs);
         c->address_families = set_free(c->address_families);
 
-        for (i = 0; i < _EXEC_DIRECTORY_MAX; i++)
+        for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++)
                 c->directories[i].paths = strv_free(c->directories[i].paths);
 }
 
@@ -3630,7 +3630,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
 
         fprintf(f, "%sRuntimeDirectoryPreserve: %s\n", prefix, exec_preserve_mode_to_string(c->runtime_directory_preserve_mode));
 
-        for (dt = 0; dt < _EXEC_DIRECTORY_MAX; dt++) {
+        for (dt = 0; dt < _EXEC_DIRECTORY_TYPE_MAX; dt++) {
                 fprintf(f, "%s%sMode: %04o\n", prefix, exec_directory_type_to_string(dt), c->directories[dt].mode);
 
                 STRV_FOREACH(d, c->directories[dt].paths)
@@ -4382,7 +4382,7 @@ static const char* const exec_preserve_mode_table[_EXEC_PRESERVE_MODE_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(exec_preserve_mode, ExecPreserveMode, EXEC_PRESERVE_YES);
 
-static const char* const exec_directory_type_table[_EXEC_DIRECTORY_MAX] = {
+static const char* const exec_directory_type_table[_EXEC_DIRECTORY_TYPE_MAX] = {
         [EXEC_DIRECTORY_RUNTIME] = "RuntimeDirectory",
         [EXEC_DIRECTORY_STATE] = "StateDirectory",
         [EXEC_DIRECTORY_CACHE] = "CacheDirectory",
diff --git a/src/core/execute.h b/src/core/execute.h
index 133eca5846b..4d41990b362 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -128,8 +128,8 @@ typedef enum ExecDirectoryType {
         EXEC_DIRECTORY_CACHE,
         EXEC_DIRECTORY_LOGS,
         EXEC_DIRECTORY_CONFIGURATION,
-        _EXEC_DIRECTORY_MAX,
-        _EXEC_DIRECTORY_INVALID = -1,
+        _EXEC_DIRECTORY_TYPE_MAX,
+        _EXEC_DIRECTORY_TYPE_INVALID = -1,
 } ExecDirectoryType;
 
 typedef struct ExecDirectory {
@@ -251,7 +251,7 @@ struct ExecContext {
         bool address_families_whitelist:1;
 
         ExecPreserveMode runtime_directory_preserve_mode;
-        ExecDirectory directories[_EXEC_DIRECTORY_MAX];
+        ExecDirectory directories[_EXEC_DIRECTORY_TYPE_MAX];
 
         bool memory_deny_write_execute;
         bool restrict_realtime;
diff --git a/src/core/manager.c b/src/core/manager.c
index da673c7ae25..d167a86db0d 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -564,7 +564,7 @@ static int manager_setup_prefix(Manager *m) {
                 const char *suffix;
         };
 
-        static const struct table_entry paths_system[_EXEC_DIRECTORY_MAX] = {
+        static const struct table_entry paths_system[_EXEC_DIRECTORY_TYPE_MAX] = {
                 [EXEC_DIRECTORY_RUNTIME] = { SD_PATH_SYSTEM_RUNTIME, NULL },
                 [EXEC_DIRECTORY_STATE] = { SD_PATH_SYSTEM_STATE_PRIVATE, NULL },
                 [EXEC_DIRECTORY_CACHE] = { SD_PATH_SYSTEM_STATE_CACHE, NULL },
@@ -572,7 +572,7 @@ static int manager_setup_prefix(Manager *m) {
                 [EXEC_DIRECTORY_CONFIGURATION] = { SD_PATH_SYSTEM_CONFIGURATION, NULL },
         };
 
-        static const struct table_entry paths_user[_EXEC_DIRECTORY_MAX] = {
+        static const struct table_entry paths_user[_EXEC_DIRECTORY_TYPE_MAX] = {
                 [EXEC_DIRECTORY_RUNTIME] = { SD_PATH_USER_RUNTIME, NULL },
                 [EXEC_DIRECTORY_STATE] = { SD_PATH_USER_CONFIGURATION, NULL },
                 [EXEC_DIRECTORY_CACHE] = { SD_PATH_SYSTEM_STATE_CACHE, NULL },
@@ -591,7 +591,7 @@ static int manager_setup_prefix(Manager *m) {
         else
                 p = paths_user;
 
-        for (i = 0; i < _EXEC_DIRECTORY_MAX; i++) {
+        for (i = 0; i < _EXEC_DIRECTORY_TYPE_MAX; i++) {
                 r = sd_path_home(p[i].type, p[i].suffix, &m->prefix[i]);
                 if (r < 0)
                         return r;
@@ -1191,7 +1191,7 @@ Manager* manager_free(Manager *m) {
         hashmap_free(m->uid_refs);
         hashmap_free(m->gid_refs);
 
-        for (dt = 0; dt < _EXEC_DIRECTORY_MAX; dt++)
+        for (dt = 0; dt < _EXEC_DIRECTORY_TYPE_MAX; dt++)
                 m->prefix[dt] = mfree(m->prefix[dt]);
 
         return mfree(m);
diff --git a/src/core/manager.h b/src/core/manager.h
index c909916a1ef..ff73fb3e85d 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -335,7 +335,7 @@ struct Manager {
         int first_boot; /* tri-state */
 
         /* prefixes of e.g. RuntimeDirectory= */
-        char *prefix[_EXEC_DIRECTORY_MAX];
+        char *prefix[_EXEC_DIRECTORY_TYPE_MAX];
 };
 
 #define MANAGER_IS_SYSTEM(m) ((m)->unit_file_scope == UNIT_FILE_SYSTEM)
diff --git a/src/core/unit.c b/src/core/unit.c
index 90112a8b154..2b7c7738fe7 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -893,7 +893,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
                         return r;
         }
 
-        for (dt = 0; dt < _EXEC_DIRECTORY_MAX; dt++) {
+        for (dt = 0; dt < _EXEC_DIRECTORY_TYPE_MAX; dt++) {
                 if (!u->manager->prefix[dt])
                         continue;