unit: no need to export variables if we can avoid it

diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index 06bbfacb0081d06c83441f92ab9a3f83a07f29b0..a809713595f69b10849f97c9a0e7637c9f77ac59 100644 (file)
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -33,7 +33,7 @@
         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"            \
         ":-_.\\"
 
         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"            \
         ":-_.\\"
 

-const char* const unit_type_table[_UNIT_TYPE_MAX] = {
+static const char* const unit_type_table[_UNIT_TYPE_MAX] = {

         [UNIT_SERVICE] = "service",
         [UNIT_SOCKET] = "socket",
         [UNIT_TARGET] = "target",
         [UNIT_SERVICE] = "service",
         [UNIT_SOCKET] = "socket",
         [UNIT_TARGET] = "target",


@@ -48,7 +48,7 @@ const char* const unit_type_table[_UNIT_TYPE_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType);
 
 
 DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType);
 

-const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
+static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {

         [UNIT_STUB] = "stub",
         [UNIT_LOADED] = "loaded",
         [UNIT_ERROR] = "error",
         [UNIT_STUB] = "stub",
         [UNIT_LOADED] = "loaded",
         [UNIT_ERROR] = "error",

diff --git a/src/shared/unit-name.h b/src/shared/unit-name.h
index 9150dd0b3f75de5bd89bbb9a3f29196108546945..c28d55d3e84360c9d70ebd831880e6b9514f2ac1 100644 (file)
--- a/src/shared/unit-name.h
+++ b/src/shared/unit-name.h
@@ -53,11 +53,9 @@ enum UnitLoadState {
         _UNIT_LOAD_STATE_INVALID = -1
 };
 
         _UNIT_LOAD_STATE_INVALID = -1
 };
 

-extern const char* const unit_type_table[];

 const char *unit_type_to_string(UnitType i);
 UnitType unit_type_from_string(const char *s);
 
 const char *unit_type_to_string(UnitType i);
 UnitType unit_type_from_string(const char *s);
 

-extern const char* const unit_load_state_table[];

 const char *unit_load_state_to_string(UnitLoadState i);
 UnitLoadState unit_load_state_from_string(const char *s);
 
 const char *unit_load_state_to_string(UnitLoadState i);
 UnitLoadState unit_load_state_from_string(const char *s);
 

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index f7ae47e7c7a2220e2d536a9d0af9489236577207..1191c7a1e1b0d7889cea19a64f34a0cf7293f9fd 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4243,16 +4243,21 @@ static int runlevel_help(void) {
 
 static int help_types(void) {
         int i;
 
 static int help_types(void) {
         int i;

+        const char *t;

 
         puts("Available unit types:");
 
         puts("Available unit types:");

-        for(i = UNIT_SERVICE; i < _UNIT_TYPE_MAX; i++)
-                if (unit_type_table[i])
-                        puts(unit_type_table[i]);
+        for(i = 0; i < _UNIT_TYPE_MAX; i++) {
+                t = unit_type_to_string(i);
+                if (t)
+                        puts(t);
+        }

 
         puts("\nAvailable unit load states: ");
 
         puts("\nAvailable unit load states: ");

-        for(i = UNIT_STUB; i < _UNIT_LOAD_STATE_MAX; i++)
-                if (unit_type_table[i])
-                        puts(unit_load_state_table[i]);
+        for(i = 0; i < _UNIT_LOAD_STATE_MAX; i++) {
+                t = unit_load_state_to_string(i);
+                if (t)
+                        puts(t);
+        }

 
         return 0;
 }
 
         return 0;
 }