diff options
| -rw-r--r-- | xrdp/xrdp.c | 5 | ||||
| -rw-r--r-- | xrdp/xrdp_listen.c | 1 | ||||
| -rw-r--r-- | xrdp/xrdp_mm.c | 6 | ||||
| -rw-r--r-- | xrdp/xrdp_painter.c | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c index ac20fd72..8fbbd8f7 100644 --- a/xrdp/xrdp.c +++ b/xrdp/xrdp.c @@ -310,7 +310,7 @@ main(int argc, char** argv) g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH); /* starting logging subsystem */ - error = log_start(cfg_file,"XRDP"); + error = log_start(cfg_file, "XRDP"); if (error != LOG_STARTUP_OK) { @@ -323,6 +323,9 @@ main(int argc, char** argv) g_writeln("error opening log file [%s]. quitting.", getLogFile(text, 255)); break; + default: + g_writeln("log_start error"); + break; } g_deinit(); g_exit(1); diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c index bbdd729a..312ae5e4 100644 --- a/xrdp/xrdp_listen.c +++ b/xrdp/xrdp_listen.c @@ -278,7 +278,6 @@ xrdp_listen_main_loop(struct xrdp_listen* self) tbus robjs[8]; tbus term_obj; tbus sync_obj; - tbus sck_obj; tbus done_obj; self->status = 1; diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index a2edaa14..ec19e008 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -698,7 +698,7 @@ xrdp_mm_connect_chansrv(struct xrdp_mm* self, char* ip, char* port) self->usechansrv = 1; /* 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 */ 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 display; int rv; - int uid; - int gid; char text[256]; char ip[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); self->wm->dragging = 0; /* 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); } diff --git a/xrdp/xrdp_painter.c b/xrdp/xrdp_painter.c index b7caee31..b91be16d 100644 --- a/xrdp/xrdp_painter.c +++ b/xrdp/xrdp_painter.c @@ -127,6 +127,7 @@ xrdp_painter_font_needed(struct xrdp_painter* self) return 0; } +#if 0 /*****************************************************************************/ /* returns boolean, true if there is something to draw */ static int APP_CC @@ -178,6 +179,7 @@ xrdp_painter_clip_adj(struct xrdp_painter* self, int* x, int* y, *y = *y + dy; return 1; } +#endif /*****************************************************************************/ int APP_CC @@ -200,6 +202,7 @@ xrdp_painter_clr_clip(struct xrdp_painter* self) return 0; } +#if 0 /*****************************************************************************/ static int APP_CC xrdp_painter_rop(int rop, int src, int dst) @@ -225,6 +228,7 @@ xrdp_painter_rop(int rop, int src, int dst) } return dst; } +#endif /*****************************************************************************/ int APP_CC |