From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 6 May 2011 20:36:16 +0000 (-0400)
Subject: util: Remove unused virExec wrapper
X-Git-Tag: v0.9.3-rc1~228
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d886ed9597c46b690e2ffb937e6982373c326095;p=thirdparty%2Flibvirt.git

util: Remove unused virExec wrapper

v3:
    Remove obsolete comment

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/cfg.mk b/cfg.mk
index 3a1018670b..d16d8a8176 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -263,7 +263,6 @@ sc_prohibit_close:
 	  $(_sc_search_regexp)
 
 # Prefer virCommand for all child processes.
-# XXX - eventually, we want to enhance this to also prohibit virExec.
 sc_prohibit_fork_wrappers:
 	@prohibit='= *\<(fork|popen|system) *\('			\
 	halt='use virCommand for child processes'			\
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index e6ab870b77..0f4455d48e 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -968,7 +968,6 @@ virEnumFromString;
 virEnumToString;
 virEventAddHandle;
 virEventRemoveHandle;
-virExec;
 virExecWithHook;
 virFileAbsPath;
 virFileBuildPath;
diff --git a/src/util/util.c b/src/util/util.c
index e221abeed5..b388ac2852 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -752,26 +752,6 @@ virExecWithHook(const char *const*argv,
     return -1;
 }
 
-/*
- * See virExecWithHook for explanation of the arguments.
- *
- * Wrapper function for virExecWithHook, with a simpler set of parameters.
- * Used to insulate the numerous callers from changes to virExecWithHook
- * argument list.
- */
-int
-virExec(const char *const*argv,
-        const char *const*envp,
-        const fd_set *keepfd,
-        pid_t *retpid,
-        int infd, int *outfd, int *errfd,
-        int flags)
-{
-    return virExecWithHook(argv, envp, keepfd, retpid,
-                           infd, outfd, errfd,
-                           flags, NULL, NULL, NULL);
-}
-
 /**
  * @argv NULL terminated argv to run
  * @status optional variable to return exit status in
@@ -881,21 +861,6 @@ virRun(const char *const *argv ATTRIBUTE_UNUSED,
     return -1;
 }
 
-int
-virExec(const char *const*argv ATTRIBUTE_UNUSED,
-        const char *const*envp ATTRIBUTE_UNUSED,
-        const fd_set *keepfd ATTRIBUTE_UNUSED,
-        int *retpid ATTRIBUTE_UNUSED,
-        int infd ATTRIBUTE_UNUSED,
-        int *outfd ATTRIBUTE_UNUSED,
-        int *errfd ATTRIBUTE_UNUSED,
-        int flags ATTRIBUTE_UNUSED)
-{
-    virUtilError(VIR_ERR_INTERNAL_ERROR,
-                 "%s", _("virExec is not implemented for WIN32"));
-    return -1;
-}
-
 int
 virExecWithHook(const char *const*argv ATTRIBUTE_UNUSED,
                 const char *const*envp ATTRIBUTE_UNUSED,
diff --git a/src/util/util.h b/src/util/util.h
index a1bcca07be..6ea00107f8 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -69,14 +69,6 @@ int virExecWithHook(const char *const*argv,
                     virExecHook hook,
                     void *data,
                     char *pidfile) ATTRIBUTE_RETURN_CHECK;
-int virExec(const char *const*argv,
-            const char *const*envp,
-            const fd_set *keepfd,
-            pid_t *retpid,
-            int infd,
-            int *outfd,
-            int *errfd,
-            int flags) ATTRIBUTE_RETURN_CHECK;
 int virRun(const char *const*argv, int *status) ATTRIBUTE_RETURN_CHECK;
 int virPipeReadUntilEOF(int outfd, int errfd,
                         char **outbuf, char **errbuf);