From 594438e5ebe963efaf6c8c512713d3ba49deb680 Mon Sep 17 00:00:00 2001 From: Henrik Andersson Date: Fri, 29 Sep 2017 16:29:00 +0200 Subject: [PATCH] Make deprecated rdp_out_unistr() static --- proto.h | 1 - rdp.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/proto.h b/proto.h index 53af58d..1b35bba 100644 --- a/proto.h +++ b/proto.h @@ -146,7 +146,6 @@ RD_BOOL rd_lock_file(int fd, int start, int len); /* rdp5.c */ void rdp5_process(STREAM s); /* rdp.c */ -void rdp_out_unistr(STREAM s, char *string, int len); void rdp_in_unistr(STREAM s, int in_len, char **string, uint32 * str_size); void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1, uint16 param2); diff --git a/rdp.c b/rdp.c index 47cc862..34895b7 100644 --- a/rdp.c +++ b/rdp.c @@ -80,6 +80,8 @@ extern RD_BOOL g_has_reconnect_random; extern uint8 g_client_random[SEC_RANDOM_SIZE]; static uint32 g_packetno; +static void rdp_out_unistr(STREAM s, char *string, int len); + /* Receive an RDP packet */ static STREAM rdp_recv(uint8 * type) @@ -171,7 +173,7 @@ rdp_send_data(STREAM s, uint8 data_pdu_type) /* Output a string in Unicode with mandatory null termination. If string is NULL or len is 0, write an unicode null termination to stream. */ -void +static void rdp_out_unistr_mandatory_null(STREAM s, char *string, int len) { /* LEGACY: @@ -187,7 +189,7 @@ rdp_out_unistr_mandatory_null(STREAM s, char *string, int len) } /* Output a string in Unicode */ -void +static void rdp_out_unistr(STREAM s, char *string, int len) { /* LEGACY: