diff options
Diffstat (limited to 'sesman')
-rw-r--r-- | sesman/chansrv/clipboard.c | 2 | ||||
-rw-r--r-- | sesman/chansrv/clipboard_common.h | 3 | ||||
-rw-r--r-- | sesman/libscp/libscp_session.c | 18 | ||||
-rw-r--r-- | sesman/libscp/libscp_session.h | 18 | ||||
-rw-r--r-- | sesman/libscp/libscp_v1s.c | 7 | ||||
-rw-r--r-- | sesman/libscp/libscp_v1s.h | 7 | ||||
-rw-r--r-- | sesman/libscp/libscp_v1s_mng.c | 2 | ||||
-rw-r--r-- | sesman/libscp/libscp_v1s_mng.h | 2 | ||||
-rw-r--r-- | sesman/scp_v1.c | 4 | ||||
-rw-r--r-- | sesman/scp_v1_mng.c | 4 |
10 files changed, 35 insertions, 32 deletions
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c index cf98b5f2..7a9795d6 100644 --- a/sesman/chansrv/clipboard.c +++ b/sesman/chansrv/clipboard.c @@ -582,7 +582,7 @@ clipboard_send_format_ack(void) /*****************************************************************************/ /* returns number of bytes written */ int APP_CC -clipboard_out_unicode(struct stream *s, char *text, int num_chars) +clipboard_out_unicode(struct stream *s, const char *text, int num_chars) { int index; int lnum_chars; diff --git a/sesman/chansrv/clipboard_common.h b/sesman/chansrv/clipboard_common.h index 5a74de66..1944b760 100644 --- a/sesman/chansrv/clipboard_common.h +++ b/sesman/chansrv/clipboard_common.h @@ -127,7 +127,8 @@ struct clip_file_desc /* CLIPRDR_FILEDESCRIPTOR */ char cFileName[256]; }; -int APP_CC clipboard_out_unicode(struct stream *s, char *text, int num_chars); +int APP_CC clipboard_out_unicode(struct stream *s, const char *text, + int num_chars); int APP_CC clipboard_in_unicode(struct stream *s, char *text, int *num_chars); #endif diff --git a/sesman/libscp/libscp_session.c b/sesman/libscp/libscp_session.c index 91f93b54..e6c77058 100644 --- a/sesman/libscp/libscp_session.c +++ b/sesman/libscp/libscp_session.c @@ -164,7 +164,7 @@ scp_session_set_rsr(struct SCP_SESSION *s, tui8 rsr) /*******************************************************************/ int -scp_session_set_locale(struct SCP_SESSION *s, char *str) +scp_session_set_locale(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -180,7 +180,7 @@ scp_session_set_locale(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_username(struct SCP_SESSION *s, char *str) +scp_session_set_username(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -206,7 +206,7 @@ scp_session_set_username(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_password(struct SCP_SESSION *s, char *str) +scp_session_set_password(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -232,7 +232,7 @@ scp_session_set_password(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_domain(struct SCP_SESSION *s, char *str) +scp_session_set_domain(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -258,7 +258,7 @@ scp_session_set_domain(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_program(struct SCP_SESSION *s, char *str) +scp_session_set_program(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -284,7 +284,7 @@ scp_session_set_program(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_directory(struct SCP_SESSION *s, char *str) +scp_session_set_directory(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -310,7 +310,7 @@ scp_session_set_directory(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_client_ip(struct SCP_SESSION *s, char *str) +scp_session_set_client_ip(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -336,7 +336,7 @@ scp_session_set_client_ip(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_hostname(struct SCP_SESSION *s, char *str) +scp_session_set_hostname(struct SCP_SESSION *s, const char *str) { if (0 == str) { @@ -362,7 +362,7 @@ scp_session_set_hostname(struct SCP_SESSION *s, char *str) /*******************************************************************/ int -scp_session_set_errstr(struct SCP_SESSION *s, char *str) +scp_session_set_errstr(struct SCP_SESSION *s, const char *str) { if (0 == str) { diff --git a/sesman/libscp/libscp_session.h b/sesman/libscp/libscp_session.h index 4a9e9d70..51b6d03e 100644 --- a/sesman/libscp/libscp_session.h +++ b/sesman/libscp/libscp_session.h @@ -59,28 +59,28 @@ int scp_session_set_rsr(struct SCP_SESSION* s, tui8 rsr); int -scp_session_set_locale(struct SCP_SESSION* s, char* str); +scp_session_set_locale(struct SCP_SESSION* s, const char *str); int -scp_session_set_username(struct SCP_SESSION* s, char* str); +scp_session_set_username(struct SCP_SESSION* s, const char *str); int -scp_session_set_password(struct SCP_SESSION* s, char* str); +scp_session_set_password(struct SCP_SESSION* s, const char *str); int -scp_session_set_domain(struct SCP_SESSION* s, char* str); +scp_session_set_domain(struct SCP_SESSION* s, const char *str); int -scp_session_set_program(struct SCP_SESSION* s, char* str); +scp_session_set_program(struct SCP_SESSION* s, const char *str); int -scp_session_set_directory(struct SCP_SESSION* s, char* str); +scp_session_set_directory(struct SCP_SESSION* s, const char *str); int -scp_session_set_client_ip(struct SCP_SESSION* s, char* str); +scp_session_set_client_ip(struct SCP_SESSION* s, const char *str); int -scp_session_set_hostname(struct SCP_SESSION* s, char* str); +scp_session_set_hostname(struct SCP_SESSION* s, const char *str); int scp_session_set_addr(struct SCP_SESSION* s, int type, const void* addr); @@ -89,7 +89,7 @@ int scp_session_set_display(struct SCP_SESSION* s, SCP_DISPLAY display); int -scp_session_set_errstr(struct SCP_SESSION* s, char* str); +scp_session_set_errstr(struct SCP_SESSION* s, const char *str); /** * diff --git a/sesman/libscp/libscp_v1s.c b/sesman/libscp/libscp_v1s.c index 6cdf0b00..284c9b52 100644 --- a/sesman/libscp/libscp_v1s.c +++ b/sesman/libscp/libscp_v1s.c @@ -202,7 +202,7 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION *c, struct SCP_SES } enum SCP_SERVER_STATES_E -scp_v1s_deny_connection(struct SCP_CONNECTION *c, char *reason) +scp_v1s_deny_connection(struct SCP_CONNECTION *c, const char *reason) { int rlen; @@ -235,7 +235,8 @@ scp_v1s_deny_connection(struct SCP_CONNECTION *c, char *reason) } enum SCP_SERVER_STATES_E -scp_v1s_request_password(struct SCP_CONNECTION *c, struct SCP_SESSION *s, char *reason) +scp_v1s_request_password(struct SCP_CONNECTION *c, struct SCP_SESSION *s, + const char *reason) { tui8 sz; tui32 version; @@ -392,7 +393,7 @@ scp_v1s_connect_new_session(struct SCP_CONNECTION *c, SCP_DISPLAY d) /* 032 */ enum SCP_SERVER_STATES_E -scp_v1s_connection_error(struct SCP_CONNECTION *c, char *error) +scp_v1s_connection_error(struct SCP_CONNECTION *c, const char *error) { tui16 len; diff --git a/sesman/libscp/libscp_v1s.h b/sesman/libscp/libscp_v1s.h index cc29d70d..69e64038 100644 --- a/sesman/libscp/libscp_v1s.h +++ b/sesman/libscp/libscp_v1s.h @@ -53,10 +53,11 @@ scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SESSION** s, int skipVchk); */ /* 002 */ enum SCP_SERVER_STATES_E -scp_v1s_deny_connection(struct SCP_CONNECTION* c, char* reason); +scp_v1s_deny_connection(struct SCP_CONNECTION* c, const char *reason); enum SCP_SERVER_STATES_E -scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char* reason); +scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, + const char *reason); /* 020 */ enum SCP_SERVER_STATES_E @@ -72,7 +73,7 @@ scp_v1s_connect_new_session(struct SCP_CONNECTION* c, SCP_DISPLAY d); /* 032 */ enum SCP_SERVER_STATES_E -scp_v1s_connection_error(struct SCP_CONNECTION* c, char* error); +scp_v1s_connection_error(struct SCP_CONNECTION* c, const char *error); /* 040 */ enum SCP_SERVER_STATES_E diff --git a/sesman/libscp/libscp_v1s_mng.c b/sesman/libscp/libscp_v1s_mng.c index e48fc86b..d8c5290d 100644 --- a/sesman/libscp/libscp_v1s_mng.c +++ b/sesman/libscp/libscp_v1s_mng.c @@ -138,7 +138,7 @@ scp_v1s_mng_allow_connection(struct SCP_CONNECTION *c, struct SCP_SESSION *s) /* 003 */ enum SCP_SERVER_STATES_E -scp_v1s_mng_deny_connection(struct SCP_CONNECTION *c, char *reason) +scp_v1s_mng_deny_connection(struct SCP_CONNECTION *c, const char *reason) { int rlen; diff --git a/sesman/libscp/libscp_v1s_mng.h b/sesman/libscp/libscp_v1s_mng.h index 867931a5..437a06d2 100644 --- a/sesman/libscp/libscp_v1s_mng.h +++ b/sesman/libscp/libscp_v1s_mng.h @@ -61,7 +61,7 @@ scp_v1s_mng_allow_connection(struct SCP_CONNECTION* c, struct SCP_SESSION* s); */ /* 003 */ enum SCP_SERVER_STATES_E -scp_v1s_mng_deny_connection(struct SCP_CONNECTION* c, char* reason); +scp_v1s_mng_deny_connection(struct SCP_CONNECTION* c, const char *reason); /** * diff --git a/sesman/scp_v1.c b/sesman/scp_v1.c index 92e1dad5..1501606d 100644 --- a/sesman/scp_v1.c +++ b/sesman/scp_v1.c @@ -31,7 +31,7 @@ extern struct config_sesman *g_cfg; /* in sesman.c */ -static void parseCommonStates(enum SCP_SERVER_STATES_E e, char *f); +static void parseCommonStates(enum SCP_SERVER_STATES_E e, const char *f); /******************************************************************************/ void DEFAULT_CC @@ -209,7 +209,7 @@ scp_v1_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) g_free(slist); } -static void parseCommonStates(enum SCP_SERVER_STATES_E e, char *f) +static void parseCommonStates(enum SCP_SERVER_STATES_E e, const char *f) { switch (e) { diff --git a/sesman/scp_v1_mng.c b/sesman/scp_v1_mng.c index 2624644a..29496466 100644 --- a/sesman/scp_v1_mng.c +++ b/sesman/scp_v1_mng.c @@ -30,7 +30,7 @@ extern struct config_sesman *g_cfg; /* in sesman.c */ -static void parseCommonStates(enum SCP_SERVER_STATES_E e, char *f); +static void parseCommonStates(enum SCP_SERVER_STATES_E e, const char *f); /******************************************************************************/ void DEFAULT_CC @@ -109,7 +109,7 @@ scp_v1_mng_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) auth_end(data); } -static void parseCommonStates(enum SCP_SERVER_STATES_E e, char *f) +static void parseCommonStates(enum SCP_SERVER_STATES_E e, const char *f) { switch (e) { |