diff options
author | Luiz Capitulino <lcapitulino@redhat.com> | 2011-12-07 10:19:10 -0200 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2012-01-18 10:23:38 -0200 |
commit | a6aa9d3e2681199d159963e46524625d90669619 (patch) | |
tree | 4372e0694baa343a67169491f7b20f0916376be2 | |
parent | 8c4ec5c0269bda18bb777a64b2008088d1c632dc (diff) | |
download | hqemu-a6aa9d3e2681199d159963e46524625d90669619.zip hqemu-a6aa9d3e2681199d159963e46524625d90669619.tar.gz |
vnc: Simplify vnc_display_password()
Drop the qerror_report() call from it and let its callers set the error
themselves. This also allows for dropping the 'ret' variable.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r-- | console.h | 1 | ||||
-rw-r--r-- | monitor.c | 7 | ||||
-rw-r--r-- | ui/vnc.c | 14 |
3 files changed, 10 insertions, 12 deletions
@@ -384,7 +384,6 @@ int vnc_display_pw_expire(DisplayState *ds, time_t expires); #else static inline int vnc_display_password(DisplayState *ds, const char *password) { - qerror_report(QERR_FEATURE_DISABLED, "vnc"); return -ENODEV; } static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires) @@ -929,7 +929,12 @@ static int set_password(Monitor *mon, const QDict *qdict, QObject **ret_data) } /* Note that setting an empty password will not disable login through * this interface. */ - return vnc_display_password(NULL, password); + rc = vnc_display_password(NULL, password); + if (rc < 0) { + qerror_report(QERR_SET_PASSWD_FAILED); + return -1; + } + return 0; } qerror_report(QERR_INVALID_PARAMETER, "protocol"); @@ -2686,19 +2686,16 @@ int vnc_display_disable_login(DisplayState *ds) int vnc_display_password(DisplayState *ds, const char *password) { - int ret = 0; VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; if (!vs) { - ret = -EINVAL; - goto out; + return -EINVAL; } if (!password) { /* This is not the intention of this interface but err on the side of being safe */ - ret = vnc_display_disable_login(ds); - goto out; + return vnc_display_disable_login(ds); } if (vs->password) { @@ -2707,11 +2704,8 @@ int vnc_display_password(DisplayState *ds, const char *password) } vs->password = g_strdup(password); vs->auth = VNC_AUTH_VNC; -out: - if (ret != 0) { - qerror_report(QERR_SET_PASSWD_FAILED); - } - return ret; + + return 0; } int vnc_display_pw_expire(DisplayState *ds, time_t expires) |