From 294d83814def717c80f38cde78a3df342ddfab6a Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 2 Nov 2008 13:29:00 +0000 Subject: [PATCH] 2008-11-02 14:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbextern.ch ! Added all missing LANG and CODEPAGE modules. [TOMERGE 1.0] * ChangeLog - Removed duplicate entry of mine. * source/common/hbstr.c * source/rtl/version.c * source/rtl/filesys.c * Minor formatting. * source/codepage/cpcs852.c * source/codepage/cpsk852.c * source/codepage/cpcsiso.c * source/codepage/cpcswin.c * source/codepage/cpskiso.c * source/codepage/cpskwin.c * source/codepage/cpcskam.c * source/codepage/cpskkam.c * Removed unnecessary ending ';' --- harbour/ChangeLog | 32 ++++++++++++++++++++++--------- harbour/include/hbextern.ch | 18 ++++++++++++++++- harbour/source/codepage/cpcs852.c | 2 +- harbour/source/codepage/cpcsiso.c | 2 +- harbour/source/codepage/cpcskam.c | 2 +- harbour/source/codepage/cpcswin.c | 2 +- harbour/source/codepage/cpsk852.c | 2 +- harbour/source/codepage/cpskiso.c | 2 +- harbour/source/codepage/cpskkam.c | 2 +- harbour/source/codepage/cpskwin.c | 2 +- harbour/source/common/hbstr.c | 18 ++++++++--------- harbour/source/rtl/filesys.c | 2 +- harbour/source/rtl/version.c | 15 ++------------- 13 files changed, 60 insertions(+), 41 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 272a704895..aa50640996 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,29 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-02 14:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * include/hbextern.ch + ! Added all missing LANG and CODEPAGE modules. + [TOMERGE 1.0] + + * ChangeLog + - Removed duplicate entry of mine. + + * source/common/hbstr.c + * source/rtl/version.c + * source/rtl/filesys.c + * Minor formatting. + + * source/codepage/cpcs852.c + * source/codepage/cpsk852.c + * source/codepage/cpcsiso.c + * source/codepage/cpcswin.c + * source/codepage/cpskiso.c + * source/codepage/cpskwin.c + * source/codepage/cpcskam.c + * source/codepage/cpskkam.c + * Removed unnecessary ending ';' + 2008-11-02 13:36 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbexprb.c ! fixed possible GPF/internal memory corruption in code like: @@ -125,15 +148,6 @@ * source/rtl/gtwvt/gtwvt.c * Minor formatting. -2008-11-01 22:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu) - * source/rtl/hbi18n.c - * Modified __i18n_gettext() to not RTE when trs table - is non-array (like NIL). - * USHORT -> ULONG in a few places. - - * source/rtl/gtwvt/gtwvt.c - * Minor formatting. - 2008-11-01 21:13 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/itemseri.c ! fixed 8-bytes integer numbers deserialization diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index fdb843e090..936743a6a5 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -978,8 +978,10 @@ EXTERNAL HB_CODEPAGE_CSKAM EXTERNAL HB_CODEPAGE_CSWIN EXTERNAL HB_CODEPAGE_DE850 EXTERNAL HB_CODEPAGE_DEISO +EXTERNAL HB_CODEPAGE_DEWIN EXTERNAL HB_CODEPAGE_EL737 EXTERNAL HB_CODEPAGE_ELWIN +EXTERNAL HB_CODEPAGE_EN EXTERNAL HB_CODEPAGE_ES850 EXTERNAL HB_CODEPAGE_ESMWIN EXTERNAL HB_CODEPAGE_ESWIN @@ -1006,6 +1008,7 @@ EXTERNAL HB_CODEPAGE_PT850 EXTERNAL HB_CODEPAGE_PTISO EXTERNAL HB_CODEPAGE_RU1251 EXTERNAL HB_CODEPAGE_RU866 +EXTERNAL HB_CODEPAGE_RUISO EXTERNAL HB_CODEPAGE_RUKOI8 EXTERNAL HB_CODEPAGE_SK852 EXTERNAL HB_CODEPAGE_SKISO @@ -1026,8 +1029,11 @@ EXTERNAL HB_CODEPAGE_UA866 EXTERNAL HB_CODEPAGE_UAKOI8 /* lang support */ +EXTERNAL HB_LANG_BE866 +EXTERNAL HB_LANG_BEWIN EXTERNAL HB_LANG_BG866 EXTERNAL HB_LANG_BGISO +EXTERNAL HB_LANG_BGMIK EXTERNAL HB_LANG_BGWIN EXTERNAL HB_LANG_CA EXTERNAL HB_LANG_CS852 @@ -1038,7 +1044,6 @@ EXTERNAL HB_LANG_DE EXTERNAL HB_LANG_DEWIN EXTERNAL HB_LANG_EL EXTERNAL HB_LANG_ELWIN -EXTERNAL HB_LANG_EN EXTERNAL HB_LANG_EO EXTERNAL HB_LANG_ES EXTERNAL HB_LANG_ESWIN @@ -1047,8 +1052,10 @@ EXTERNAL HB_LANG_FR EXTERNAL HB_LANG_GL EXTERNAL HB_LANG_HE862 EXTERNAL HB_LANG_HEWIN +EXTERNAL HB_LANG_HR437 EXTERNAL HB_LANG_HR852 EXTERNAL HB_LANG_HRISO +EXTERNAL HB_LANG_HRWIN EXTERNAL HB_LANG_HU852 EXTERNAL HB_LANG_HUCWI EXTERNAL HB_LANG_HUISO @@ -1057,16 +1064,22 @@ EXTERNAL HB_LANG_ID EXTERNAL HB_LANG_IS850 EXTERNAL HB_LANG_IT EXTERNAL HB_LANG_KO +EXTERNAL HB_LANG_LTWIN EXTERNAL HB_LANG_NL EXTERNAL HB_LANG_PL852 EXTERNAL HB_LANG_PLISO EXTERNAL HB_LANG_PLMAZ EXTERNAL HB_LANG_PLWIN EXTERNAL HB_LANG_PT +EXTERNAL HB_LANG_PTISO EXTERNAL HB_LANG_RO EXTERNAL HB_LANG_RU866 EXTERNAL HB_LANG_RUKOI8 EXTERNAL HB_LANG_RUWIN +EXTERNAL HB_LANG_SK852 +EXTERNAL HB_LANG_SKISO +EXTERNAL HB_LANG_SKKAM +EXTERNAL HB_LANG_SKWIN EXTERNAL HB_LANG_SL437 EXTERNAL HB_LANG_SL852 EXTERNAL HB_LANG_SLISO @@ -1076,6 +1089,9 @@ EXTERNAL HB_LANG_SRISO EXTERNAL HB_LANG_SRWIN EXTERNAL HB_LANG_TR857 EXTERNAL HB_LANG_TRWIN +EXTERNAL HB_LANG_UA866 +EXTERNAL HB_LANG_UAKOI8 +EXTERNAL HB_LANG_UAWIN EXTERNAL HB_LANG_ZHB5 EXTERNAL HB_LANG_ZHGB diff --git a/harbour/source/codepage/cpcs852.c b/harbour/source/codepage/cpcs852.c index 9fb525487c..edf1f45af5 100644 --- a/harbour/source/codepage/cpcs852.c +++ b/harbour/source/codepage/cpcs852.c @@ -90,7 +90,7 @@ static HB_CODEPAGE s_codepage = { "CS852", "a~~bcd~e~~~fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( CS852 ); +HB_CODEPAGE_INIT( CS852 ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_CS852 diff --git a/harbour/source/codepage/cpcsiso.c b/harbour/source/codepage/cpcsiso.c index ebf8147ade..40dc4b356a 100644 --- a/harbour/source/codepage/cpcsiso.c +++ b/harbour/source/codepage/cpcsiso.c @@ -90,7 +90,7 @@ static HB_CODEPAGE s_codepage = { "CSISO", "a~~bcd~e~~~fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( CSISO ); +HB_CODEPAGE_INIT( CSISO ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_CSISO diff --git a/harbour/source/codepage/cpcskam.c b/harbour/source/codepage/cpcskam.c index 27d1ee2b24..2764f77e92 100644 --- a/harbour/source/codepage/cpcskam.c +++ b/harbour/source/codepage/cpcskam.c @@ -90,7 +90,7 @@ static HB_CODEPAGE s_codepage = { "CSKAM", "a~~bcd~e~~~ fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( CSKAM ); +HB_CODEPAGE_INIT( CSKAM ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_CSKAM diff --git a/harbour/source/codepage/cpcswin.c b/harbour/source/codepage/cpcswin.c index 8215c4d1f5..d3742ceba0 100644 --- a/harbour/source/codepage/cpcswin.c +++ b/harbour/source/codepage/cpcswin.c @@ -90,7 +90,7 @@ static HB_CODEPAGE s_codepage = { "CSWIN", "a~~bcd~e~~~fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( CSWIN ); +HB_CODEPAGE_INIT( CSWIN ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_CSWIN diff --git a/harbour/source/codepage/cpsk852.c b/harbour/source/codepage/cpsk852.c index fa998035ba..7a3789b235 100644 --- a/harbour/source/codepage/cpsk852.c +++ b/harbour/source/codepage/cpsk852.c @@ -89,7 +89,7 @@ static HB_CODEPAGE s_codepage = { "SK852", "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( SK852 ); +HB_CODEPAGE_INIT( SK852 ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_SK852 diff --git a/harbour/source/codepage/cpskiso.c b/harbour/source/codepage/cpskiso.c index dd3aeb6402..a70a00a836 100644 --- a/harbour/source/codepage/cpskiso.c +++ b/harbour/source/codepage/cpskiso.c @@ -89,7 +89,7 @@ static HB_CODEPAGE s_codepage = { "SKISO", "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( SKISO ); +HB_CODEPAGE_INIT( SKISO ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_SKISO diff --git a/harbour/source/codepage/cpskkam.c b/harbour/source/codepage/cpskkam.c index 98f84c2bd5..f4b1c0ac2a 100644 --- a/harbour/source/codepage/cpskkam.c +++ b/harbour/source/codepage/cpskkam.c @@ -89,7 +89,7 @@ static HB_CODEPAGE s_codepage = { "SKKAM", "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( SKKAM ); +HB_CODEPAGE_INIT( SKKAM ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_SKKAM diff --git a/harbour/source/codepage/cpskwin.c b/harbour/source/codepage/cpskwin.c index 6e7091f20b..c2fdbda96b 100644 --- a/harbour/source/codepage/cpskwin.c +++ b/harbour/source/codepage/cpskwin.c @@ -89,7 +89,7 @@ static HB_CODEPAGE s_codepage = { "SKWIN", "a~~bcd~.dz..d.e~fgh.ch.i~jkl~~mn~o~~pqr~st~u~vwxy~z", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; -HB_CODEPAGE_INIT( SKWIN ); +HB_CODEPAGE_INIT( SKWIN ) #if defined( HB_PRAGMA_STARTUP ) #pragma startup hb_codepage_Init_SKWIN diff --git a/harbour/source/common/hbstr.c b/harbour/source/common/hbstr.c index 885dddf964..c182640694 100644 --- a/harbour/source/common/hbstr.c +++ b/harbour/source/common/hbstr.c @@ -553,7 +553,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, ULONG ulLen, HB_LONG { fNeg = FALSE; } - else if( szNum[ulPos] == '-' ) + else if( szNum[ ulPos ] == '-' ) { fNeg = TRUE; ulPos++; @@ -561,22 +561,22 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, ULONG ulLen, HB_LONG else { fNeg = FALSE; - if( szNum[ulPos] == '+' ) + if( szNum[ ulPos ] == '+' ) ulPos++; } *lVal = 0; /* Hex Number */ - if( fPCode && ulPos + 1 < ulLen && szNum[ulPos] == '0' && - ( szNum[ulPos+1] == 'X' || szNum[ulPos+1] == 'x' ) ) + if( fPCode && ulPos + 1 < ulLen && szNum[ ulPos ] == '0' && + ( szNum[ ulPos + 1 ] == 'X' || szNum[ ulPos + 1 ] == 'x' ) ) { ulPos += 2; iWidth = HB_DEFAULT_WIDTH; fHex = TRUE; for( ; ulPos < ulLen; ulPos++ ) { - c = szNum[ulPos]; + c = szNum[ ulPos ]; if( c >= '0' && c <= '9' ) c -= '0'; else if( c >= 'A' && c <= 'F' ) @@ -600,7 +600,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, ULONG ulLen, HB_LONG for( ; ulPos < ulLen; ulPos++ ) { - c = szNum[ulPos]; + c = szNum[ ulPos ]; if( c >= '0' && c <= '9' ) { if( fDbl ) @@ -613,7 +613,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, ULONG ulLen, HB_LONG } else { - *dVal = (double) *lVal * 10.0 + ( c - '0' ); + *dVal = ( double ) *lVal * 10.0 + ( c - '0' ); fDbl = TRUE; } if( fDec ) @@ -629,7 +629,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, ULONG ulLen, HB_LONG { while( !fDec && ulPos < ulLen ) { - if( szNum[ulPos++] == '.' ) + if( szNum[ ulPos++ ] == '.' ) fDec = TRUE; else iWidth++; @@ -654,7 +654,7 @@ static BOOL hb_str2number( BOOL fPCode, const char* szNum, ULONG ulLen, HB_LONG #endif fDec ) ) { - *dVal = (double) *lVal; + *dVal = ( double ) *lVal; fDbl = TRUE; } if( iDec ) diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c index 5c897da4b8..7dcd372dca 100644 --- a/harbour/source/rtl/filesys.c +++ b/harbour/source/rtl/filesys.c @@ -2605,7 +2605,7 @@ HB_EXPORT USHORT hb_fsCurDirBuff( USHORT uiDrive, BYTE * pbyBuffer, ULONG ulLen #elif defined(HB_OS_OS2) && defined(__GNUC__) hb_vmUnlock(); - fResult = ( _getcwd1( (char *) pbyBuffer, uiDrive + 'A' - 1 ) == 0 ); + fResult = ( _getcwd1( ( char * ) pbyBuffer, uiDrive + 'A' - 1 ) == 0 ); hb_fsSetIOError( fResult, 0 ); hb_vmLock(); diff --git a/harbour/source/rtl/version.c b/harbour/source/rtl/version.c index 2c7c8d4be4..eaec03b6e6 100644 --- a/harbour/source/rtl/version.c +++ b/harbour/source/rtl/version.c @@ -4,9 +4,9 @@ /* * Harbour Project source code: - * OS(), VERSION(), HB_COMPILER() functions + * Version related functions * - * Copyright 1999 {list of individual authors and e-mail addresses} + * Copyright 1999-2008 Viktor Szakats * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify @@ -50,17 +50,6 @@ * */ -/* - * The following parts are Copyright of the individual authors. - * www - http://www.harbour-project.org - * - * Copyright 1999-2008 Viktor Szakats - * HB_VERSION(), HB_COMPILER() - * - * See doc/license.txt for licensing terms. - * - */ - #include "hbapi.h" #include "hbvm.h"