From 87f17bdf5c63b637e86d8d7bc05e8aeabf49bfb4 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Fri, 9 May 2008 19:56:25 +0000 Subject: [PATCH] added the g prefix to some global variable git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25401 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/terminal/TermParse.cpp | 52 ++++++++++++++++----------------- src/apps/terminal/VTPrsTbl.c | 28 +++++++++--------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/apps/terminal/TermParse.cpp b/src/apps/terminal/TermParse.cpp index 801b9a509a..512981357f 100644 --- a/src/apps/terminal/TermParse.cpp +++ b/src/apps/terminal/TermParse.cpp @@ -27,19 +27,19 @@ ////////////////////////////////////////////////////////////////////////////// -extern int utf8_groundtable[]; /* UTF8 Ground table */ -extern int cs96_groundtable[]; /* CS96 Ground table */ -extern int iso8859_groundtable[]; /* ISO8859 & EUC Ground table */ -extern int sjis_groundtable[]; /* Shift-JIS Ground table */ +extern int gUTF8GroundTable[]; /* UTF8 Ground table */ +extern int gCS96GroundTable[]; /* CS96 Ground table */ +extern int gISO8859GroundTable[]; /* ISO8859 & EUC Ground table */ +extern int gSJISGroundTable[]; /* Shift-JIS Ground table */ -extern int esctable[]; /* ESC */ -extern int csitable[]; /* ESC [ */ -extern int dectable[]; /* ESC [ ? */ -extern int scrtable[]; /* ESC # */ -extern int igntable[]; /* ignore table */ -extern int iestable[]; /* ignore ESC table */ -extern int eigtable[]; /* ESC ignore table */ -extern int mbcstable[]; /* ESC $ */ +extern int gEscTable[]; /* ESC */ +extern int gCsiTable[]; /* ESC [ */ +extern int gDecTable[]; /* ESC [ ? */ +extern int gScrTable[]; /* ESC # */ +extern int gIgnoreTable[]; /* ignore table */ +extern int gIesTable[]; /* ignore ESC table */ +extern int gEscIgnoreTable[]; /* ESC ignore table */ +extern int gMbcsTable[]; /* ESC $ */ @@ -302,7 +302,7 @@ TermParse::EscParse() int row, col; /* default coding system is UTF8 */ - int *groundtable = utf8_groundtable; + int *groundtable = gUTF8GroundTable; int *parsestate = groundtable; while (!fQuitting) { @@ -325,19 +325,19 @@ TermParse::EscParse() case B_ISO8_CONVERSION: case B_ISO9_CONVERSION: case B_ISO10_CONVERSION: - groundtable = iso8859_groundtable; + groundtable = gISO8859GroundTable; break; case B_SJIS_CONVERSION: - groundtable = sjis_groundtable; + groundtable = gSJISGroundTable; break; case B_EUC_CONVERSION: case B_EUC_KR_CONVERSION: case B_JIS_CONVERSION: - groundtable = iso8859_groundtable; + groundtable = gISO8859GroundTable; break; case M_UTF8: default: - groundtable = utf8_groundtable; + groundtable = gUTF8GroundTable; break; } parsestate = groundtable; @@ -452,12 +452,12 @@ TermParse::EscParse() case CASE_MBCS: /* ESC $ */ - parsestate = mbcstable; + parsestate = gMbcsTable; break; case CASE_GSETS: /* ESC $ ? */ - parsestate = cs96_groundtable; + parsestate = gCS96GroundTable; cs96 = 1; break; @@ -490,17 +490,17 @@ TermParse::EscParse() case CASE_ESC: /* escape */ - parsestate = esctable; + parsestate = gEscTable; break; case CASE_IGNORE_STATE: /* Ies: ignore anything else */ - parsestate = igntable; + parsestate = gIgnoreTable; break; case CASE_IGNORE_ESC: /* Ign: escape */ - parsestate = iestable; + parsestate = gIesTable; break; case CASE_IGNORE: @@ -515,12 +515,12 @@ TermParse::EscParse() case CASE_SCR_STATE: // ESC # /* enter scr state */ - parsestate = scrtable; + parsestate = gScrTable; break; case CASE_ESC_IGNORE: /* unknown escape sequence */ - parsestate = eigtable; + parsestate = gEscIgnoreTable; break; case CASE_ESC_DIGIT: // ESC [ number @@ -538,7 +538,7 @@ TermParse::EscParse() case CASE_DEC_STATE: /* enter dec mode */ - parsestate = dectable; + parsestate = gDecTable; break; case CASE_ICH: // ESC [@ insert charactor @@ -810,7 +810,7 @@ TermParse::EscParse() /* enter csi state */ nparam = 1; param[0] = DEFAULT; - parsestate = csitable; + parsestate = gCsiTable; break; case CASE_OSC: diff --git a/src/apps/terminal/VTPrsTbl.c b/src/apps/terminal/VTPrsTbl.c index 7f5f1fe2b4..0b484a1944 100644 --- a/src/apps/terminal/VTPrsTbl.c +++ b/src/apps/terminal/VTPrsTbl.c @@ -33,7 +33,7 @@ #define USE_MBCS #define USE_ISO2022 -int utf8_groundtable[] = /* UTF8 coding ground table */ +int gUTF8GroundTable[] = /* UTF8 coding ground table */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -357,7 +357,7 @@ CASE_UTF8_3BYTE, CASE_UTF8_3BYTE, }; -int cs96_groundtable[] = /* charset 96 table */ +int gCS96GroundTable[] = /* charset 96 table */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -681,7 +681,7 @@ CASE_IGNORE, CASE_IGNORE, }; -int iso8859_groundtable[] = +int gISO8859GroundTable[] = { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -1005,7 +1005,7 @@ CASE_PRINT_GR, CASE_PRINT_GR, }; -int csitable[] = /* ESC [ */ +int gCsiTable[] = /* ESC [ */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -1329,7 +1329,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int dectable[] = /* ESC [ ? */ +int gDecTable[] = /* ESC [ ? */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -1670,7 +1670,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int eigtable[] = /* CASE_ESC_IGNORE */ +int gEscIgnoreTable[] = /* CASE_ESC_IGNORE */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -1995,7 +1995,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int esctable[] = /* ESC */ +int gEscTable[] = /* ESC */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -2337,7 +2337,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int iestable[] = /* CASE_IGNORE_ESC */ +int gIesTable[] = /* CASE_IGNORE_ESC */ { /* NUL SOH STX ETX */ CASE_IGNORE_STATE, @@ -2661,7 +2661,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int igntable[] = /* CASE_IGNORE_STATE */ +int gIgnoreTable[] = /* CASE_IGNORE_STATE */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -2985,7 +2985,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int scrtable[] = /* ESC # */ +int gScrTable[] = /* ESC # */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -3309,7 +3309,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int scstable[] = /* ESC ( etc. */ +int gScsTable[] = /* ESC ( etc. */ { /* NUL SOH STX ETX */ CASE_IGNORE, @@ -3737,7 +3737,7 @@ CASE_GROUND_STATE, }; #ifdef USE_MBCS -int mbcstable[] = { +int gMbcsTable[] = { /* NUL SOH STX ETX */ CASE_IGNORE, CASE_IGNORE, @@ -4060,7 +4060,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, }; -int smbcstable[] = { +int gSmbcsTable[] = { /* NUL SOH STX ETX */ CASE_IGNORE, CASE_IGNORE, @@ -4385,7 +4385,7 @@ CASE_GROUND_STATE, #endif -int sjis_groundtable[] = /* Shift-JIS ground table. */ +int gSJISGroundTable[] = /* Shift-JIS ground table. */ { /* NUL SOH STX ETX */ CASE_IGNORE,