Adapt to VIR_ALLOC and virAsprintf in src/access/*

diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
index 6e503ba02e8d4c1eb56c7bfc48bf3115d8ef4527..4c76e64ebb2ed5d5085521385d9fc38e6adb24be 100644 (file)
--- a/src/access/viraccessdriverpolkit.c
+++ b/src/access/viraccessdriverpolkit.c
@@ -57,10 +57,8 @@ virAccessDriverPolkitFormatAction(const char *typename,
 
     if (virAsprintf(&actionid, "%s.%s.%s",
                     VIR_ACCESS_DRIVER_POLKIT_ACTION_PREFIX,
-                    typename, permname) < 0) {
-        virReportOOMError();
+                    typename, permname) < 0)
         return NULL;
-    }
 
     for (i = 0; actionid[i]; i++)
         if (actionid[i] == '_')

diff --git a/src/access/viraccessdriverstack.c b/src/access/viraccessdriverstack.c
index ea20db8ffaeb8e0be49048c0a4f381791a6d4a4c..11ed4f6edcda08f90f43b4e8a26b2a14765f995e 100644 (file)
--- a/src/access/viraccessdriverstack.c
+++ b/src/access/viraccessdriverstack.c
@@ -40,10 +40,8 @@ int virAccessDriverStackAppend(virAccessManagerPtr manager,
 {
     virAccessDriverStackPrivatePtr priv = virAccessManagerGetPrivateData(manager);
 
-    if (VIR_EXPAND_N(priv->managers, priv->managersLen, 1) < 0) {
-        virReportOOMError();
+    if (VIR_EXPAND_N(priv->managers, priv->managersLen, 1) < 0)
         return -1;
-    }
 
     priv->managers[priv->managersLen-1] = child;
 

diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c
index 559a8445ed9a74ca1e23630035334313d007741e..16e3853712f2b5e8c40977f3f05e477670c58bbf 100644 (file)
--- a/src/access/viraccessmanager.c
+++ b/src/access/viraccessmanager.c
@@ -85,10 +85,8 @@ static virAccessManagerPtr virAccessManagerNewDriver(virAccessDriverPtr drv)
     if (virAccessManagerInitialize() < 0)
         return NULL;
 
-    if (VIR_ALLOC_N(privateData, drv->privateDataLen) < 0) {
-        virReportOOMError();
+    if (VIR_ALLOC_N(privateData, drv->privateDataLen) < 0)
         return NULL;
-    }
 
     if (!(mgr = virObjectLockableNew(virAccessManagerClass))) {
         VIR_FREE(privateData);