From e940ba1fe78a3d275d5b568aa751089618a6dc24 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Sat, 30 Jan 2016 05:04:56 +0000 Subject: [PATCH] reds: remove default_renderer as field Was used to just assure there was at least one renderer in the list. Signed-off-by: Frediano Ziglio Acked-by: Pavel Grunt --- server/reds-private.h | 2 -- server/reds.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/reds-private.h b/server/reds-private.h index b154a927..fda613d6 100644 --- a/server/reds-private.h +++ b/server/reds-private.h @@ -191,8 +191,6 @@ struct RedsState { int mm_time_enabled; uint32_t mm_time_latency; - const char *default_renderer; - int spice_port; int spice_secure_port; SpiceCharDeviceInstance *vdagent; diff --git a/server/reds.c b/server/reds.c index 09fb56eb..120d385b 100644 --- a/server/reds.c +++ b/server/reds.c @@ -3415,6 +3415,8 @@ err: return -1; } +static const char default_renderer[] = "sw"; + /* new interface */ SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void) { @@ -3422,7 +3424,6 @@ SPICE_GNUC_VISIBLE SpiceServer *spice_server_new(void) spice_assert(reds == NULL); reds = spice_new0(RedsState, 1); - reds->default_renderer = "sw"; reds->spice_port = -1; reds->spice_secure_port = -1; reds->spice_listen_socket_fd = -1; @@ -3478,8 +3479,8 @@ SPICE_GNUC_VISIBLE int spice_server_init(SpiceServer *s, SpiceCoreInterface *cor spice_assert(reds == s); ret = do_spice_init(s, core); - if (s->default_renderer) { - red_add_renderer(s->default_renderer); + if (num_renderers == 0) { + red_add_renderer(default_renderer); } return ret; } @@ -3775,7 +3776,6 @@ SPICE_GNUC_VISIBLE int spice_server_add_renderer(SpiceServer *s, const char *nam if (!red_add_renderer(name)) { return -1; } - s->default_renderer = NULL; return 0; }