diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-30 15:18:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-30 15:18:30 +0100 |
| commit | f90f5b9a9aa41e5ea47dc7a0f3e1f99196f485c3 (patch) | |
| tree | f0420a3eb6f094bb9c988867e8f428b84980d52a /ui/vnc-tls.c | |
| parent | 498147529d1f8e902e6528a0115143b53475791e (diff) | |
| parent | 553029351bac9f5b4f9ea72793e55f02e7677ec2 (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-30' into staging
trivial patches for 2015-04-30
# gpg: Signature made Thu Apr 30 14:07:50 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-04-30: (42 commits)
openrisc: cpu: Remove unused cpu_get_pc
microblaze: fix memory leak
tcg: Delete unused cpu_pc_from_tb()
kvm: Silence warning from valgrind
vhost-user: remove superfluous '\n' around error_report()
target-mips: fix memory leak
qmp-commands: Fix typo
linux-user/elfload: use QTAILQ_FOREACH instead of open-coding it
coroutine: remove unnecessary parentheses in qemu_co_queue_empty
qemu-char: remove unused list node from FDCharDriver
input: remove unused mouse_handlers list
cpus: use first_cpu macro instead of QTAILQ_FIRST(&cpus)
microblaze: cpu: delete unused cpu_interrupts_enabled
microblaze: cpu: Renumber EXCP_* constants to close gap
microblaze: cpu: Delete EXCP_NMI
microblaze: cpu: Remove unused CC_OP enum
microblaze: cpu: Remote unused cpu_get_pc
microblaze: mmu: Delete flip_um fn prototype
defconfigs: Piggyback microblazeel on microblaze
libcacard: do not use full paths for include files in the same dir
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc-tls.c')
| -rw-r--r-- | ui/vnc-tls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c index eddd39b08e..028fc4db1f 100644 --- a/ui/vnc-tls.c +++ b/ui/vnc-tls.c @@ -68,7 +68,7 @@ static int vnc_tls_initialize(void) static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport, const void *data, size_t len) { - struct VncState *vs = (struct VncState *)transport; + VncState *vs = (VncState *)transport; int ret; retry: @@ -85,7 +85,7 @@ static ssize_t vnc_tls_push(gnutls_transport_ptr_t transport, static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport, void *data, size_t len) { - struct VncState *vs = (struct VncState *)transport; + VncState *vs = (VncState *)transport; int ret; retry: @@ -170,7 +170,7 @@ static gnutls_certificate_credentials_t vnc_tls_initialize_x509_cred(VncDisplay } -int vnc_tls_validate_certificate(struct VncState *vs) +int vnc_tls_validate_certificate(VncState *vs) { int ret; unsigned int status; @@ -332,7 +332,7 @@ static int vnc_set_gnutls_priority(gnutls_session_t s, int x509) #endif -int vnc_tls_client_setup(struct VncState *vs, +int vnc_tls_client_setup(VncState *vs, int needX509Creds) { VNC_DEBUG("Do TLS setup\n"); if (vnc_tls_initialize() < 0) { @@ -410,7 +410,7 @@ int vnc_tls_client_setup(struct VncState *vs, } -void vnc_tls_client_cleanup(struct VncState *vs) +void vnc_tls_client_cleanup(VncState *vs) { if (vs->tls.session) { gnutls_deinit(vs->tls.session); |