jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix CI errors

Browse Source
This commit is contained in:
matt335672 2019-05-02 12:01:19 +01:00
parent 7d305b0085
commit 8945b49e61
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vnc/vnc.c
View File

@ -287,7 +287,7 @@ log_debug_screen_layout(const char *source,
source, layout->count); source, layout->count);
i = 0; i = 0;
while (res > 0 && res < sizeof(text) - pos && i < layout->count) while (res > 0 && (size_t)res < sizeof(text) - pos && i < layout->count)
{ {
pos += res; pos += res;
res = g_snprintf(&text[pos], sizeof(text) - pos, res = g_snprintf(&text[pos], sizeof(text) - pos,
@ -297,7 +297,7 @@ log_debug_screen_layout(const char *source,
layout->s[i].x, layout->s[i].y); layout->s[i].x, layout->s[i].y);
++i; ++i;
} }
log_message(LOG_LEVEL_DEBUG, text); log_message(LOG_LEVEL_DEBUG, "%s", text);
} }
/***************************************************************************** /*****************************************************************************
@ -1840,8 +1840,6 @@ lib_mod_end(struct vnc *v)
int int
lib_mod_set_param(struct vnc *v, const char *name, const char *value) lib_mod_set_param(struct vnc *v, const char *name, const char *value)
{ {
unsigned int i;
if (g_strcasecmp(name, "username") == 0) if (g_strcasecmp(name, "username") == 0)
{ {
g_strncpy(v->username, value, 255); g_strncpy(v->username, value, 255);
@ -1903,6 +1901,7 @@ lib_mod_set_param(struct vnc *v, const char *name, const char *value)
} }
else else
{ {
int i;
v->screen_layout.count = client_info->monitorCount; v->screen_layout.count = client_info->monitorCount;
v->screen_layout.s = g_new(struct vnc_screen, v->screen_layout.s = g_new(struct vnc_screen,
v->screen_layout.count); v->screen_layout.count);