diff options
| author | Daniel Mack <zonque@gmail.com> | 2014-03-07 21:38:48 +0100 |
|---|---|---|
| committer | Daniel Mack <zonque@gmail.com> | 2014-03-07 21:38:48 +0100 |
| commit | 2c5859afecee81e345fc9526b1083bf79990ffb8 (patch) | |
| tree | 8bc8deeea888c3df4a28a5f94f3ab79da3fe6b30 /src/core | |
| parent | fe8d029277f8077d4537489b358ce7f10d59ecc2 (diff) | |
Make tables for DEFINE_STRING_TABLE_LOOKUP consistent
Bring some arrays that are used for DEFINE_STRING_TABLE_LOOKUP() in the
same order than the enums they reference.
Also, pass the corresponding _MAX value to the array initalizer where
appropriate.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/job.c | 2 | ||||
| -rw-r--r-- | src/core/path.c | 4 | ||||
| -rw-r--r-- | src/core/unit.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/job.c b/src/core/job.c index 9c099c686f..8e98bd93ab 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -1150,9 +1150,9 @@ static const char* const job_mode_table[_JOB_MODE_MAX] = { [JOB_REPLACE] = "replace", [JOB_REPLACE_IRREVERSIBLY] = "replace-irreversibly", [JOB_ISOLATE] = "isolate", + [JOB_FLUSH] = "flush", [JOB_IGNORE_DEPENDENCIES] = "ignore-dependencies", [JOB_IGNORE_REQUIREMENTS] = "ignore-requirements", - [JOB_FLUSH] = "flush", }; DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode); diff --git a/src/core/path.c b/src/core/path.c index 1d6c6cc6cb..93c51bb3be 100644 --- a/src/core/path.c +++ b/src/core/path.c @@ -761,16 +761,16 @@ DEFINE_STRING_TABLE_LOOKUP(path_state, PathState); static const char* const path_type_table[_PATH_TYPE_MAX] = { [PATH_EXISTS] = "PathExists", [PATH_EXISTS_GLOB] = "PathExistsGlob", + [PATH_DIRECTORY_NOT_EMPTY] = "DirectoryNotEmpty", [PATH_CHANGED] = "PathChanged", [PATH_MODIFIED] = "PathModified", - [PATH_DIRECTORY_NOT_EMPTY] = "DirectoryNotEmpty" }; DEFINE_STRING_TABLE_LOOKUP(path_type, PathType); static const char* const path_result_table[_PATH_RESULT_MAX] = { [PATH_SUCCESS] = "success", - [PATH_FAILURE_RESOURCES] = "resources" + [PATH_FAILURE_RESOURCES] = "resources", }; DEFINE_STRING_TABLE_LOOKUP(path_result, PathResult); diff --git a/src/core/unit.c b/src/core/unit.c index 85250ca2aa..aa723cb8c5 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3278,9 +3278,9 @@ static const char* const unit_dependency_table[_UNIT_DEPENDENCY_MAX] = { [UNIT_TRIGGERED_BY] = "TriggeredBy", [UNIT_PROPAGATES_RELOAD_TO] = "PropagatesReloadTo", [UNIT_RELOAD_PROPAGATED_FROM] = "ReloadPropagatedFrom", + [UNIT_JOINS_NAMESPACE_OF] = "JoinsNamespaceOf", [UNIT_REFERENCES] = "References", [UNIT_REFERENCED_BY] = "ReferencedBy", - [UNIT_JOINS_NAMESPACE_OF] = "JoinsNamespaceOf", }; DEFINE_STRING_TABLE_LOOKUP(unit_dependency, UnitDependency); |