]> xenbits.xensource.com Git - libvirt.git/commitdiff
nwfilter: use consistent OOM reporting
authorEric Blake <eblake@redhat.com>
Wed, 18 Aug 2010 18:10:08 +0000 (12:10 -0600)
committerEric Blake <eblake@redhat.com>
Thu, 19 Aug 2010 19:14:41 +0000 (13:14 -0600)
* src/nwfilter/nwfilter_driver.c (nwfilterLog): Delete.
(nwfilterDriverStartup): Use virReportOOMError instead.

src/nwfilter/nwfilter_driver.c

index 0e8241e5ef3d32fee32ef6e1303a9ef36587f3d2..bda50f9e537e02671945095e407dc4003d38965c 100644 (file)
@@ -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);