summaryrefslogtreecommitdiffstats
path: root/sesman/chansrv
diff options
context:
space:
mode:
authorPavel Roskin <plroskin@gmail.com>2016-04-22 23:40:48 -0700
committerPavel Roskin <plroskin@gmail.com>2016-04-23 00:18:38 -0700
commit70f3d4c5e23ab53bf82bc5e2029001896bf3823e (patch)
treede922895b37cef884df737372669ac41241b2dcc /sesman/chansrv
parent95e1603f9dda52a7846ad454082712ce9a7aa75e (diff)
downloadxrdp-proprietary-70f3d4c5e23ab53bf82bc5e2029001896bf3823e.tar.gz
xrdp-proprietary-70f3d4c5e23ab53bf82bc5e2029001896bf3823e.zip
Fix warnings for unused variables read from byte streams
Diffstat (limited to 'sesman/chansrv')
-rw-r--r--sesman/chansrv/chansrv.c3
-rw-r--r--sesman/chansrv/clipboard_file.c3
-rw-r--r--sesman/chansrv/drdynvc.c8
3 files changed, 6 insertions, 8 deletions
diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
index fad2841d..e3d2f5d2 100644
--- a/sesman/chansrv/chansrv.c
+++ b/sesman/chansrv/chansrv.c
@@ -756,7 +756,6 @@ int DEFAULT_CC
my_trans_data_in(struct trans *trans)
{
struct stream *s = (struct stream *)NULL;
- int id = 0;
int size = 0;
int error = 0;
@@ -772,7 +771,7 @@ my_trans_data_in(struct trans *trans)
LOGM((LOG_LEVEL_DEBUG, "my_trans_data_in:"));
s = trans_get_in_s(trans);
- in_uint32_le(s, id);
+ in_uint8s(s, 4); /* id */
in_uint32_le(s, size);
error = trans_force_read(trans, size - 8);
diff --git a/sesman/chansrv/clipboard_file.c b/sesman/chansrv/clipboard_file.c
index 52079c6c..562ee82d 100644
--- a/sesman/chansrv/clipboard_file.c
+++ b/sesman/chansrv/clipboard_file.c
@@ -531,7 +531,6 @@ clipboard_process_file_request(struct stream *s, int clip_msg_status,
int lindex;
int dwFlags;
int nPositionLow;
- int nPositionHigh;
int cbRequested;
//int clipDataId;
@@ -541,7 +540,7 @@ clipboard_process_file_request(struct stream *s, int clip_msg_status,
in_uint32_le(s, lindex);
in_uint32_le(s, dwFlags);
in_uint32_le(s, nPositionLow);
- in_uint32_le(s, nPositionHigh);
+ in_uint8s(s, 4); /* nPositionHigh */
in_uint32_le(s, cbRequested);
//in_uint32_le(s, clipDataId); /* options, used when locking */
if (dwFlags & CB_FILECONTENTS_SIZE)
diff --git a/sesman/chansrv/drdynvc.c b/sesman/chansrv/drdynvc.c
index 5c20661e..5b9224ca 100644
--- a/sesman/chansrv/drdynvc.c
+++ b/sesman/chansrv/drdynvc.c
@@ -342,24 +342,24 @@ drdynvc_process_data_first(struct stream *s, unsigned char cmd)
uint32_t chan_id;
int bytes_in_stream;
- int data_len;
int Len;
drdynvc_get_chan_id(s, cmd, &chan_id);
Len = (cmd >> 2) & 0x03;
+ /* skip data_len */
if (Len == 0)
{
- in_uint8(s, data_len);
+ in_uint8s(s, 1);
}
else if (Len == 1)
{
- in_uint16_le(s, data_len);
+ in_uint8s(s, 2);
}
else
{
- in_uint32_le(s, data_len);
+ in_uint8s(s, 4);
}
bytes_in_stream = stream_length_after_p(s);