External/libvirt
1
0
Fork 0
Code

phyp: use consistent style for labels

Browse Source 
* src/phyp/phyp_driver.c: Match label style of rest of project.
(phypExec, phypUUIDTable_Pull): Drop an extra label.
This commit is contained in:
Eric Blake 2011-04-14 12:53:52 -06:00
parent 444306d591
commit f61785225d
1 changed files with 62 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/phyp/phyp_driver.c
View File

@ -182,15 +182,6 @@ phypExec(LIBSSH2_SESSION *session, const char *cmd, int *exit_status,
(*exit_status) = exitcode; (*exit_status) = exitcode;
libssh2_channel_free(channel); libssh2_channel_free(channel);
channel = NULL; channel = NULL;
goto exit;
err:
(*exit_status) = SSH_CMD_ERR;
virBufferFreeAndReset(&tex_ret);
VIR_FREE(buffer);
return NULL;
exit:
VIR_FREE(buffer); VIR_FREE(buffer);
if (virBufferError(&tex_ret)) { if (virBufferError(&tex_ret)) {
@ -199,6 +190,12 @@ phypExec(LIBSSH2_SESSION *session, const char *cmd, int *exit_status,
return NULL; return NULL;
} }
return virBufferContentAndReset(&tex_ret); return virBufferContentAndReset(&tex_ret);
err:
(*exit_status) = SSH_CMD_ERR;
virBufferFreeAndReset(&tex_ret);
VIR_FREE(buffer);
return NULL;
} }
static int static int
@ -780,9 +777,7 @@ phypUUIDTable_Pull(virConnectPtr conn)
local_file); local_file);
goto err; goto err;
} }
goto exit;
exit:
if (channel) { if (channel) {
libssh2_channel_send_eof(channel); libssh2_channel_send_eof(channel);
libssh2_channel_wait_eof(channel); libssh2_channel_wait_eof(channel);