diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2014-09-23 16:07:50 +0200 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2014-09-26 16:30:43 +0200 |
| commit | 42ffe6f8b4efe2a1e80fc98dbded37823133b55c (patch) | |
| tree | cf0a3df2e127370158ebdfb47e51e34741d7a9e8 /src/virt-viewer.c | |
| parent | 0107214070b796ab5f00168f963081238e6379fa (diff) | |
| download | virt-viewer-42ffe6f8b4efe2a1e80fc98dbded37823133b55c.tar.gz virt-viewer-42ffe6f8b4efe2a1e80fc98dbded37823133b55c.tar.xz virt-viewer-42ffe6f8b4efe2a1e80fc98dbded37823133b55c.zip | |
Simplify virt_viewer_auth_libvirt_credentials() return value logic
As the function should return < 0 in error cases, let's explicitly
return/set the return value to -1 in error cases. Otherwise, the
function will return 0.
This patch also fixes a regression introduced by (a5ce2ed3).
https://bugzilla.redhat.com/show_bug.cgi?id=1142742
Diffstat (limited to 'src/virt-viewer.c')
| -rw-r--r-- | src/virt-viewer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/virt-viewer.c b/src/virt-viewer.c index 3d7511a..3d5a363 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -618,7 +618,7 @@ virt_viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, VirtViewer *app = cbdata; VirtViewerPrivate *priv = app->priv; int i; - int ret = -1; + int ret = 0; g_debug("Got libvirt credential request for %d credential(s)", ncred); @@ -644,10 +644,10 @@ virt_viewer_auth_libvirt_credentials(virConnectCredentialPtr cred, "libvirt", app->priv->uri, username, password); - if (priv->auth_cancelled) + if (priv->auth_cancelled) { + ret = -1; goto cleanup; - } else { - ret = 0; + } } for (i = 0 ; i < ncred ; i++) { |