Fix unintended renaming

pull/1/head
Darrell Anderson 12 years ago
parent a4da7bd19a
commit f1ce972ed0

@ -1398,20 +1398,20 @@ int sqliteOsReadLock(OsFile *id){
params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioRefNum = id->refNumRF;
params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosMode = fsFromStart;
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){ while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
UInt32 finalTicks; UInt32 finalTicks;
Delay(1, &finalTicks); /* 1/60 sec */ Delay(1, &finalTicks); /* 1/60 sec */
} }
if( res == noErr ){ if( res == noErr ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
params.ioParam.ioRetqCount = N_LOCKBYTE; params.ioParam.ioReqCount = N_LOCKBYTE;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
res = PBLockRangeSync(&params); res = PBLockRangeSync(&params);
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
} }
if( res == noErr ){ if( res == noErr ){
@ -1504,24 +1504,24 @@ int sqliteOsWriteLock(OsFile *id){
params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioRefNum = id->refNumRF;
params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosMode = fsFromStart;
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){ while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
UInt32 finalTicks; UInt32 finalTicks;
Delay(1, &finalTicks); /* 1/60 sec */ Delay(1, &finalTicks); /* 1/60 sec */
} }
if( res == noErr ){ if( res == noErr ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked; params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
if( id->locked==0 if( id->locked==0
|| PBUnlockRangeSync(&params)==noErr ){ || PBUnlockRangeSync(&params)==noErr ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
params.ioParam.ioRetqCount = N_LOCKBYTE; params.ioParam.ioReqCount = N_LOCKBYTE;
res = PBLockRangeSync(&params); res = PBLockRangeSync(&params);
}else{ }else{
res = afpRangeNotLocked; res = afpRangeNotLocked;
} }
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
} }
if( res == noErr ){ if( res == noErr ){
@ -1611,13 +1611,13 @@ int sqliteOsUnlock(OsFile *id){
rc = SQLITE_OK; rc = SQLITE_OK;
}else if( id->locked<0 ){ }else if( id->locked<0 ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
params.ioParam.ioRetqCount = N_LOCKBYTE; params.ioParam.ioReqCount = N_LOCKBYTE;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
rc = SQLITE_OK; rc = SQLITE_OK;
id->locked = 0; id->locked = 0;
}else{ }else{
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
rc = SQLITE_OK; rc = SQLITE_OK;
id->locked = 0; id->locked = 0;

@ -506,20 +506,20 @@ int sqlite3OsReadLock(OsFile *id){
params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioRefNum = id->refNumRF;
params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosMode = fsFromStart;
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){ while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
UInt32 finalTicks; UInt32 finalTicks;
Delay(1, &finalTicks); /* 1/60 sec */ Delay(1, &finalTicks); /* 1/60 sec */
} }
if( res == noErr ){ if( res == noErr ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
params.ioParam.ioRetqCount = N_LOCKBYTE; params.ioParam.ioReqCount = N_LOCKBYTE;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
res = PBLockRangeSync(&params); res = PBLockRangeSync(&params);
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
} }
if( res == noErr ){ if( res == noErr ){
@ -550,24 +550,24 @@ int sqlite3OsWriteLock(OsFile *id){
params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioRefNum = id->refNumRF;
params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosMode = fsFromStart;
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){ while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
UInt32 finalTicks; UInt32 finalTicks;
Delay(1, &finalTicks); /* 1/60 sec */ Delay(1, &finalTicks); /* 1/60 sec */
} }
if( res == noErr ){ if( res == noErr ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked; params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
if( id->locked==0 if( id->locked==0
|| PBUnlockRangeSync(&params)==noErr ){ || PBUnlockRangeSync(&params)==noErr ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
params.ioParam.ioRetqCount = N_LOCKBYTE; params.ioParam.ioReqCount = N_LOCKBYTE;
res = PBLockRangeSync(&params); res = PBLockRangeSync(&params);
}else{ }else{
res = afpRangeNotLocked; res = afpRangeNotLocked;
} }
params.ioParam.ioPosOffset = FIRST_LOCKBYTE; params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
} }
if( res == noErr ){ if( res == noErr ){
@ -596,13 +596,13 @@ int sqlite3OsUnlock(OsFile *id){
rc = SQLITE_OK; rc = SQLITE_OK;
}else if( id->locked<0 ){ }else if( id->locked<0 ){
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
params.ioParam.ioRetqCount = N_LOCKBYTE; params.ioParam.ioReqCount = N_LOCKBYTE;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
rc = SQLITE_OK; rc = SQLITE_OK;
id->locked = 0; id->locked = 0;
}else{ }else{
params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked; params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked;
params.ioParam.ioRetqCount = 1; params.ioParam.ioReqCount = 1;
PBUnlockRangeSync(&params); PBUnlockRangeSync(&params);
rc = SQLITE_OK; rc = SQLITE_OK;
id->locked = 0; id->locked = 0;

@ -103,7 +103,7 @@ namespace NumFormat_Local
int leftSpace; int leftSpace;
int upReq; int upReq;
int retqCounter; int reqCounter;
int reqFirst; int reqFirst;
int optFirst; int optFirst;
@ -149,7 +149,7 @@ namespace NumFormat_Local
bool negBr; bool negBr;
int optFirst; int optFirst;
int reqFirst; int reqFirst;
int retqCounter; int reqCounter;
int fraction; int fraction;
int fractionDigists; int fractionDigists;
}; };
@ -239,7 +239,7 @@ void resetGlobals()
g_convertionInfo.showMinus = true; g_convertionInfo.showMinus = true;
g_convertionInfo.negRed = false; g_convertionInfo.negRed = false;
g_convertionInfo.negBr = false; g_convertionInfo.negBr = false;
g_convertionInfo.retqCounter = 0; g_convertionInfo.reqCounter = 0;
g_convertionInfo.reqFirst = 0; g_convertionInfo.reqFirst = 0;
g_convertionInfo.prefix = ""; g_convertionInfo.prefix = "";
g_convertionInfo.postfix = ""; g_convertionInfo.postfix = "";
@ -575,7 +575,7 @@ int doPreScan( TQString & format, TQString const & formatBack, TDELocale const *
case '0': case '0':
if ( spaceInNum > 0 ) if ( spaceInNum > 0 )
{ // for fractions { // for fractions
++g_convertionInfo.retqCounter; ++g_convertionInfo.reqCounter;
break; break;
} }
type = Number; type = Number;
@ -640,7 +640,7 @@ int doPreScan( TQString & format, TQString const & formatBack, TDELocale const *
df->negRed = g_convertionInfo.negRed; df->negRed = g_convertionInfo.negRed;
df->negBr = g_convertionInfo.negBr; df->negBr = g_convertionInfo.negBr;
df->fractionDigists = d; df->fractionDigists = d;
df->retqCounter = g_convertionInfo.retqCounter; df->reqCounter = g_convertionInfo.reqCounter;
df->reqFirst = g_convertionInfo.reqFirst; df->reqFirst = g_convertionInfo.reqFirst;
df->prefix = g_convertionInfo.prefix; df->prefix = g_convertionInfo.prefix;
df->postfix = g_convertionInfo.postfix; df->postfix = g_convertionInfo.postfix;
@ -1096,7 +1096,7 @@ void createFraction( TQString & result, Value const & value,
TQString denominator; TQString denominator;
numerator = TQString::number( index ); numerator = TQString::number( index );
int n = numerator.length() - data->retqCounter; int n = numerator.length() - data->reqCounter;
for ( int i = 0; i < n; ++i ) for ( int i = 0; i < n; ++i )
{ {
numerator.prepend( '0' ); numerator.prepend( '0' );

Loading…
Cancel
Save