systemd: ignore hw timestamps in containers

[elogind.git] / src / shared / virt.c

diff --git a/src/shared/virt.c b/src/shared/virt.c
index 78016eec8927d3e3245141e9f11144dfd8566401..7b18e58c166f9d4cf21cda8d35f2da8a337e60a8 100644 (file)
--- a/src/shared/virt.c
+++ b/src/shared/virt.c
@@ -62,7 +62,7 @@ int detect_vm(const char **id) {
         union {
                 uint32_t sig32[3];
                 char text[13];
-        } sig;
+        } sig = {};
         unsigned i;
         const char *j, *k;
         bool hypervisor;
@@ -84,7 +84,6 @@ int detect_vm(const char **id) {
                 return r;
 
         /* http://lwn.net/Articles/301888/ */
-        zero(sig);
 
 #if defined (__i386__)
 #define REG_a "eax"
@@ -169,7 +168,7 @@ int detect_vm(const char **id) {
 }
 
 int detect_container(const char **id) {
-        char *e = NULL;
+        char _cleanup_free_ *e = NULL;
         int r;
 
         /* Unfortunately many of these operations require root access
@@ -217,8 +216,6 @@ int detect_container(const char **id) {
                         *id = "other";
         }
 
-        free(e);
-
         return r;
 }