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

xrdp: fix warnings

Browse Source
This commit is contained in:
Jay Sorg 2012-06-11 20:55:39 -07:00
parent 2eb2f1d92d
commit a8bf71b567
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xrdp/xrdp.c
View File

@ -323,6 +323,9 @@ main(int argc, char** argv)
g_writeln("error opening log file [%s]. quitting.", g_writeln("error opening log file [%s]. quitting.",
getLogFile(text, 255)); getLogFile(text, 255));
break; break;
default:
g_writeln("log_start error");
break;
} }
g_deinit(); g_deinit();
g_exit(1); g_exit(1);

1
xrdp/xrdp_listen.c
View File

@ -278,7 +278,6 @@ xrdp_listen_main_loop(struct xrdp_listen* self)
tbus robjs[8]; tbus robjs[8];
tbus term_obj; tbus term_obj;
tbus sync_obj; tbus sync_obj;
tbus sck_obj;
tbus done_obj; tbus done_obj;
self->status = 1; self->status = 1;

6
xrdp/xrdp_mm.c
View File

@ -698,7 +698,7 @@ xrdp_mm_connect_chansrv(struct xrdp_mm* self, char* ip, char* port)
self->usechansrv = 1; self->usechansrv = 1;
/* connect channel redir */ /* connect channel redir */
if ((ip == 0) || (strcmp(ip, "127.0.0.1") == 0) || (ip[0] == 0)) if ((ip == 0) || (g_strcmp(ip, "127.0.0.1") == 0) || (ip[0] == 0))
{ {
/* unix socket */ /* unix socket */
self->chan_trans = trans_create(TRANS_MODE_UNIX, 8192, 8192); self->chan_trans = trans_create(TRANS_MODE_UNIX, 8192, 8192);
@ -750,8 +750,6 @@ xrdp_mm_process_login_response(struct xrdp_mm* self, struct stream* s)
int ok; int ok;
int display; int display;
int rv; int rv;
int uid;
int gid;
char text[256]; char text[256];
char ip[256]; char ip[256];
char port[256]; char port[256];
@ -773,7 +771,7 @@ xrdp_mm_process_login_response(struct xrdp_mm* self, struct stream* s)
xrdp_wm_set_login_mode(self->wm, 10); xrdp_wm_set_login_mode(self->wm, 10);
self->wm->dragging = 0; self->wm->dragging = 0;
/* connect channel redir */ /* connect channel redir */
if ((ip == 0) || (strcmp(ip, "127.0.0.1") == 0) || (ip[0] == 0)) if ((ip == 0) || (g_strcmp(ip, "127.0.0.1") == 0) || (ip[0] == 0))
{ {
g_snprintf(port, 255, "/tmp/.xrdp/xrdp_chansrv_socket_%d", 7200 + display); g_snprintf(port, 255, "/tmp/.xrdp/xrdp_chansrv_socket_%d", 7200 + display);
} }

4
xrdp/xrdp_painter.c
View File

@ -127,6 +127,7 @@ xrdp_painter_font_needed(struct xrdp_painter* self)
return 0; return 0;
} }
#if 0
/*****************************************************************************/ /*****************************************************************************/
/* returns boolean, true if there is something to draw */ /* returns boolean, true if there is something to draw */
static int APP_CC static int APP_CC
@ -178,6 +179,7 @@ xrdp_painter_clip_adj(struct xrdp_painter* self, int* x, int* y,
*y = *y + dy; *y = *y + dy;
return 1; return 1;
} }
#endif
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
@ -200,6 +202,7 @@ xrdp_painter_clr_clip(struct xrdp_painter* self)
return 0; return 0;
} }
#if 0
/*****************************************************************************/ /*****************************************************************************/
static int APP_CC static int APP_CC
xrdp_painter_rop(int rop, int src, int dst) xrdp_painter_rop(int rop, int src, int dst)
@ -225,6 +228,7 @@ xrdp_painter_rop(int rop, int src, int dst)
} }
return dst; return dst;
} }
#endif
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC