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

remove some warnings

Browse Source
This commit is contained in:
Jay Sorg 2016-04-09 19:26:27 -07:00
parent 6a692c96cf
commit dbf6bcc8be
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xrdp/xrdp_mm.c
View File

@ -817,6 +817,7 @@ xrdp_mm_process_rail_create_window(struct xrdp_mm* self, struct stream* s)
return rv; return rv;
} }
#if 0
/*****************************************************************************/ /*****************************************************************************/
/* returns error /* returns error
process rail configure window order */ process rail configure window order */
@ -883,6 +884,7 @@ xrdp_mm_process_rail_configure_window(struct xrdp_mm* self, struct stream* s)
g_free(rwso.visibility_rects); g_free(rwso.visibility_rects);
return rv; return rv;
} }
#endif
/*****************************************************************************/ /*****************************************************************************/
/* returns error /* returns error
@ -1056,7 +1058,6 @@ xrdp_mm_chan_data_in(struct trans *trans)
{ {
struct xrdp_mm *self; struct xrdp_mm *self;
struct stream *s; struct stream *s;
int id;
int size; int size;
int error; int error;
@ -1073,7 +1074,7 @@ xrdp_mm_chan_data_in(struct trans *trans)
return 1; return 1;
} }
in_uint32_le(s, id); in_uint8s(s, 4); /* id */
in_uint32_le(s, size); in_uint32_le(s, size);
error = trans_force_read(trans, size - 8); error = trans_force_read(trans, size - 8);
@ -2929,7 +2930,6 @@ int read_allowed_channel_names(struct list *names, struct list *values)
int fd; int fd;
int ret = 0; int ret = 0;
char cfg_file[256]; char cfg_file[256];
int pos;
g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH); g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
fd = g_file_open(cfg_file); fd = g_file_open(cfg_file);
@ -2938,7 +2938,6 @@ int read_allowed_channel_names(struct list *names, struct list *values)
{ {
names->auto_free = 1; names->auto_free = 1;
values->auto_free = 1; values->auto_free = 1;
pos = 0;
/* all values in this section can be valid channel names */ /* all values in this section can be valid channel names */
if (file_read_section(fd, "channels", names, values) == 0) if (file_read_section(fd, "channels", names, values) == 0)

2
xrdp/xrdp_painter.c
View File

@ -915,7 +915,6 @@ xrdp_painter_composite(struct xrdp_painter* self,
int k; int k;
int dx; int dx;
int dy; int dy;
int palette_id;
int cache_srcidx; int cache_srcidx;
int cache_mskidx; int cache_mskidx;
@ -939,7 +938,6 @@ xrdp_painter_composite(struct xrdp_painter* self,
dstx += dx; dstx += dx;
dsty += dy; dsty += dy;
palette_id = 0;
cache_srcidx = src->item_index; cache_srcidx = src->item_index;
cache_mskidx = -1; cache_mskidx = -1;
if (mskflags & 1) if (mskflags & 1)