提交 7ca17da9 编写于 作者: J John Ferlan

secret: Remove need for local configFile and base64File in ObjectAdd

Rather than assign to a local variable, let's just assign directly to the
object using the error path for cleanup.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 2d3c7122
......@@ -335,7 +335,6 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
virSecretDefPtr objdef;
virSecretObjPtr ret = NULL;
char uuidstr[VIR_UUID_STRING_BUFLEN];
char *configFile = NULL, *base64File = NULL;
virObjectLock(secrets);
......@@ -384,22 +383,20 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
goto cleanup;
}
if (!(obj = virSecretObjNew()))
goto cleanup;
/* Generate the possible configFile and base64File strings
* using the configDir, uuidstr, and appropriate suffix
*/
if (!(configFile = virFileBuildPath(configDir, uuidstr, ".xml")) ||
!(base64File = virFileBuildPath(configDir, uuidstr, ".base64")))
goto cleanup;
if (!(obj = virSecretObjNew()))
if (!(obj->configFile = virFileBuildPath(configDir, uuidstr, ".xml")) ||
!(obj->base64File = virFileBuildPath(configDir, uuidstr, ".base64")))
goto cleanup;
if (virHashAddEntry(secrets->objs, uuidstr, obj) < 0)
goto cleanup;
obj->def = newdef;
VIR_STEAL_PTR(obj->configFile, configFile);
VIR_STEAL_PTR(obj->base64File, base64File);
virObjectRef(obj);
}
......@@ -408,8 +405,6 @@ virSecretObjListAdd(virSecretObjListPtr secrets,
cleanup:
virSecretObjEndAPI(&obj);
VIR_FREE(configFile);
VIR_FREE(base64File);
virObjectUnlock(secrets);
return ret;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册