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

2011-11-23 00:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* src/rtl/hbini.prg
    ! fixed HB_HKEEPORDER() usage in prev patch.
      Thx for input to Qatan and Mindaugas.
This commit is contained in:
Viktor Szakats
2011-11-22 23:09:03 +00:00
parent 5ee6af4c38
commit 0c38ab1529
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-11-23 00:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/hbini.prg
! fixed HB_HKEEPORDER() usage in prev patch.
Thx for input to Qatan and Mindaugas.
2011-11-22 18:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/hbini.prg
+ keep order of ini items.

17
harbour/src/rtl/hbini.prg
View File

@@ -95,14 +95,17 @@ PROCEDURE hb_IniSetComment( cLc, cHlc )
RETURN
FUNCTION HB_IniNew( lAutoMain )
LOCAL hIni := hb_HKeepOrder( { => }, .T. )
LOCAL hIni := { => }
hb_HKeepOrder( hIni, .T. )
IF ! ISLOGICAL( lAutoMain )
lAutoMain := .T.
ENDIF
IF lAutoMain
hIni[ "MAIN" ] := hb_HKeepOrder( { => }, .T. )
hIni[ "MAIN" ] := { => }
hb_HKeepOrder( hIni[ "MAIN" ], .T. )
ENDIF
RETURN hIni
@@ -111,7 +114,9 @@ FUNCTION hb_IniRead( cFileSpec, lKeyCaseSens, cSplitters, lAutoMain )
RETURN hb_IniReadStr( iif( ISCHARACTER( cFileSpec ), hb_IniFileLow( cFileSpec ), "" ), lKeyCaseSens, cSplitters, lAutoMain )
FUNCTION hb_IniReadStr( cData, lKeyCaseSens, cSplitters, lAutoMain )
LOCAL hIni := hb_HKeepOrder( { => }, .T. )
LOCAL hIni := { => }
hb_HKeepOrder( hIni, .T. )
/* Default case sensitiveness for keys */
IF ! ISLOGICAL( lKeyCaseSens )
@@ -130,7 +135,8 @@ FUNCTION hb_IniReadStr( cData, lKeyCaseSens, cSplitters, lAutoMain )
hb_HCaseMatch( hIni, lKeyCaseSens )
IF lAutoMain
hIni[ "MAIN" ] := hb_HKeepOrder( { => }, .T. )
hIni[ "MAIN" ] := { => }
hb_HKeepOrder( hIni[ "MAIN" ], .T. )
ENDIF
RETURN hb_IniStringLow( hIni, cData, lKeyCaseSens, cSplitters, lAutoMain )
@@ -254,7 +260,8 @@ STATIC FUNCTION hb_IniStringLow( hIni, cData, lKeyCaseSens, cSplitters, lAutoMai
IF ! Empty( aKeyVal )
cLine := AllTrim( aKeyVal[ 2 ] )
IF Len( cLine ) != 0
hCurrentSection := hb_HKeepOrder( { => }, .T. )
hCurrentSection := { => }
hb_HKeepOrder( hCurrentSection, .T. )
IF ! lKeyCaseSens
cLine := Upper( cLine )
ENDIF