Skip to content

Commit 52ba090

Browse files
[Runtime] Changed several occurrences of REF to OUT
1 parent f0271d6 commit 52ba090

File tree

5 files changed

+12
-20
lines changed

5 files changed

+12
-20
lines changed

src/Runtime/XSharp.Core/RDD/CoreDb.prg

+1-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ CLASS XSharp.CoreDb
552552
RddError.PostArgumentError( __FUNCTION__, EDB_USE, nameof(cName), 1, <OBJECT>{ cName } )
553553
ELSEIF aStruct == NULL
554554
RddError.PostArgumentError( __FUNCTION__, EDB_USE, nameof(aStruct), 2 ,NULL)
555-
ELSEIF lNew && ! ( ret := CoreDb.Select( 0, REF uiOldArea ) )
555+
ELSEIF lNew && ! ( ret := CoreDb.Select( 0, OUT uiOldArea ) )
556556
RddError.PostError( __FUNCTION__, EG_CREATE, EDB_NOAREAS )
557557
ELSE
558558
ret := TRUE

src/Runtime/XSharp.RT/RDD/Db.prg

+2-5
Original file line numberDiff line numberDiff line change
@@ -542,11 +542,9 @@ FUNCTION DbRUnLock(uRecID) AS LOGIC CLIPPER
542542
/// <include file="VoFunctionDocs.xml" path="Runtimefunctions/dbselect/*" />
543543
FUNCTION DbSelect(nNew) AS DWORD CLIPPER
544544

545-
LOCAL nOld := 0 AS DWORD
546-
547545
@@Default( REF nNew, 0)
548546

549-
VoDb.Select(nNew, REF nOld)
547+
VoDb.Select(nNew, OUT VAR nOld)
550548

551549
RETURN nOld
552550

@@ -1065,8 +1063,7 @@ FUNCTION DbCopyXStruct(cTargetFile AS STRING) AS LOGIC STRICT
10651063
aStruct := DbStruct()
10661064

10671065
n := Len(aStruct)
1068-
siSaveSel := 0
1069-
VoDb.Select(0, REF siSaveSel)
1066+
VoDb.Select(0, OUT siSaveSel)
10701067

10711068
_DbCreate(cTargetFile)
10721069

src/Runtime/XSharp.Rdd/ACE/ACE.prg

+2-2
Original file line numberDiff line numberDiff line change
@@ -4516,9 +4516,9 @@ BEGIN NAMESPACE XSharp.ADS
45164516

45174517
PUBLIC STATIC METHOD AdsMgGetServerType( hMgmtHandle AS IntPtr, pusServerType REF WORD ) AS DWORD
45184518
IF Is32Bits
4519-
RETURN ACE32.AdsMgGetServerType( hMgmtHandle, REF pusServerType)
4519+
RETURN ACE32.AdsMgGetServerType( hMgmtHandle, OUT pusServerType)
45204520
ELSE
4521-
RETURN ACE64.AdsMgGetServerType( hMgmtHandle, REF pusServerType)
4521+
RETURN ACE64.AdsMgGetServerType( hMgmtHandle, OUT pusServerType)
45224522
ENDIF
45234523

45244524

src/Runtime/XSharp.Rdd/Advantage/AXSqlRDD.prg

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ CLASS XSharp.ADS.AXSQLRDD INHERIT ADSRDD
5858
nRes := SetParameters(oParams)
5959
ENDIF
6060
if nRes == 0
61-
nRes := ACE.AdsExecuteSQL(SELF:_hStatement, REF _Table)
61+
nRes := ACE.AdsExecuteSQL(SELF:_hStatement, OUT _Table)
6262
endif
6363
IF nRes != 0
6464
local err := NULL as Exception
@@ -95,7 +95,7 @@ CLASS XSharp.ADS.AXSQLRDD INHERIT ADSRDD
9595
RETURN FALSE
9696
ENDIF
9797

98-
SELF:_CheckError(ACE.AdsCreateSQLStatement(SELF:_Connection, REF SELF:_hStatement),EG_OPEN,"AdsCreateSQLStatement")
98+
SELF:_CheckError(ACE.AdsCreateSQLStatement(SELF:_Connection, OUT SELF:_hStatement),EG_OPEN,"AdsCreateSQLStatement")
9999

100100
SELF:_CheckError(ACE.AdsStmtSetTableType(SELF:_hStatement, SELF:_TableType),EG_OPEN,"AdsStmtSetTableType")
101101

@@ -137,7 +137,7 @@ CLASS XSharp.ADS.AXSQLRDD INHERIT ADSRDD
137137
nRes := SetParameters(oParams)
138138
endif
139139
if nRes == 0
140-
nRes := ACE.AdsExecuteSQL(SELF:_hStatement, REF _Table)
140+
nRes := ACE.AdsExecuteSQL(SELF:_hStatement, OUT _Table)
141141
endif
142142
IF nRes != 0
143143
local err := NULL as Exception
@@ -154,7 +154,7 @@ CLASS XSharp.ADS.AXSQLRDD INHERIT ADSRDD
154154
SELF:Close()
155155
RETURN FALSE
156156
ENDIF
157-
SELF:_CheckError(ACE.AdsGetTableType(SELF:_Table, REF _TableType),EG_OPEN,"AdsGetTableType")
157+
SELF:_CheckError(ACE.AdsGetTableType(SELF:_Table, OUT _TableType),EG_OPEN,"AdsGetTableType")
158158
IF ! SELF:_FieldSub()
159159
SELF:Close()
160160
RETURN FALSE

src/Runtime/XSharp.Rdd/Advantage/Functions.prg

+3-8
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,7 @@ FUNCTION GetAceTableHandle() AS IntPtr
9898
/// volume name as well. For example, use "\\server\share" or "\\server\vol:"..</param>
9999
/// <seealso cref="AdsIsServerLoaded">AdsIsServerLoaded Function</seealso>
100100
FUNCTION AX_IsServerLoaded( cFileName AS STRING ) AS LOGIC //
101-
LOCAL usLoaded AS WORD
102-
usLoaded := 0
103-
ACE.AdsIsServerLoaded ( cFileName , REF usLoaded )
101+
ACE.AdsIsServerLoaded ( cFileName , OUT VAR usLoaded )
104102
RETURN ( usLoaded == ACE.ADS_REMOTE_SERVER .OR. usLoaded = ACE.ADS_AIS_SERVER )
105103

106104
/// <summary>Indicates the percent completion of an index build</summary>
@@ -205,7 +203,6 @@ FUNCTION AX_SetSQLTablePasswords( aPasswords AS OBJECT ) AS VOID
205203
/// <param name="iAction">The parameter can be: AX_BEGIN_TRANSACTION, AX_COMMIT_TRANSACTION, AX_ROLLBACK_TRANSACTION, AX_ISACTIVE_TRANSACTION</param>
206204
/// <returns>True if the command was successful, False if not.</returns>
207205
FUNCTION AX_Transaction( iAction AS INT) AS LOGIC // Transaction call
208-
LOCAL usInTrans AS WORD
209206
LOCAL ulRetVal AS DWORD
210207
//
211208
// Transaction Processing function. The parameter can be
@@ -214,7 +211,6 @@ FUNCTION AX_Transaction( iAction AS INT) AS LOGIC // Transaction call
214211
// AX_ROLLBACK_TRANSACTION
215212
// AX_ISACTIVE_TRANSACTION
216213
//
217-
usInTrans := 0
218214

219215
SWITCH iAction
220216
CASE AX_BEGIN_TRANSACTION
@@ -224,7 +220,7 @@ FUNCTION AX_Transaction( iAction AS INT) AS LOGIC // Transaction call
224220
CASE AX_ROLLBACK_TRANSACTION
225221
ulRetVal := ACE.AdsRollbackTransaction( 0 )
226222
CASE AX_ISACTIVE_TRANSACTION
227-
ulRetVal := ACE.AdsInTransaction( 0, REF usInTrans )
223+
ulRetVal := ACE.AdsInTransaction( 0, OUT VAR usInTrans )
228224
RETURN ( ulRetVal == 0 .AND. usInTrans != 0 )
229225
OTHERWISE
230226
ulRetVal := 1
@@ -235,9 +231,8 @@ FUNCTION AX_Transaction( iAction AS INT) AS LOGIC // Transaction call
235231

236232
/// <summary>Is a transaction pending </summary>
237233
FUNCTION AX_Transaction( ) AS LOGIC // Transaction call
238-
LOCAL usInTrans := 0 AS WORD
239234
LOCAL ulRetVal AS DWORD
240-
ulRetVal := ACE.AdsInTransaction( 0, REF usInTrans )
235+
ulRetVal := ACE.AdsInTransaction( 0, OUT VAR usInTrans )
241236
RETURN ( ulRetVal == 0 .AND. usInTrans != 0 )
242237

243238

0 commit comments

Comments
 (0)