diff options
| -rw-r--r-- | common/os_calls.c | 18 | ||||
| -rw-r--r-- | xrdp/xrdp_listen.c | 2 | ||||
| -rw-r--r-- | xrdp/xrdp_mm.c | 6 |
3 files changed, 15 insertions, 11 deletions
diff --git a/common/os_calls.c b/common/os_calls.c index ae48fc94..2a97fc69 100644 --- a/common/os_calls.c +++ b/common/os_calls.c @@ -1079,13 +1079,15 @@ g_obj_wait(tbus* read_objs, int rcount, tbus* write_objs, int wcount, FD_SET(sck, &rfds); if (sck > max) { - max = sck; /*max holds the highest socket/descriptor number */ + max = sck; /*max holds the highest socket/descriptor number */ } } } - }else if(rcount>0){ - g_writeln("Programming error read_objs is null"); - return 1; /*error*/ + } + else if(rcount>0) + { + g_writeln("Programming error read_objs is null"); + return 1; /*error*/ } if(write_objs!=NULL){ for (i = 0; i < wcount; i++) @@ -1099,9 +1101,11 @@ g_obj_wait(tbus* read_objs, int rcount, tbus* write_objs, int wcount, } } } - }else if(wcount>0){ - g_writeln("Programming error write_objs is null"); - return 1; /*error*/ + } + else if(wcount>0) + { + g_writeln("Programming error write_objs is null"); + return 1; /*error*/ } res = select(max + 1, &rfds, &wfds, 0, ptime); if (res < 0) diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c index b79ce1c2..0270d337 100644 --- a/xrdp/xrdp_listen.c +++ b/xrdp/xrdp_listen.c @@ -334,7 +334,7 @@ xrdp_listen_main_loop(struct xrdp_listen* self) if (g_is_wait_obj_set(done_obj)) /* pro_done_event */ { g_reset_wait_obj(done_obj); - /* a process has died remove it from lists*/ + /* a process has died remove it from lists*/ xrdp_listen_delete_done_pro(self); } /* Run the callback when accept() returns a new socket*/ diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 5c8d325f..84a4a851 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -305,7 +305,7 @@ xrdp_mm_setup_mod1(struct xrdp_mm* self) if (func == 0) { g_snprintf(text, 255, "error finding proc mod_exit in %s, not a valid " - "xrdp backend", lib); + "xrdp backend", lib); xrdp_wm_log_msg(self->wm, text); } self->mod_exit = (int (*)(struct xrdp_mod*))func; @@ -318,7 +318,7 @@ xrdp_mm_setup_mod1(struct xrdp_mm* self) self->mod->size, self->mod->version); } }else{ - g_writeln("no mod_init or mod_exit address found") ; + g_writeln("no mod_init or mod_exit address found"); } } else @@ -1058,7 +1058,7 @@ xrdp_mm_connect(struct xrdp_mm* self) rv = 1 ; /* failure */ } }else{ - g_writeln("Failure setting up module"); + g_writeln("Failure setting up module"); } if (self->wm->login_mode != 10) { |