mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: Finish cleanup of constant string arrays.

Browse Source
This commit is contained in:
Mike Gilbert 2011-11-30 17:40:36 -05:00
parent c676bd0ac8
commit bc3f8dfa53
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp-core/mcs.c
View File

@ -152,10 +152,11 @@
*
*/
uint8 callingDomainSelector[1] = "\x01";
uint8 calledDomainSelector[1] = "\x01";
static const uint8 callingDomainSelector[1] = "\x01";
static const uint8 calledDomainSelector[1] = "\x01";
uint8 mcs_result_enumerated[16][32] =
/*
static const char* const mcs_result_enumerated[] =
{
"rt-successful",
"rt-domain-merging",
@ -174,6 +175,7 @@ uint8 mcs_result_enumerated[16][32] =
"rt-unspecified-failure",
"rt-user-rejected"
};
*/
/**
* Read a DomainMCSPDU header.

4
libfreerdp-core/nego.c
View File

@ -27,7 +27,7 @@
#include "nego.h"
char NEGO_STATE_STRINGS[6][25] =
static const char* const NEGO_STATE_STRINGS[] =
{
"NEGO_STATE_INITIAL",
"NEGO_STATE_NLA",
@ -37,7 +37,7 @@ char NEGO_STATE_STRINGS[6][25] =
"NEGO_STATE_FINAL"
};
char PROTOCOL_SECURITY_STRINGS[3][4] =
static const char PROTOCOL_SECURITY_STRINGS[3][4] =
{
"RDP",
"TLS",

3
libfreerdp-core/nego.h
View File

@ -68,9 +68,6 @@ enum RDP_NEG_MSG
#define EXTENDED_CLIENT_DATA_SUPPORTED 0x01
extern char NEGO_STATE_STRINGS[6][25];
extern char PROTOCOL_SECURITY_STRINGS[3][4];
struct rdp_nego
{
int port;

18
libfreerdp-core/orders.c
View File

@ -24,7 +24,9 @@
#include "orders.h"
uint8 PRIMARY_DRAWING_ORDER_STRINGS[][20] =
#ifdef WITH_DEBUG_ORDERS
static const char* const PRIMARY_DRAWING_ORDER_STRINGS[] =
{
"DstBlt",
"PatBlt",
@ -55,7 +57,7 @@ uint8 PRIMARY_DRAWING_ORDER_STRINGS[][20] =
#define PRIMARY_DRAWING_ORDER_COUNT (sizeof(PRIMARY_DRAWING_ORDER_STRINGS) / sizeof(PRIMARY_DRAWING_ORDER_STRINGS[0]))
uint8 SECONDARY_DRAWING_ORDER_STRINGS[][32] =
static const char* const SECONDARY_DRAWING_ORDER_STRINGS[] =
{
"Cache Bitmap",
"Cache Color Table",
@ -70,7 +72,7 @@ uint8 SECONDARY_DRAWING_ORDER_STRINGS[][32] =
#define SECONDARY_DRAWING_ORDER_COUNT (sizeof(SECONDARY_DRAWING_ORDER_STRINGS) / sizeof(SECONDARY_DRAWING_ORDER_STRINGS[0]))
uint8 ALTSEC_DRAWING_ORDER_STRINGS[][32] =
static const char* const ALTSEC_DRAWING_ORDER_STRINGS[] =
{
"Switch Surface",
"Create Offscreen Bitmap",
@ -90,7 +92,9 @@ uint8 ALTSEC_DRAWING_ORDER_STRINGS[][32] =
#define ALTSEC_DRAWING_ORDER_COUNT (sizeof(ALTSEC_DRAWING_ORDER_STRINGS) / sizeof(ALTSEC_DRAWING_ORDER_STRINGS[0]))
uint8 PRIMARY_DRAWING_ORDER_FIELD_BYTES[] =
#endif /* WITH_DEBUG_ORDERS */
static const uint8 PRIMARY_DRAWING_ORDER_FIELD_BYTES[] =
{
DSTBLT_ORDER_FIELD_BYTES,
PATBLT_ORDER_FIELD_BYTES,
@ -119,17 +123,17 @@ uint8 PRIMARY_DRAWING_ORDER_FIELD_BYTES[] =
GLYPH_INDEX_ORDER_FIELD_BYTES
};
uint8 CBR2_BPP[] =
static const uint8 CBR2_BPP[] =
{
0, 0, 0, 8, 16, 24, 32
};
uint8 CBR23_BPP[] =
static const uint8 CBR23_BPP[] =
{
0, 0, 0, 8, 16, 24, 32
};
uint8 BMF_BPP[] =
static const uint8 BMF_BPP[] =
{
0, 1, 0, 8, 16, 24, 32
};

2
libfreerdp-core/settings.c
View File

@ -27,7 +27,7 @@
#include <freerdp/settings.h>
static char client_dll[] = "C:\\Windows\\System32\\mstscax.dll";
static const char client_dll[] = "C:\\Windows\\System32\\mstscax.dll";
rdpSettings* settings_new(void* instance)
{

4
libfreerdp-core/update.c
View File

@ -22,13 +22,15 @@
#include <freerdp/utils/rect.h>
#include <freerdp/codec/bitmap.h>
uint8 UPDATE_TYPE_STRINGS[][32] =
/*
static const char* const UPDATE_TYPE_STRINGS[] =
{
"Orders",
"Bitmap",
"Palette",
"Synchronize"
};
*/
void update_recv_orders(rdpUpdate* update, STREAM* s)
{