OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vnc: Simplify vnc_display_password()

Browse Source 
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>
This commit is contained in:
Luiz Capitulino 2011-12-07 10:19:10 -02:00
parent 8c4ec5c026
commit a6aa9d3e26
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
console.h
View File

@ -384,7 +384,6 @@ int vnc_display_pw_expire(DisplayState *ds, time_t expires);
#else #else
static inline int vnc_display_password(DisplayState *ds, const char *password) static inline int vnc_display_password(DisplayState *ds, const char *password)
{ {
qerror_report(QERR_FEATURE_DISABLED, "vnc");
return -ENODEV; return -ENODEV;
} }
static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires) static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires)

7
monitor.c
View File

@ -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 /* Note that setting an empty password will not disable login through
* this interface. */ * 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"); qerror_report(QERR_INVALID_PARAMETER, "protocol");

14
ui/vnc.c
View File

@ -2686,19 +2686,16 @@ int vnc_display_disable_login(DisplayState *ds)
int vnc_display_password(DisplayState *ds, const char *password) int vnc_display_password(DisplayState *ds, const char *password)
{ {
int ret = 0;
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display; VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
if (!vs) { if (!vs) {
ret = -EINVAL; return -EINVAL;
goto out;
} }
if (!password) { if (!password) {
/* This is not the intention of this interface but err on the side /* This is not the intention of this interface but err on the side
of being safe */ of being safe */
ret = vnc_display_disable_login(ds); return vnc_display_disable_login(ds);
goto out;
} }
if (vs->password) { if (vs->password) {
@ -2707,11 +2704,8 @@ int vnc_display_password(DisplayState *ds, const char *password)
} }
vs->password = g_strdup(password); vs->password = g_strdup(password);
vs->auth = VNC_AUTH_VNC; vs->auth = VNC_AUTH_VNC;
out:
if (ret != 0) { return 0;
qerror_report(QERR_SET_PASSWD_FAILED);
}
return ret;
} }
int vnc_display_pw_expire(DisplayState *ds, time_t expires) int vnc_display_pw_expire(DisplayState *ds, time_t expires)