On Wed, 2016-02-10 at 17:19 +0100, Ján Tomko wrote:
This function returns -1 on allocation error, there's no
need to check the path for NULL again.
---
src/util/virhook.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/util/virhook.c b/src/util/virhook.c
index ee19382..ba50598 100644
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -119,8 +119,7 @@ virHookCheck(int no, const char *driver)
return -1;
}
- ret = virBuildPath(&path, LIBVIRT_HOOK_DIR, driver);
- if ((ret < 0) || (path == NULL)) {
+ if (virBuildPath(&path, LIBVIRT_HOOK_DIR, driver) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to build path for %s hook"),
driver);
@@ -276,8 +275,7 @@ virHookCall(int driver,
if (extra == NULL)
extra = "-";
- ret = virBuildPath(&path, LIBVIRT_HOOK_DIR, drvstr);
- if ((ret < 0) || (path == NULL)) {
+ if (virBuildPath(&path, LIBVIRT_HOOK_DIR, drvstr) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to build path for %s hook"),
drvstr);
ACK.
Unrelated to your changes, I notice the return value for the second
failure is -1, but the comments for virHookCall() say
Returns: 0 if the execution succeeded, 1 if the script was not found
or invalid parameters, and -1 if script returned an error
so I wonder if it should be changed to 1 instead... The script can't
have returned an error if we haven't been able to build its path :)
Cheers.
--
Andrea Bolognani
Software Engineer - Virtualization Team