diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2012-03-13 15:16:41 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-04-25 09:40:18 +0100 |
| commit | 832a98800d7ec97796eec3697e00e81f92a07898 (patch) | |
| tree | 6cfa17b0ec7c7883a7c15686f042b3fa0c95382e | |
| parent | e139521928bb1b390aa4a99a69f63ae3484877cc (diff) | |
| download | spice-832a98800d7ec97796eec3697e00e81f92a07898.tar.gz spice-832a98800d7ec97796eec3697e00e81f92a07898.tar.xz spice-832a98800d7ec97796eec3697e00e81f92a07898.zip | |
Fix const-ness violations
* server/red_worker.c: Add missing const for return type
* server/reds.c: Static strings must be declared const
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | server/red_worker.c | 2 | ||||
| -rw-r--r-- | server/reds.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index 07782c8d..3bb7d3ef 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -1202,7 +1202,7 @@ static inline void validate_surface(RedWorker *worker, uint32_t surface_id) } } -static char *draw_type_to_str(uint8_t type) +static const char *draw_type_to_str(uint8_t type) { switch (type) { case QXL_DRAW_FILL: diff --git a/server/reds.c b/server/reds.c index bf26864e..53fc7486 100644 --- a/server/reds.c +++ b/server/reds.c @@ -97,7 +97,7 @@ static int spice_secure_port = -1; static int spice_listen_socket_fd = -1; static char spice_addr[256]; static int spice_family = PF_UNSPEC; -static char *default_renderer = "sw"; +static const char *default_renderer = "sw"; static int sasl_enabled = 0; // sasl disabled by default #if HAVE_SASL static char *sasl_appname = NULL; // default to "spice" if NULL @@ -1730,7 +1730,7 @@ static void reds_channel_do_link(RedChannel *channel, RedClient *client, spice_assert(stream); if (link_msg->channel_type == SPICE_CHANNEL_INPUTS && !stream->ssl) { - char *mess = "keyboard channel is insecure"; + const char *mess = "keyboard channel is insecure"; const int mess_len = strlen(mess); main_channel_push_notify(reds->main_channel, (uint8_t*)mess, mess_len); } |