* src/qemu_driver.c: don't print and extra OOM error on top of getpwuid error

(Guido Günther)
Daniel
This commit is contained in:
Daniel Veillard 2008-10-07 16:01:23 +00:00
parent e2a43cdb87
commit 9f4c047935
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
Tue Oct 7 17:59:59 CEST 2008 Daniel Veillard <veillard@redhat.com>
* src/qemu_driver.c: don't print and extra OOM error on top of
getpwuid error (Guido Günther)
Mon Oct 6 15:47:00 EST 2008 Cole Robinson <crobinso@redhat.com> Mon Oct 6 15:47:00 EST 2008 Cole Robinson <crobinso@redhat.com>
* qemud/remote.c src/hash.c src/internal.h src/lxc_conf.c * qemud/remote.c src/hash.c src/internal.h src/lxc_conf.c

View File

@ -201,7 +201,7 @@ qemudStartup(void) {
if (!(pw = getpwuid(uid))) { if (!(pw = getpwuid(uid))) {
qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s\n"), qemudLog(QEMUD_ERR, _("Failed to find user record for uid '%d': %s\n"),
uid, strerror(errno)); uid, strerror(errno));
goto out_of_memory; goto out_nouid;
} }
if (asprintf(&qemu_driver->logDir, if (asprintf(&qemu_driver->logDir,
@ -267,6 +267,7 @@ qemudStartup(void) {
out_of_memory: out_of_memory:
qemudLog (QEMUD_ERR, qemudLog (QEMUD_ERR,
"%s", _("qemudStartup: out of memory\n")); "%s", _("qemudStartup: out of memory\n"));
out_nouid:
VIR_FREE(base); VIR_FREE(base);
VIR_FREE(qemu_driver); VIR_FREE(qemu_driver);
return -1; return -1;