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

2000-06-17 19:37 UTC+0100 Victor Szakats <info@szelvesz.hu>

Browse Source
This commit is contained in:
Viktor Szakats
2000-06-17 17:33:58 +00:00
parent 8fafebb35b
commit adfb94a06d
7 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -1,3 +1,15 @@
2000-06-17 19:37 UTC+0100 Victor Szakats <info@szelvesz.hu>
* source/common/hbstr.c
* source/rtl/strings.c
* source/rtl/dir.c
* source/rtl/transfrm.c
! Fixed unary increment/decrement operator usage in toupper()/tolower()
functions, since these may be macros on some systems.
* source/rtl/right.c
% Some optimization.
2000-06-17 18:58 UTC+0100 Victor Szakats <info@szelvesz.hu>
* source/compiler/harbour.y

7
harbour/source/common/hbstr.c
View File

@@ -117,8 +117,11 @@ int hb_stricmp( const char * s1, const char * s2 )
while( rc == 0 && count > 0 )
{
char c1 = toupper( *s1++ );
char c2 = toupper( *s2++ );
char c1 = toupper( *s1 );
char c2 = toupper( *s2 );
s1++;
s2++;
if( c1 != c2 )
rc = ( c1 < c2 ? -1 : 1 );

4
harbour/source/rtl/dir.c
View File

@@ -256,7 +256,7 @@ static USHORT HarbourAttributesToMask( BYTE * byAttrib )
HB_TRACE(HB_TR_DEBUG, ("HarbourAttributesToMask(%p)", byAttrib));
while( ( c = toupper( *pos++ ) ) != '\0' )
while( ( c = toupper( *pos ) ) != '\0' )
{
switch( c )
{
@@ -278,6 +278,8 @@ static USHORT HarbourAttributesToMask( BYTE * byAttrib )
case 'L': usMask |= FA_REPARSE; break;
case 'P': usMask |= FA_SPARSE; break;
}
pos++;
}
return usMask;

1
harbour/source/rtl/left.c
View File

@@ -49,7 +49,6 @@ HB_FUNC( LEFT )
if( lLen > ( long ) hb_itemGetCLen( pText ) )
lLen = ( long ) hb_itemGetCLen( pText );
else if( lLen < 0 )
lLen = 0;

13
harbour/source/rtl/right.c
View File

@@ -46,19 +46,16 @@ HB_FUNC( RIGHT )
if( pText && ISNUM( 2 ) )
{
long lLen = hb_parnl( 2 );
long lTextLen = ( long ) hb_itemGetCLen( pText );
if( lLen > ( long ) hb_itemGetCLen( pText ) )
lLen = ( long ) hb_itemGetCLen( pText );
if( lLen > lTextLen )
lLen = lTextLen;
else if( lLen < 0 )
lLen = 0;
hb_retclen( hb_itemGetCPtr( pText ) + hb_itemGetCLen( pText ) - lLen, lLen );
hb_retclen( hb_itemGetCPtr( pText ) + lTextLen - lLen, lLen );
}
else
{
/* Clipper doesn't error */
hb_retc( "" );
}
hb_retc( "" ); /* Clipper doesn't error */
}

7
harbour/source/rtl/strings.c
View File

@@ -80,8 +80,11 @@ int hb_strnicmp( const char * s1, const char * s2, ULONG count )
while( rc == 0 && count > 0 )
{
char c1 = toupper( *s1++ );
char c2 = toupper( *s2++ );
char c1 = toupper( *s1 );
char c2 = toupper( *s2 );
s1++;
s2++;
if( c1 != c2 )
rc = ( c1 < c2 ? -1 : 1 );

16
harbour/source/rtl/transfrm.c
View File

@@ -204,7 +204,8 @@ HB_FUNC( TRANSFORM )
/* Upper */
case '!':
{
szResult[ ulResultPos++ ] = toupper( szExp[ ulExpPos++ ] );
szResult[ ulResultPos++ ] = toupper( szExp[ ulExpPos ] );
ulExpPos++;
bAnyPic = TRUE;
break;
}
@@ -221,7 +222,8 @@ HB_FUNC( TRANSFORM )
case 'x':
case 'X':
{
szResult[ ulResultPos++ ] = ( uiPicFlags & PF_UPPER ) ? toupper( szExp[ ulExpPos++ ] ) : szExp[ ulExpPos++ ];
szResult[ ulResultPos++ ] = ( uiPicFlags & PF_UPPER ) ? toupper( szExp[ ulExpPos ] ) : szExp[ ulExpPos ];
ulExpPos++;
bAnyPic = TRUE;
break;
}
@@ -256,13 +258,19 @@ HB_FUNC( TRANSFORM )
else
{
while( ulExpPos++ < ulExpLen )
szResult[ ulResultPos++ ] = ( uiPicFlags & PF_UPPER ) ? toupper( *szExp++ ) : *szExp++;
{
szResult[ ulResultPos++ ] = ( uiPicFlags & PF_UPPER ) ? toupper( *szExp ) : *szExp;
szExp++;
}
}
if( ( uiPicFlags & PF_REMAIN ) && ! bAnyPic )
{
while( ulExpPos++ < ulExpLen )
szResult[ ulResultPos++ ] = ( uiPicFlags & PF_UPPER ) ? toupper( *szExp++ ) : *szExp++;
{
szResult[ ulResultPos++ ] = ( uiPicFlags & PF_UPPER ) ? toupper( *szExp ) : *szExp;
szExp++;
}
}
/* Any chars left ? */