External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-15 00:55:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename virCommandTranslateStatus to virProcessTranslateStatus

Browse Source 
The virCommand prefix was inappropriate because the API
does not use any virCommandPtr object instance. This
API closely related to waitpid/exit, so use virProcess
as the prefix

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit 49ecf8b41fd1c606703d01792701ce46352b7669)
This commit is contained in:
Daniel P. Berrange 2012-09-24 18:01:26 +01:00 committed by Cole Robinson
parent 88589de79c
commit 5292eed6e2
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/remote.c
View File

@ -2832,7 +2832,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
authdismissed = (pkout && strstr(pkout, "dismissed=true")); authdismissed = (pkout && strstr(pkout, "dismissed=true"));
if (status != 0) { if (status != 0) {
char *tmp = virCommandTranslateStatus(status); char *tmp = virProcessTranslateStatus(status);
VIR_ERROR(_("Policy kit denied action %s from pid %lld, uid %d: %s"), VIR_ERROR(_("Policy kit denied action %s from pid %lld, uid %d: %s"),
action, (long long) callerPid, callerUid, NULLSTR(tmp)); action, (long long) callerPid, callerUid, NULLSTR(tmp));
VIR_FREE(tmp); VIR_FREE(tmp);

2
src/libvirt_private.syms
View File

@ -162,7 +162,7 @@ virCommandSetPreExecHook;
virCommandSetWorkingDirectory; virCommandSetWorkingDirectory;
virCommandToString; virCommandToString;
virCommandTransferFD; virCommandTransferFD;
virCommandTranslateStatus; virProcessTranslateStatus;
virCommandWait; virCommandWait;
virCommandWriteArgLog; virCommandWriteArgLog;
virFork; virFork;

16
src/util/command.c
View File

@ -1687,7 +1687,7 @@ virCommandToString(virCommandPtr cmd)
/** /**
* virCommandTranslateStatus: * virProcessTranslateStatus:
* @status: child exit status to translate * @status: child exit status to translate
* *
* Translate an exit status into a malloc'd string. Generic helper * Translate an exit status into a malloc'd string. Generic helper
@ -1695,7 +1695,7 @@ virCommandToString(virCommandPtr cmd)
* status argument, as well as raw waitpid(). * status argument, as well as raw waitpid().
*/ */
char * char *
virCommandTranslateStatus(int status) virProcessTranslateStatus(int status)
{ {
char *buf; char *buf;
if (WIFEXITED(status)) { if (WIFEXITED(status)) {
@ -2032,7 +2032,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus)
if (virCommandWait(cmd, exitstatus) < 0) if (virCommandWait(cmd, exitstatus) < 0)
ret = -1; ret = -1;
str = (exitstatus ? virCommandTranslateStatus(*exitstatus) str = (exitstatus ? virProcessTranslateStatus(*exitstatus)
: (char *) "status 0"); : (char *) "status 0");
VIR_DEBUG("Result %s, stdout: '%s' stderr: '%s'", VIR_DEBUG("Result %s, stdout: '%s' stderr: '%s'",
NULLSTR(str), NULLSTR(str),
@ -2291,7 +2291,7 @@ virProcessWait(pid_t pid, int *exitstatus)
if (exitstatus == NULL) { if (exitstatus == NULL) {
if (status != 0) { if (status != 0) {
char *st = virCommandTranslateStatus(status); char *st = virProcessTranslateStatus(status);
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Child process (%lld) unexpected %s"), _("Child process (%lld) unexpected %s"),
(long long) pid, NULLSTR(st)); (long long) pid, NULLSTR(st));
@ -2350,7 +2350,7 @@ virCommandWait(virCommandPtr cmd, int *exitstatus)
cmd->reap = false; cmd->reap = false;
if (status) { if (status) {
char *str = virCommandToString(cmd); char *str = virCommandToString(cmd);
char *st = virCommandTranslateStatus(status); char *st = virProcessTranslateStatus(status);
bool haveErrMsg = cmd->errbuf && *cmd->errbuf && (*cmd->errbuf)[0]; bool haveErrMsg = cmd->errbuf && *cmd->errbuf && (*cmd->errbuf)[0];
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -2398,7 +2398,7 @@ virProcessAbort(pid_t pid)
while ((ret = waitpid(pid, &status, WNOHANG)) == -1 && while ((ret = waitpid(pid, &status, WNOHANG)) == -1 &&
errno == EINTR); errno == EINTR);
if (ret == pid) { if (ret == pid) {
tmp = virCommandTranslateStatus(status); tmp = virProcessTranslateStatus(status);
VIR_DEBUG("process has ended: %s", tmp); VIR_DEBUG("process has ended: %s", tmp);
goto cleanup; goto cleanup;
} else if (ret == 0) { } else if (ret == 0) {
@ -2408,7 +2408,7 @@ virProcessAbort(pid_t pid)
while ((ret = waitpid(pid, &status, WNOHANG)) == -1 && while ((ret = waitpid(pid, &status, WNOHANG)) == -1 &&
errno == EINTR); errno == EINTR);
if (ret == pid) { if (ret == pid) {
tmp = virCommandTranslateStatus(status); tmp = virProcessTranslateStatus(status);
VIR_DEBUG("process has ended: %s", tmp); VIR_DEBUG("process has ended: %s", tmp);
goto cleanup; goto cleanup;
} else if (ret == 0) { } else if (ret == 0) {
@ -2417,7 +2417,7 @@ virProcessAbort(pid_t pid)
while ((ret = waitpid(pid, &status, 0)) == -1 && while ((ret = waitpid(pid, &status, 0)) == -1 &&
errno == EINTR); errno == EINTR);
if (ret == pid) { if (ret == pid) {
tmp = virCommandTranslateStatus(status); tmp = virProcessTranslateStatus(status);
VIR_DEBUG("process has ended: %s", tmp); VIR_DEBUG("process has ended: %s", tmp);
goto cleanup; goto cleanup;
} }

2
src/util/command.h
View File

@ -141,7 +141,7 @@ void virCommandWriteArgLog(virCommandPtr cmd,
char *virCommandToString(virCommandPtr cmd) ATTRIBUTE_RETURN_CHECK; char *virCommandToString(virCommandPtr cmd) ATTRIBUTE_RETURN_CHECK;
char *virCommandTranslateStatus(int exitstatus) ATTRIBUTE_RETURN_CHECK; char *virProcessTranslateStatus(int exitstatus) ATTRIBUTE_RETURN_CHECK;
int virCommandExec(virCommandPtr cmd) ATTRIBUTE_RETURN_CHECK; int virCommandExec(virCommandPtr cmd) ATTRIBUTE_RETURN_CHECK;