fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-06-20 12:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbct/tab.c
  * src/pp/ppcore.c
  * include/hbdefs.h
    ! Pacifying these very old msvc warnings:
      'warning C4310: cast truncates constant value'
    ; Check me pls.
    ; TOFIX: These are the remaining ones:
      ---
      macro.c(1315) : warning C4310: cast truncates constant value
      ../../../dbffpt1.c(505) : warning C4310: cast truncates constant value
      ../../../dbffpt1.c(888) : warning C4310: cast truncates constant value
      ../../../dbffpt1.c(1625) : warning C4310: cast truncates constant value
      ../../../dbffpt1.c(1688) : warning C4310: cast truncates constant value
      ../../../sxcompr.c(697) : warning C4310: cast truncates constant value
      ../../../sxcompr.c(697) : warning C4310: cast truncates constant value
      ../../../sxcompr.c(697) : warning C4310: cast truncates constant value
      ../../../netiosrv.c(714) : warning C4310: cast truncates constant value
      ../../../netiosrv.c(714) : warning C4310: cast truncates constant value
      ../../../netiosrv.c(714) : warning C4310: cast truncates constant value
      ---

  * src/rtl/gtchrmap.c
    * Whitspace formatting
This commit is contained in:
Viktor Szakats
2010-06-20 10:50:32 +00:00
parent d442c6fee9
commit 7a80cb71e6
5 changed files with 144 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
harbour/ChangeLog
View File

@@ -16,6 +16,32 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-06-20 12:34 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbct/tab.c
* src/pp/ppcore.c
* include/hbdefs.h
! Pacifying these very old msvc warnings:
'warning C4310: cast truncates constant value'
; Check me pls.
; TOFIX: These are the remaining ones:
---
macro.c(1315) : warning C4310: cast truncates constant value
../../../dbffpt1.c(505) : warning C4310: cast truncates constant value
../../../dbffpt1.c(888) : warning C4310: cast truncates constant value
../../../dbffpt1.c(1625) : warning C4310: cast truncates constant value
../../../dbffpt1.c(1688) : warning C4310: cast truncates constant value
../../../sxcompr.c(697) : warning C4310: cast truncates constant value
../../../sxcompr.c(697) : warning C4310: cast truncates constant value
../../../sxcompr.c(697) : warning C4310: cast truncates constant value
../../../netiosrv.c(714) : warning C4310: cast truncates constant value
../../../netiosrv.c(714) : warning C4310: cast truncates constant value
../../../netiosrv.c(714) : warning C4310: cast truncates constant value
---
* src/rtl/gtchrmap.c
* Whitspace formatting
2010-06-20 11:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* src/vm/cmdarg.c
* src/common/hbffind.c

8
harbour/contrib/hbct/tab.c
View File

@@ -199,10 +199,10 @@ HB_FUNC( TABEXPAND )
sTabCnt--;
sIndex++;
}
else if( ( unsigned char ) cChar == 141 )
else if( ( unsigned char ) cChar == HB_CHAR_SOFT1 )
{
/* soft carriage return */
*( pcRet + sRetLen ) = ( char ) 141;
*( pcRet + sRetLen ) = HB_CHAR_SOFT1;
sRetLen++;
sIndex++;
if( iIgnore141 )
@@ -405,7 +405,7 @@ HB_FUNC( TABPACK )
sTabIndex = 0;
sIndex++;
}
else if( ( unsigned char ) cChar == 141 && !iIgnore141 )
else if( ( unsigned char ) cChar == HB_CHAR_SOFT1 && !iIgnore141 )
{
/* soft carriage return */
@@ -416,7 +416,7 @@ HB_FUNC( TABPACK )
*( pcRet + sRetLen ) = cFill;
sRetLen++;
}
*( pcRet + sRetLen ) = ( char ) 141;
*( pcRet + sRetLen ) = HB_CHAR_SOFT1;
sRetLen++;
sTabIndex = 0;
sIndex++;

8
harbour/include/hbdefs.h
View File

@@ -1649,11 +1649,11 @@ typedef int HB_COLOR;
/* Harbour specific character constants */
#define HB_CHAR_HARD1 ( ( char ) HB_CHAR_CR )
#define HB_CHAR_HARD2 ( ( char ) HB_CHAR_LF )
#define HB_CHAR_HARD1 HB_CHAR_CR
#define HB_CHAR_HARD2 HB_CHAR_LF
#define HB_CHAR_SOFT1 ( ( char ) 141 )
#define HB_CHAR_SOFT2 ( ( char ) HB_CHAR_LF )
#define HB_CHAR_SOFT1 '\x8D' /* 141 */
#define HB_CHAR_SOFT2 HB_CHAR_LF
#define HB_ISUPPER( c ) ( ( c ) >= 'A' && ( c ) <= 'Z' )
#define HB_ISLOWER( c ) ( ( c ) >= 'a' && ( c ) <= 'z' )

4
harbour/src/pp/ppcore.c
View File

@@ -694,8 +694,8 @@ static void hb_pp_readLine( PHB_PP_STATE pState )
if( iBOM && ch == 0xBF && hb_membufLen( pState->pBuffer ) == 3 )
{
iBOM = 0;
if( hb_membufPtr( pState->pBuffer )[ 0 ] == ( char ) 0xEF &&
hb_membufPtr( pState->pBuffer )[ 1 ] == ( char ) 0xBB )
if( hb_membufPtr( pState->pBuffer )[ 0 ] == '\xEF' &&
hb_membufPtr( pState->pBuffer )[ 1 ] == '\xBB' )
hb_membufFlush( pState->pBuffer );
}
}

216
harbour/src/rtl/gtchrmap.c
View File

@@ -59,145 +59,145 @@
#if defined( HB_OS_UNIX ) || defined( HB_OS_DOS )
#define MAX_CHAR_VAL 0xff
#define HB_CHRMAP(a,c) ( ( (a) << 16 ) | (c) )
#define MAX_CHAR_VAL 0xff
#define HB_CHRMAP( a, c ) ( ( (a) << 16 ) | (c) )
const char * hb_gt_szCharMapFileDefault = "/etc/harbour/hb-charmap.def";
static void chrmap_init( int *piTransTbl )
static void chrmap_init( int * piTransTbl )
{
int i;
for( i = 0; i < 256; ++i )
piTransTbl[i] = HB_CHRMAP( i < 128 ? 1 : 0, i );
piTransTbl[ i ] = HB_CHRMAP( i < 128 ? 1 : 0, i );
piTransTbl[155] = HB_CHRMAP( 1, '.' );
piTransTbl[ 155 ] = HB_CHRMAP( 1, '.' );
}
static void chrmap_dotctrl( int *piTransTbl )
static void chrmap_dotctrl( int * piTransTbl )
{
int i;
for( i = 0; i < 32; ++i )
piTransTbl[i] = piTransTbl[i+128] = HB_CHRMAP( 1, '.' );
piTransTbl[ i ] = piTransTbl[ i + 128 ] = HB_CHRMAP( 1, '.' );
}
static void chrmap_ascictrl( int *piTransTbl )
static void chrmap_ascictrl( int * piTransTbl )
{
piTransTbl[04] = HB_CHRMAP( 1, '#' );
piTransTbl[16] = HB_CHRMAP( 1, '>' );
piTransTbl[17] = HB_CHRMAP( 1, '<' );
piTransTbl[30] = HB_CHRMAP( 1, '^' );
piTransTbl[31] = HB_CHRMAP( 1, 'v' );
piTransTbl[24] = HB_CHRMAP( 1, '^' );
piTransTbl[25] = HB_CHRMAP( 1, 'v' );
piTransTbl[26] = HB_CHRMAP( 1, '>' );
piTransTbl[27] = HB_CHRMAP( 1, '<' );
piTransTbl[ 04] = HB_CHRMAP( 1, '#' );
piTransTbl[ 16] = HB_CHRMAP( 1, '>' );
piTransTbl[ 17] = HB_CHRMAP( 1, '<' );
piTransTbl[ 30] = HB_CHRMAP( 1, '^' );
piTransTbl[ 31] = HB_CHRMAP( 1, 'v' );
piTransTbl[ 24] = HB_CHRMAP( 1, '^' );
piTransTbl[ 25] = HB_CHRMAP( 1, 'v' );
piTransTbl[ 26] = HB_CHRMAP( 1, '>' );
piTransTbl[ 27] = HB_CHRMAP( 1, '<' );
}
static void chrmap_acscbox( int *piTransTbl )
static void chrmap_acscbox( int * piTransTbl )
{
piTransTbl[ 04] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[ 16] = HB_CHRMAP( 5, '+' ); /* ACS_RARROW */
piTransTbl[ 17] = HB_CHRMAP( 5, ',' ); /* ACS_LARROW */
piTransTbl[ 24] = HB_CHRMAP( 5, '-' ); /* ACS_UARROW */
piTransTbl[ 25] = HB_CHRMAP( 5, '.' ); /* ACS_DARROW */
piTransTbl[ 26] = HB_CHRMAP( 5, '+' ); /* ACS_RARROW */
piTransTbl[ 27] = HB_CHRMAP( 5, ',' ); /* ACS_LARROW */
piTransTbl[ 30] = HB_CHRMAP( 5, '-' ); /* ACS_UARROW */
piTransTbl[ 31] = HB_CHRMAP( 5, '.' ); /* ACS_DARROW */
piTransTbl[ 04 ] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[ 16 ] = HB_CHRMAP( 5, '+' ); /* ACS_RARROW */
piTransTbl[ 17 ] = HB_CHRMAP( 5, ',' ); /* ACS_LARROW */
piTransTbl[ 24 ] = HB_CHRMAP( 5, '-' ); /* ACS_UARROW */
piTransTbl[ 25 ] = HB_CHRMAP( 5, '.' ); /* ACS_DARROW */
piTransTbl[ 26 ] = HB_CHRMAP( 5, '+' ); /* ACS_RARROW */
piTransTbl[ 27 ] = HB_CHRMAP( 5, ',' ); /* ACS_LARROW */
piTransTbl[ 30 ] = HB_CHRMAP( 5, '-' ); /* ACS_UARROW */
piTransTbl[ 31 ] = HB_CHRMAP( 5, '.' ); /* ACS_DARROW */
piTransTbl[176] = HB_CHRMAP( 5, 'h' ); /* ACS_BOARD */
piTransTbl[177] = HB_CHRMAP( 5, 'a' ); /* ACS_CKBOARD */
piTransTbl[178] = HB_CHRMAP( 5, '0' ); /* ACS_BLOCK */
piTransTbl[179] = HB_CHRMAP( 5, 'x' ); /* ACS_VLINE */
piTransTbl[180] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[181] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[182] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[183] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[184] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[185] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[186] = HB_CHRMAP( 5, 'x' ); /* ACS_VLINE */
piTransTbl[187] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[188] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[189] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[190] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[191] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[192] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[193] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[194] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[195] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[196] = HB_CHRMAP( 5, 'q' ); /* ACS_HLINE */
piTransTbl[197] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[198] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[199] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[200] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[201] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
piTransTbl[202] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[203] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[204] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[205] = HB_CHRMAP( 5, 'q' ); /* ACS_HLINE */
piTransTbl[206] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[207] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[208] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[209] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[210] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[211] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[212] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[213] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
piTransTbl[214] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
piTransTbl[215] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[216] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[217] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[218] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
piTransTbl[ 176 ] = HB_CHRMAP( 5, 'h' ); /* ACS_BOARD */
piTransTbl[ 177 ] = HB_CHRMAP( 5, 'a' ); /* ACS_CKBOARD */
piTransTbl[ 178 ] = HB_CHRMAP( 5, '0' ); /* ACS_BLOCK */
piTransTbl[ 179 ] = HB_CHRMAP( 5, 'x' ); /* ACS_VLINE */
piTransTbl[ 180 ] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[ 181 ] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[ 182 ] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[ 183 ] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[ 184 ] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[ 185 ] = HB_CHRMAP( 5, 'u' ); /* ACS_RTEE */
piTransTbl[ 186 ] = HB_CHRMAP( 5, 'x' ); /* ACS_VLINE */
piTransTbl[ 187 ] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[ 188 ] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[ 189 ] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[ 190 ] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[ 191 ] = HB_CHRMAP( 5, 'k' ); /* ACS_URCORNER */
piTransTbl[ 192 ] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[ 193 ] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[ 194 ] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[ 195 ] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[ 196 ] = HB_CHRMAP( 5, 'q' ); /* ACS_HLINE */
piTransTbl[ 197 ] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[ 198 ] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[ 199 ] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[ 200 ] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[ 201 ] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
piTransTbl[ 202 ] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[ 203 ] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[ 204 ] = HB_CHRMAP( 5, 't' ); /* ACS_LTEE */
piTransTbl[ 205 ] = HB_CHRMAP( 5, 'q' ); /* ACS_HLINE */
piTransTbl[ 206 ] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[ 207 ] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[ 208 ] = HB_CHRMAP( 5, 'v' ); /* ACS_BTEE */
piTransTbl[ 209 ] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[ 210 ] = HB_CHRMAP( 5, 'w' ); /* ACS_TTEE */
piTransTbl[ 211 ] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[ 212 ] = HB_CHRMAP( 5, 'm' ); /* ACS_LLCORNER */
piTransTbl[ 213 ] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
piTransTbl[ 214 ] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
piTransTbl[ 215 ] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[ 216 ] = HB_CHRMAP( 5, 'n' ); /* ACS_PLUS */
piTransTbl[ 217 ] = HB_CHRMAP( 5, 'j' ); /* ACS_LRCORNER */
piTransTbl[ 218 ] = HB_CHRMAP( 5, 'l' ); /* ACS_ULCORNER */
#if 0
piTransTbl[219] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[220] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[221] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[222] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[223] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[ 219 ] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[ 220 ] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[ 221 ] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[ 222 ] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
piTransTbl[ 223 ] = HB_CHRMAP( 5, '`' ); /* ACS_DIAMOND */
#endif
}
static void skip_blank( char **buf )
static void skip_blank( char ** buf )
{
while( **buf != '\0' && **buf == ' ' )
++(*buf);
++( *buf );
}
static int get_val( char **buf )
static int get_val( char ** buf )
{
int n = -1;
char c;
if( (*buf)[0] == '\'' && (*buf)[1] != '\0' && (*buf)[2] == '\'' )
if( ( *buf )[0] == '\'' && ( *buf )[1] != '\0' && ( *buf )[ 2 ] == '\'' )
{
n = (*buf)[1] & 0xff;
*buf+=3;
n = ( *buf )[1] & 0xff;
*buf += 3;
}
else if( (*buf)[0] == '0' && ((*buf)[1] == 'x' || (*buf)[1] == 'X') )
else if( ( *buf )[0] == '0' && ( ( *buf )[1] == 'x' || ( *buf )[1] == 'X' ) )
{
n = 0;
*buf+=2;
for(; (**buf >= '0' && **buf <= '9') ||
(**buf >= 'A' && **buf <= 'F') ||
(**buf >= 'a' && **buf <= 'f'); (*buf)++ )
*buf += 2;
for(; ( **buf >= '0' && **buf <= '9' ) ||
( **buf >= 'A' && **buf <= 'F' ) ||
( **buf >= 'a' && **buf <= 'f' ); ( *buf )++ )
{
c = **buf | 0x20;
n = (n << 4) + c - (c > '9' ? ('a' - 10) : '0');
n = ( n << 4 ) + c - ( c > '9' ? ( 'a' - 10 ) : '0' );
}
}
else if( **buf >= '0' && **buf <= '9' )
{
n = 0;
for(; (**buf >= '0' && **buf <= '9'); (*buf)++ )
n = n * 10 + (**buf - '0');
for(; ( **buf >= '0' && **buf <= '9' ); ( *buf )++ )
n = n * 10 + ( **buf - '0' );
}
return n > 0xff ? -1 : n;
}
static int parse_line( char *buf, int *from, int *to, char *op, int *val, int *mod )
static int parse_line( char * buf, int * from, int * to, char * op, int * val, int * mod )
{
char *s, *s2;
int ret = 0, ina = 0;
@@ -258,9 +258,9 @@ static int parse_line( char *buf, int *from, int *to, char *op, int *val, int *m
{
++s;
skip_blank( &s );
if( *s == '*' && (s[1] == '+' || s[1] == '-' || s[1] == '&' ||
s[1] == '|' || s[1] == '^' || s[1] == '=' ||
s[1] == ' ') )
if( *s == '*' && ( s[1] == '+' || s[1] == '-' || s[1] == '&' ||
s[1] == '|' || s[1] == '^' || s[1] == '=' ||
s[1] == ' ' ) )
{
*op = s[1];
s+=2;
@@ -279,10 +279,10 @@ static int parse_line( char *buf, int *from, int *to, char *op, int *val, int *m
return ret;
}
static int chrmap_parse( FILE *fp, const char *pszTerm, int *nTransTbl, const char *pszFile )
static int chrmap_parse( FILE * fp, const char * pszTerm, int * nTransTbl, const char * pszFile )
{
int line = 0, from = 0, to = 0, val = 0, mod = 0, i, n;
char buf[256], *s, op = 0;
char buf[ 256 ], *s, op = 0;
int isTerm = 0;
fpos_t pos;
@@ -311,8 +311,8 @@ static int chrmap_parse( FILE *fp, const char *pszTerm, int *nTransTbl, const ch
i = strlen( pszTerm );
while( isTerm == 0 && ( s = strstr( s + 1, pszTerm ) ) != NULL )
{
if( *(s-1) == '|' &&
( s[i] == '|' || s[i] == '\0' ) )
if( *( s - 1 ) == '|' &&
( s[ i ] == '|' || s[ i ] == '\0' ) )
isTerm = 1;
}
}
@@ -374,8 +374,8 @@ static int chrmap_parse( FILE *fp, const char *pszTerm, int *nTransTbl, const ch
static int hb_gt_chrmapread( const char *pszFile, const char *pszTerm, int *nTransTbl )
{
FILE *fp;
char buf[256], *ptr, *pTerm;
FILE * fp;
char buf[ 256 ], *ptr, *pTerm;
int isTerm = -1;
fp = hb_fopen( pszFile, "r" );
@@ -401,20 +401,20 @@ static int hb_gt_chrmapread( const char *pszFile, const char *pszTerm, int *nTra
return isTerm;
}
int hb_gt_chrmapinit( int *piTransTbl, const char *pszTerm, HB_BOOL fSetACSC )
int hb_gt_chrmapinit( int * piTransTbl, const char * pszTerm, HB_BOOL fSetACSC )
{
char *pszFree = NULL, *pszFile, szFile[ HB_PATH_MAX ];
char * pszFree = NULL, * pszFile, szFile[ HB_PATH_MAX ];
int nRet = -1;
chrmap_init( piTransTbl );
if( pszTerm == NULL || *pszTerm == '\0' )
pszTerm = pszFree = hb_getenv("HB_TERM");
pszTerm = pszFree = hb_getenv( "HB_TERM" );
if( pszTerm == NULL || *pszTerm == '\0' )
{
if( pszFree )
hb_xfree( pszFree );
pszTerm = pszFree = hb_getenv("TERM");
pszTerm = pszFree = hb_getenv( "TERM" );
}
if( pszTerm != NULL && *pszTerm != '\0' )
@@ -459,16 +459,16 @@ int hb_gt_chrmapinit( int *piTransTbl, const char *pszTerm, HB_BOOL fSetACSC )
/*
int main(int argc, char **argv)
{
int piTransTbl[256], i;
int piTransTbl[ 256 ], i;
if( hb_gt_chrmapinit( piTransTbl, NULL ) == -1 )
{
printf("cannot init charmap.\n");
exit(1);
printf( "cannot init charmap.\n" );
exit( 1 );
}
for( i=0; i<256; i++)
printf("%3d -> %3d : %d\n", i, piTransTbl[i]&0xff, piTransTbl[i]>>16);
for( i = 0; i < 256; i++ )
printf( "%3d -> %3d : %d\n", i, piTransTbl[ i ] & 0xff, piTransTbl[ i ] >> 16 );
return 0;
}