morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[core] fix nonstring warnings

Browse Source 
Initialize variables as arrays to avoid nonstring warnings with gcc >=
15 and clang
This commit is contained in:
Armin Novak
2026-01-08 09:40:52 +01:00
parent f85072dd61
commit af8c75f196
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libfreerdp/core/gcc.c
View File

@@ -339,8 +339,8 @@ static DWORD rdp_version_common(wLog* log, DWORD serverVersion, DWORD clientVers
*/
static const BYTE t124_02_98_oid[6] = { 0, 0, 20, 124, 0, 1 };
static const BYTE h221_cs_key[4] = "Duca";
static const BYTE h221_sc_key[4] = "McDn";
static const BYTE h221_cs_key[4] = { 'D', 'u', 'c', 'a' };
static const BYTE h221_sc_key[4] = { 'M', 'c', 'D', 'n' };
/**
* Read a GCC Conference Create Request.

4
libfreerdp/core/mcs.c
View File

@@ -166,8 +166,8 @@
*
*/
static const BYTE callingDomainSelector[1] = "\x01";
static const BYTE calledDomainSelector[1] = "\x01";
static const BYTE callingDomainSelector[1] = { 0x01 };
static const BYTE calledDomainSelector[1] = { 0x01 };
/*
static const char* const mcs_result_enumerated[] =

20
libfreerdp/core/security.c
View File

@@ -33,19 +33,17 @@ static const BYTE BB[] = { 'B', 'B' };
static const BYTE CCC[] = { 'C', 'C', 'C' };
/* 0x36 repeated 40 times */
static const BYTE pad1[40] = { "\x36\x36\x36\x36\x36\x36\x36\x36"
"\x36\x36\x36\x36\x36\x36\x36\x36"
"\x36\x36\x36\x36\x36\x36\x36\x36"
"\x36\x36\x36\x36\x36\x36\x36\x36"
"\x36\x36\x36\x36\x36\x36\x36\x36" };
static const BYTE pad1[40] = { 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36 };
/* 0x5C repeated 48 times */
static const BYTE pad2[48] = { "\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C"
"\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C"
"\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C"
"\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C"
"\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C"
"\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C" };
static const BYTE pad2[48] = { 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C,
0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C };
static const BYTE fips_reverse_table[256] = {
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,

2
libfreerdp/core/utils.c
View File

@@ -320,7 +320,7 @@ const char* utils_is_vsock(const char* hostname)
if (!hostname)
return NULL;
const char vsock[8] = "vsock://";
const char vsock[8] = { 'v', 's', 'o', 'c', 'k', ':', '/', '/' };
if (strncmp(hostname, vsock, sizeof(vsock)) == 0)
return &hostname[sizeof(vsock)];
return NULL;