diff options
| author | metalefty <meta@vmeta.jp> | 2017-01-13 07:03:05 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 07:03:05 -0200 |
| commit | 9f5656933b057bf5c47ae46716130226f8352901 (patch) | |
| tree | 34bcf74b32bd50a4230997f2c6ff36e4b6f4b1bf | |
| parent | e08c85aa42752ccb29ee003203abb3399bbe93dc (diff) | |
| parent | 8ee886a5cc3f13aaf52251a802eb7e3c3e37f9c7 (diff) | |
| download | xrdp-proprietary-9f5656933b057bf5c47ae46716130226f8352901.tar.gz xrdp-proprietary-9f5656933b057bf5c47ae46716130226f8352901.zip | |
Merge pull request #578 from proski/warnings
Warning fixes
| -rw-r--r-- | common/trans.h | 2 | ||||
| -rw-r--r-- | sesman/chansrv/devredir.c | 6 | ||||
| -rw-r--r-- | sesman/chansrv/devredir.h | 2 | ||||
| -rw-r--r-- | sesman/libscp/libscp_v1c.c | 7 | ||||
| -rw-r--r-- | sesman/libscp/libscp_v1c_mng.h | 4 |
5 files changed, 3 insertions, 18 deletions
diff --git a/common/trans.h b/common/trans.h index 39fba5c0..53f3203a 100644 --- a/common/trans.h +++ b/common/trans.h @@ -128,7 +128,5 @@ int APP_CC trans_shutdown_tls_mode(struct trans *self); int APP_CC trans_tcp_force_read_s(struct trans *self, struct stream *in_s, int size); -int APP_CC -trans_force_write_s(struct trans *self, struct stream *out_s); #endif diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c index 111ac465..a8377e7d 100644 --- a/sesman/chansrv/devredir.c +++ b/sesman/chansrv/devredir.c @@ -46,6 +46,7 @@ #include "parse.h" #include "os_calls.h" #include "log.h" +#include "chansrv.h" #include "chansrv_fuse.h" #include "devredir.h" #include "smartcard.h" @@ -698,9 +699,8 @@ void devredir_proc_client_devlist_announce_req(struct stream *s) /* for smart cards, device data len always 0 */ - log_debug("device_type=SMARTCARD device_id=0x%x dosname=%s " - "device_data_len=%d", - g_device_id, preferred_dos_name, device_data_len); + log_debug("device_type=SMARTCARD device_id=0x%x dosname=%s", + g_device_id, preferred_dos_name); devredir_send_server_device_announce_resp(g_device_id); scard_device_announce(g_device_id); diff --git a/sesman/chansrv/devredir.h b/sesman/chansrv/devredir.h index 76900698..cbe279db 100644 --- a/sesman/chansrv/devredir.h +++ b/sesman/chansrv/devredir.h @@ -112,8 +112,6 @@ dev_redir_file_write(void *fusep, tui32 DeviceId, tui32 FileId, int APP_CC devredir_rmdir_or_file(void *fusep, tui32 device_id, const char *path, int mode); -int send_channel_data(int chan_id, char *data, int size); - /* * RDPDR_HEADER definitions */ diff --git a/sesman/libscp/libscp_v1c.c b/sesman/libscp/libscp_v1c.c index 7bc9a1d3..14f3bb0f 100644 --- a/sesman/libscp/libscp_v1c.c +++ b/sesman/libscp/libscp_v1c.c @@ -136,13 +136,6 @@ scp_v1c_resend_credentials(struct SCP_CONNECTION *c, struct SCP_SESSION *s) return _scp_v1c_check_response(c, s); } -/* 021 */ -enum SCP_CLIENT_STATES_E -scp_v1c_pwd_change(struct SCP_CONNECTION *c, char *newpass); -/* 022 */ -enum SCP_CLIENT_STATES_E -scp_v1c_pwd_change_cancel(struct SCP_CONNECTION *c); - /* 041 */ enum SCP_CLIENT_STATES_E scp_v1c_get_session_list(struct SCP_CONNECTION *c, int *scount, diff --git a/sesman/libscp/libscp_v1c_mng.h b/sesman/libscp/libscp_v1c_mng.h index 126c9113..256ca491 100644 --- a/sesman/libscp/libscp_v1c_mng.h +++ b/sesman/libscp/libscp_v1c_mng.h @@ -52,8 +52,4 @@ enum SCP_CLIENT_STATES_E scp_v1c_mng_get_session_list(struct SCP_CONNECTION* c, int* scount, struct SCP_DISCONNECTED_SESSION** s); -/* 044 */ -enum SCP_CLIENT_STATES_E -scp_v1c_select_session_cancel(struct SCP_CONNECTION* c); - #endif |