Drop useless virFileWrapperFdCatchError

We are requesting for stderr catching for all cases in
virFileWrapperFdNew(). There is no need to have a separate
function just to report an error, esp. when we can do it in
virFileWrapperFdClose().

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 57e3eb4188178316b7f10853ed839aa0d2c11c80..a9560bafc49f973420741caa5f4e105fdce12e1e 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1382,7 +1382,6 @@ virFileLoopDeviceAssociate;
 virFileRewrite;
 virFileTouch;
 virFileUpdatePerm;
-virFileWrapperFdCatchError;
 virFileWrapperFdClose;
 virFileWrapperFdFree;
 virFileWrapperFdNew;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 979a027b3fd1200dd16b856503bfbe13651fbd70..48f95164c09ec0de002cd3fb10f546c55a216454 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2855,7 +2855,6 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
 
 cleanup:
     VIR_FORCE_CLOSE(fd);
-    virFileWrapperFdCatchError(wrapperFd);
     virFileWrapperFdFree(wrapperFd);
     VIR_FREE(xml);
 
@@ -3288,10 +3287,8 @@ doCoreDump(virQEMUDriverPtr driver,
 
 cleanup:
     VIR_FORCE_CLOSE(fd);
-    if (ret != 0) {
-        virFileWrapperFdCatchError(wrapperFd);
+    if (ret != 0)
         unlink(path);
-    }
     virFileWrapperFdFree(wrapperFd);
     return ret;
 }

diff --git a/src/util/virfile.c b/src/util/virfile.c
index b4765fb660d41989f607e947957bfdf27a8f056d..eec9bccafa77ec4f452ecc1b387d69e806dd5166 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -282,26 +282,17 @@ virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED,
 int
 virFileWrapperFdClose(virFileWrapperFdPtr wfd)
 {
+    int ret;
+
     if (!wfd)
         return 0;
 
-    return virCommandWait(wfd->cmd, NULL);
-}
-
-
-/**
- * virFileWrapperFdCatchError:
- * @wfd: fd wrapper, or NULL
- *
- * If iohelper reported any error VIR_WARN() about it.
- */
-void
-virFileWrapperFdCatchError(virFileWrapperFdPtr wfd)
-{
-    if (wfd && wfd->err_msg)
+    ret = virCommandWait(wfd->cmd, NULL);
+    if (wfd->err_msg)
         VIR_WARN("iohelper reports: %s", wfd->err_msg);
-}
 
+    return ret;
+}
 
 /**
  * virFileWrapperFdFree:

diff --git a/src/util/virfile.h b/src/util/virfile.h
index 80daf867a5cf2d0ac9b39d408431009baeffa0a9..c885b73c365fab39aa39aa7c6882e4306cd0764e 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -90,8 +90,6 @@ int virFileWrapperFdClose(virFileWrapperFdPtr dfd);
 
 void virFileWrapperFdFree(virFileWrapperFdPtr dfd);
 
-void virFileWrapperFdCatchError(virFileWrapperFdPtr dfd);
-
 int virFileLock(int fd, bool shared, off_t start, off_t len);
 int virFileUnlock(int fd, off_t start, off_t len);