kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove in_skip() in favour of in_uint8s()

Browse Source 
It was barely used and it was confusing having two macros doing the
same thing. Standardise on the more common variant.
This commit is contained in:
Pierre Ossman 2019-04-04 15:45:52 +02:00
parent 90219aac41
commit dd0217f372
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rdpedisp.c
View File

@ -64,7 +64,7 @@ rdpedisp_process_pdu(STREAM s)
/* Read DISPLAYCONTROL_HEADER */
in_uint32_le(s, type); /* type */
in_skip(s, 4); /* length */
in_uint8s(s, 4); /* length */
logger(Protocol, Debug, "rdpedisp_process_pdu(), Got PDU type %d", type);

1
stream.h
View File

@ -123,7 +123,6 @@ size_t in_ansi_string(STREAM s, char *string, size_t len);
#define in_uint8p(s,v,n) { s_assert_r(s, n); v = (s)->p; (s)->p += n; }
#define in_uint8a(s,v,n) { s_assert_r(s, n); memcpy(v,(s)->p,n); (s)->p += n; }
#define in_uint8s(s,n) { s_assert_r(s, n); (s)->p += n; }
#define in_skip(s,n) in_uint8s(s,n)
#define out_uint8(s,v) { s_assert_w(s, 1); *((s)->p++) = v; }
#define out_uint8p(s,v,n) { s_assert_w(s, n); memcpy((s)->p,v,n); (s)->p += n; }
#define out_uint8a(s,v,n) out_uint8p(s,v,n);

2
tests/resize_test.c
View File

@ -433,7 +433,7 @@ void get_width_and_height_from_mcs_connect_initial(int *width, int *height)
/* Rewind and extract the requested session size */
s_reset(s);
in_skip(s, 31);
in_uint8s(s, 31);
in_uint16_le(s, *width); /* desktopWidth */
in_uint16_le(s, *height); /* desktopHeight */