diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2016-08-05 14:38:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 14:38:41 -0700 |
| commit | 8353baab3d361bcdebb32f1677dd066e0b255dc9 (patch) | |
| tree | 38bd74dc119bdc115d5876383d7a65ff3e19debd /rdp/rdp_rdp.c | |
| parent | 81fe939dd346420d41eb2afcd6c8c05a422a9e7b (diff) | |
| parent | ace7d2c822937a9cb0637946f85d1fbd63562c44 (diff) | |
| download | xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.tar.gz xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.zip | |
Merge pull request #390 from proski/june21
Cleanups and C++ compatibility
Diffstat (limited to 'rdp/rdp_rdp.c')
| -rw-r--r-- | rdp/rdp_rdp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rdp/rdp_rdp.c b/rdp/rdp_rdp.c index d5c8e27f..1e7952c5 100644 --- a/rdp/rdp_rdp.c +++ b/rdp/rdp_rdp.c @@ -312,7 +312,7 @@ rdp_rdp_out_colcache_caps(struct rdp_rdp *self, struct stream *s) return 0; } -static char caps_0x0d[] = +static const unsigned char caps_0x0d[] = { 0x01, 0x00, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -327,11 +327,11 @@ static char caps_0x0d[] = 0x00, 0x00, 0x00, 0x00 }; -static char caps_0x0c[] = { 0x01, 0x00, 0x00, 0x00 }; +static const unsigned char caps_0x0c[] = { 0x01, 0x00, 0x00, 0x00 }; -static char caps_0x0e[] = { 0x01, 0x00, 0x00, 0x00 }; +static const unsigned char caps_0x0e[] = { 0x01, 0x00, 0x00, 0x00 }; -static char caps_0x10[] = +static const unsigned char caps_0x10[] = { 0xFE, 0x00, 0x04, 0x00, 0xFE, 0x00, 0x04, 0x00, 0xFE, 0x00, 0x08, 0x00, 0xFE, 0x00, 0x08, 0x00, @@ -345,7 +345,7 @@ static char caps_0x10[] = /* Output unknown capability sets */ static int APP_CC rdp_rdp_out_unknown_caps(struct rdp_rdp *self, struct stream *s, int id, - int length, char *caps) + int length, const unsigned char *caps) { out_uint16_le(s, id); out_uint16_le(s, length); @@ -415,9 +415,9 @@ rdp_rdp_send_confirm_active(struct rdp_rdp *self, struct stream *s) static int APP_CC rdp_rdp_process_color_pointer_pdu(struct rdp_rdp *self, struct stream *s) { - int cache_idx; - int dlen; - int mlen; + unsigned int cache_idx; + unsigned int dlen; + unsigned int mlen; struct rdp_cursor *cursor; in_uint16_le(s, cache_idx); |