提交 d886ed95 编写于 作者: C Cole Robinson

util: Remove unused virExec wrapper

v3:
    Remove obsolete comment
Signed-off-by: NCole Robinson <crobinso@redhat.com>
上级 1ba75cf9
...@@ -263,7 +263,6 @@ sc_prohibit_close: ...@@ -263,7 +263,6 @@ sc_prohibit_close:
$(_sc_search_regexp) $(_sc_search_regexp)
# Prefer virCommand for all child processes. # Prefer virCommand for all child processes.
# XXX - eventually, we want to enhance this to also prohibit virExec.
sc_prohibit_fork_wrappers: sc_prohibit_fork_wrappers:
@prohibit='= *\<(fork|popen|system) *\(' \ @prohibit='= *\<(fork|popen|system) *\(' \
halt='use virCommand for child processes' \ halt='use virCommand for child processes' \
......
...@@ -968,7 +968,6 @@ virEnumFromString; ...@@ -968,7 +968,6 @@ virEnumFromString;
virEnumToString; virEnumToString;
virEventAddHandle; virEventAddHandle;
virEventRemoveHandle; virEventRemoveHandle;
virExec;
virExecWithHook; virExecWithHook;
virFileAbsPath; virFileAbsPath;
virFileBuildPath; virFileBuildPath;
......
...@@ -752,26 +752,6 @@ virExecWithHook(const char *const*argv, ...@@ -752,26 +752,6 @@ virExecWithHook(const char *const*argv,
return -1; 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 * @argv NULL terminated argv to run
* @status optional variable to return exit status in * @status optional variable to return exit status in
...@@ -881,21 +861,6 @@ virRun(const char *const *argv ATTRIBUTE_UNUSED, ...@@ -881,21 +861,6 @@ virRun(const char *const *argv ATTRIBUTE_UNUSED,
return -1; 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 int
virExecWithHook(const char *const*argv ATTRIBUTE_UNUSED, virExecWithHook(const char *const*argv ATTRIBUTE_UNUSED,
const char *const*envp ATTRIBUTE_UNUSED, const char *const*envp ATTRIBUTE_UNUSED,
......
...@@ -69,14 +69,6 @@ int virExecWithHook(const char *const*argv, ...@@ -69,14 +69,6 @@ int virExecWithHook(const char *const*argv,
virExecHook hook, virExecHook hook,
void *data, void *data,
char *pidfile) ATTRIBUTE_RETURN_CHECK; 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 virRun(const char *const*argv, int *status) ATTRIBUTE_RETURN_CHECK;
int virPipeReadUntilEOF(int outfd, int errfd, int virPipeReadUntilEOF(int outfd, int errfd,
char **outbuf, char **errbuf); char **outbuf, char **errbuf);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册