From: Eric Blake <eblake@redhat.com>
Date: Wed, 18 Aug 2010 18:10:08 +0000 (-0600)
Subject: nwfilter: use consistent OOM reporting
X-Git-Tag: v0.8.4~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52baf647ca05585af1dab4e80d2c61d82d475e93;p=thirdparty%2Flibvirt.git

nwfilter: use consistent OOM reporting

* src/nwfilter/nwfilter_driver.c (nwfilterLog): Delete.
(nwfilterDriverStartup): Use virReportOOMError instead.
---

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 0e8241e5ef..bda50f9e53 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -42,9 +42,6 @@
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 
-#define nwfilterLog(msg...) fprintf(stderr, msg)
-
-
 static virNWFilterDriverStatePtr driverState;
 
 static int nwfilterDriverShutdown(void);
@@ -95,7 +92,6 @@ nwfilterDriverStartup(int privileged) {
             goto error;
 
         if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) {
-            nwfilterLog("out of memory in virAsprintf");
             VIR_FREE(userdir);
             goto out_of_memory;
         }
@@ -118,7 +114,7 @@ nwfilterDriverStartup(int privileged) {
     return 0;
 
 out_of_memory:
-    nwfilterLog("virNWFilterStartup: out of memory");
+    virReportOOMError();
 
 error:
     VIR_FREE(base);