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

2015-06-17 12:39 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rtl/filesys.c
    ! fixed FXO_TRUNCATE flag used without FXO_SHARELOCK in POSIX systems

  * src/rtl/net.c
    ! typo in variable name

  * src/vm/task.c
    ! variable scope

  * src/compiler/compi18n.c
    * minor variable type update

  * ChangeLog.txt
    ! formatting
This commit is contained in:
Viktor Szakats
2015-06-17 13:30:50 +02:00
parent a7ad431c1d
commit e364f8634b
5 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/compi18n.c
View File

@@ -205,11 +205,11 @@ void hb_compI18nAddPlural( HB_COMP_DECL, const char ** szTexts, HB_ULONG ulCount
for( ul = 1; ul < ulCount && pString->uiPlurals < HB_I18N_PLURAL_MAX; ++ul )
{
const char * szText = hb_compIdentifierNew( HB_COMP_PARAM, szTexts[ ul ], HB_IDENT_COPY );
HB_ULONG ulPlural;
HB_UINT uiPlural;
for( ulPlural = 0; ulPlural < pString->uiPlurals; ++ulPlural )
for( uiPlural = 0; uiPlural < pString->uiPlurals; ++uiPlural )
{
if( pString->szPlurals[ ulPlural ] == szText )
if( pString->szPlurals[ uiPlural ] == szText )
{
szText = NULL;
break;

6
src/rtl/filesys.c
View File

@@ -3842,10 +3842,12 @@ HB_FHANDLE hb_fsExtOpen( const char * pszFileName, const char * pDefExt,
uiFlags |= FO_CREAT;
if( uiExFlags & FXO_UNIQUE )
uiFlags |= FO_EXCL;
#if ! defined( HB_USE_SHARELOCKS )
#if defined( HB_USE_SHARELOCKS )
else if( ( uiExFlags & ( FXO_TRUNCATE | FXO_SHARELOCK ) ) == FXO_TRUNCATE )
#else
else if( uiExFlags & FXO_TRUNCATE )
uiFlags |= FO_TRUNC;
#endif
uiFlags |= FO_TRUNC;
}
hFile = hb_fsOpen( szPath, uiFlags );

4
src/rtl/net.c
View File

@@ -137,8 +137,8 @@ char * hb_netname( void )
szValue[ 0 ] = szValue[ 15 ] = '\0';
regs.HB_XREGS.ax = 0x5E00;
regs.HB_XREGS.dx = FP_OFF( pszValue );
sregs.ds = FP_SEG( pszValue );
regs.HB_XREGS.dx = FP_OFF( szValue );
sregs.ds = FP_SEG( szValue );
HB_DOS_INT86X( 0x21, &regs, &regs, &sregs );

12
src/vm/task.c
View File

@@ -734,11 +734,10 @@ void hb_taskSuspend( void )
/* TODO: do not start task immediately */
void hb_taskResume( void * pTaskPtr )
{
PHB_TASKINFO pTask = ( PHB_TASKINFO ) pTaskPtr, pCurrTask;
PHB_TASKINFO pTask = ( PHB_TASKINFO ) pTaskPtr;
if( s_currTask != pTask )
{
pCurrTask = s_currTask;
switch( pTask->state )
{
#if ! defined( HB_HAS_UCONTEXT )
@@ -763,9 +762,12 @@ void hb_taskResume( void * pTaskPtr )
/* no break */
case TASK_RUNNING:
#if defined( HB_HAS_UCONTEXT )
s_currTask = pTask;
/* save current execution context and switch to the new one */
swapcontext( &pCurrTask->context, &pTask->context );
{
PHB_TASKINFO pCurrTask = s_currTask;
s_currTask = pTask;
/* save current execution context and switch to the new one */
swapcontext( &pCurrTask->context, &pTask->context );
}
#else
/* save current execution context */
if( setjmp( s_currTask->context ) == 0 )