From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 16 Jan 2013 10:51:21 +0000 (+0100)
Subject: lock_daemon: Simplify error handling
X-Git-Tag: v1.0.2-rc1~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e620e66698a2b5281c56ee20b4c42f5f4f27fe8;p=thirdparty%2Flibvirt.git

lock_daemon: Simplify error handling

No need to check the run_dir variable twice for NULL.
---

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index f0eba48425..97e5d749c2 100644
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -1311,19 +1311,16 @@ int main(int argc, char **argv) {
 
     /* Ensure the rundir exists (on tmpfs on some systems) */
     if (privileged) {
-        run_dir = strdup(LOCALSTATEDIR "/run/libvirt");
+        if (!(run_dir = strdup(LOCALSTATEDIR "/run/libvirt"))) {
+            virReportOOMError();
+            goto cleanup;
+        }
     } else {
-        run_dir = virGetUserRuntimeDirectory();
-
-        if (!run_dir) {
+        if (!(run_dir = virGetUserRuntimeDirectory())) {
             VIR_ERROR(_("Can't determine user directory"));
             goto cleanup;
         }
     }
-    if (!run_dir) {
-        virReportOOMError();
-        goto cleanup;
-    }
 
     if (privileged)
         old_umask = umask(022);