virt: make Virtualization an anonymous enum

This makes llvm happy when we assign an error code to the variable.

diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index 2f8b0ebbbccca01307a2e43719496f69d7f4d7ab..8cf8dcfabc08b6262fc111deb2b5af71457e8d41 100644 (file)
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -129,7 +129,7 @@ int main(int argc, char *argv[]) {
         switch (arg_mode) {
 
         case ANY_VIRTUALIZATION: {
-                Virtualization v;
+                int v;
 
                 v = detect_virtualization(&id);
                 if (v < 0) {

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index e57891bf0d932b365731a623655c7c1f9f59c389..0f2455b69cf3042d17ef129a12788c5fbaf4e39e 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -123,7 +123,7 @@ static const char* fallback_chassis(void) {
         int r;
         char *type;
         unsigned t;
-        Virtualization v;
+        int v;
 
         v = detect_virtualization(NULL);
 

diff --git a/src/shared/condition-util.c b/src/shared/condition-util.c
index 4aea3caf9d59422c35fe914a75bc578c12c15f8a..9961cb47f05a89ecb73866868ec1f6e79b329c9e 100644 (file)
--- a/src/shared/condition-util.c
+++ b/src/shared/condition-util.c
@@ -121,8 +121,7 @@ bool condition_test_kernel_command_line(Condition *c) {
 }
 
 bool condition_test_virtualization(Condition *c) {
-        int b;
-        Virtualization v;
+        int b, v;
         const char *id;
 
         assert(c);

diff --git a/src/shared/virt.c b/src/shared/virt.c
index c79d35db4dd258d17db20b2a66c02a3c9a258411..ec2ddcfe6722fac6f6335bccfc8bf478a8bb3968 100644 (file)
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -278,7 +278,7 @@ finish:
 }
 
 /* Returns a short identifier for the various VM/container implementations */
-Virtualization detect_virtualization(const char **id) {
+int detect_virtualization(const char **id) {
         int r;
 
         r = detect_container(id);

diff --git a/src/shared/virt.h b/src/shared/virt.h
index aa6ad35ba9db58d6c094ec1adf6a862a8e28f97b..7194ab2bf781ac1e946c3987b22e482afb74caa8 100644 (file)
--- a/src/shared/virt.h
+++ b/src/shared/virt.h
@@ -24,12 +24,12 @@
 int detect_vm(const char **id);
 int detect_container(const char **id);
 
-typedef enum Virtualization {
+enum {
         VIRTUALIZATION_NONE = 0,
         VIRTUALIZATION_VM,
         VIRTUALIZATION_CONTAINER,
         _VIRTUALIZATION_MAX,
         _VIRTUALIZATION_INVALID = -1
-} Virtualization;
+};
 
-Virtualization detect_virtualization(const char **id);
+int detect_virtualization(const char **id);

diff --git a/src/test/test-architecture.c b/src/test/test-architecture.c
index b586c0da5dc0ea261476dede69048b802aa2575e..7e171c7bbc3d8ab75e1f704da2bf3b8038b4a98f 100644 (file)
--- a/src/test/test-architecture.c
+++ b/src/test/test-architecture.c
@@ -26,7 +26,7 @@
 
 int main(int argc, char *argv[]) {
         Architecture a;
-        Virtualization v;
+        int v;
         const char *id = NULL;
 
         v = detect_virtualization(&id);