diff options
| -rw-r--r-- | sesman/session.c | 9 | ||||
| -rw-r--r-- | sesman/tcp.c | 7 | ||||
| -rw-r--r-- | sesman/tcp.h | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sesman/session.c b/sesman/session.c index c1a2c525..0739ca21 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -42,7 +42,7 @@ session_get_bydata(char* name, int width, int height, int bpp) /*THREAD-FIX require chain lock */ lock_chain_acquire(); - tmp=g_sessions; + tmp = g_sessions; while (tmp != 0) { @@ -55,9 +55,9 @@ session_get_bydata(char* name, int width, int height, int bpp) lock_chain_release(); return tmp->item; } - tmp=tmp->next; + tmp = tmp->next; } - + /*THREAD-FIX release chain lock */ lock_chain_release(); return 0; @@ -161,6 +161,7 @@ for user %s denied", username); g_get_current_dir(cur_dir, 255); display = 10; + /*while (x_server_running(display) && display < 50)*/ /* we search for a free display up to max_sessions */ /* we should need no more displays than this */ @@ -170,7 +171,7 @@ for user %s denied", username); while (x_server_running(display)) { display++; - if ((display - 10) > g_cfg.sess.max_sessions || display >= 50) + if (((display - 10) > g_cfg.sess.max_sessions) || (display >= 50)) { return 0; } diff --git a/sesman/tcp.c b/sesman/tcp.c index 92e20503..58cedd43 100644 --- a/sesman/tcp.c +++ b/sesman/tcp.c @@ -66,7 +66,7 @@ tcp_force_recv(int sck, char* data, int len) #ifndef LIBSCP_CLIENT lock_fork_critical_section_end(block); #endif - + return 0; } @@ -80,7 +80,7 @@ tcp_force_send(int sck, char* data, int len) int block; block = lock_fork_critical_section_start(); #endif - + while (len > 0) { sent = g_tcp_send(sck, data, len, 0); @@ -109,7 +109,6 @@ tcp_force_send(int sck, char* data, int len) #ifndef LIBSCP_CLIENT lock_fork_critical_section_end(block); #endif - + return 0; } - diff --git a/sesman/tcp.h b/sesman/tcp.h index fae31174..57f9716d 100644 --- a/sesman/tcp.h +++ b/sesman/tcp.h @@ -53,4 +53,3 @@ int DEFAULT_CC tcp_force_send(int sck, char* data, int len); #endif - |