lock_daemon: Simplify error handling

No need to check the run_dir variable twice for NULL.
This commit is contained in:
Peter Krempa 2013-01-16 11:51:21 +01:00
parent da5a8aee2b
commit 0e620e6669

View File

@ -1311,19 +1311,16 @@ int main(int argc, char **argv) {
/* Ensure the rundir exists (on tmpfs on some systems) */ /* Ensure the rundir exists (on tmpfs on some systems) */
if (privileged) { if (privileged) {
run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); if (!(run_dir = strdup(LOCALSTATEDIR "/run/libvirt"))) {
virReportOOMError();
goto cleanup;
}
} else { } else {
run_dir = virGetUserRuntimeDirectory(); if (!(run_dir = virGetUserRuntimeDirectory())) {
if (!run_dir) {
VIR_ERROR(_("Can't determine user directory")); VIR_ERROR(_("Can't determine user directory"));
goto cleanup; goto cleanup;
} }
} }
if (!run_dir) {
virReportOOMError();
goto cleanup;
}
if (privileged) if (privileged)
old_umask = umask(022); old_umask = umask(022);