Browse Source

tosunits: declare some var parameters as out, to avoid warnings

Thorsten Otto 3 years ago
parent
commit
6200af404d
3 changed files with 25 additions and 23 deletions
  1. 1 0
      packages/tosunits/src/gemdos.pas
  2. 3 2
      packages/tosunits/src/metados.pas
  3. 21 21
      packages/tosunits/src/tos.pas

+ 1 - 0
packages/tosunits/src/gemdos.pas

@@ -13,6 +13,7 @@
  **********************************************************************}
 
 {$PACKRECORDS 2}
+{$MODESWITCH OUT+}
 unit gemdos;
 
 interface

+ 3 - 2
packages/tosunits/src/metados.pas

@@ -13,6 +13,7 @@
  **********************************************************************}
 
 {$PACKRECORDS 2}
+{$MODESWITCH OUT+}
 unit metados;
 
 interface
@@ -42,8 +43,8 @@ type
   end;
 
 
-procedure xbios_Metainit(var buffer: TMETAINFO); syscall 14 48;
-function xbios_Metaopen(drive: smallint; var buffer: TMETA_DRVINFO): LongInt; syscall 14 49;
+procedure xbios_Metainit(out buffer: TMETAINFO); syscall 14 48;
+function xbios_Metaopen(drive: smallint; out buffer: TMETA_DRVINFO): LongInt; syscall 14 49;
 function xbios_Metaclose(drive: smallint): LongInt; syscall 14 50;
 function xbios_Metaread(drive: smallint; buffer: Pointer; blockno: LongInt; count: smallint): LongInt; syscall 14 51;
 function xbios_Metawrite(drive: smallint; buffer: Pointer; blockno: LongInt; count: smallint): LongInt; syscall 14 52;

+ 21 - 21
packages/tosunits/src/tos.pas

@@ -98,7 +98,7 @@ var
 (*                  BIOS                    *)
 (* ++++++++++++++++++++++++++++++++++++++++ *)
 
-procedure Getmpb(var p_mpb: TMPB); syscall 13 0;
+procedure Getmpb(out p_mpb: TMPB); syscall 13 0;
 function Bconstat(dev: smallint): smallint; syscall 13 1;
 function Bconin(dev: smallint): LongInt; syscall 13 2;
 procedure Bconout(dev, c: smallint); syscall 13 3;
@@ -177,19 +177,19 @@ function mon_type: smallint; syscall 14 89;
 procedure VsetSync(flag: smallint); syscall 14 90;
 function VgetSize(mode: smallint): LongInt; syscall 14 91;
 procedure VsetRGB(index, count: smallint; xrgbArray: Array of TRGB); syscall 14 93;
-procedure VgetRGB(index, count: smallint; var xrgbArray: Array of TRGB); syscall 14 94;
+procedure VgetRGB(index, count: smallint; out xrgbArray: Array of TRGB); syscall 14 94;
 function Validmode(mode: smallint): smallint; syscall 14 95;
 procedure Dsp_DoBlock(data_in: Pointer; size_in: LongInt; data_out: Pointer; size_out: LongInt); syscall 14 96;
 procedure Dsp_BlkHandShake(data_in: Pointer; size_in: LongInt; data_out: Pointer; size_out: LongInt); syscall 14 97;
 procedure Dsp_BlkUnpacked(data_in: Pointer; size_in: LongInt; data_out: Pointer; size_out: LongInt); syscall 14 98;
-procedure Dsp_InStream(data_in: Pointer; block_size, num_blocks: LongInt; var blocks_done: LongInt); syscall 14 99;
-procedure Dsp_OutStream(data_out: Pointer; block_size, num_blocks: LongInt; var blocks_done: LongInt); syscall 14 100;
-procedure Dsp_IOStream(data_in, data_out: Pointer; block_insize, block_outsize, num_blocks: LongInt;var blocks_done: LongInt); syscall 14 101;
+procedure Dsp_InStream(data_in: Pointer; block_size, num_blocks: LongInt; out blocks_done: LongInt); syscall 14 99;
+procedure Dsp_OutStream(data_out: Pointer; block_size, num_blocks: LongInt; out blocks_done: LongInt); syscall 14 100;
+procedure Dsp_IOStream(data_in, data_out: Pointer; block_insize, block_outsize, num_blocks: LongInt; out blocks_done: LongInt); syscall 14 101;
 procedure Dsp_RemoveInterrupts(mask: smallint); syscall 14 102;
 function Dsp_GetWordSize: smallint; syscall 14 103;
 function Dsp_Lock: smallint; syscall 14 104;
 procedure Dsp_Unlock; syscall 14 105;
-procedure Dsp_Available(var xavailable, yavailable: LongInt); syscall 14 106;
+procedure Dsp_Available(out xavailable, yavailable: LongInt); syscall 14 106;
 function Dsp_Reserve(xreserve, yreserve: LongInt): smallint; syscall 14 107;
 function Dsp_LoadProg(const filename: String; ability: smallint; buffer: Pointer): smallint;
 procedure Dsp_ExecProg(codeptr: Pointer; codesize: LongInt; ability: smallint); syscall 14 109;
@@ -229,8 +229,8 @@ function buffptr(bptr: Pointer): LongInt; syscall 14 141;
 
 procedure VsetMask(ormask, andmask: LongInt; overlay: smallint); syscall 14 150;
 
-procedure Metainit(var buffer: TMETAINFO); syscall 14 48;
-function Metaopen(drive: smallint; var buffer: TMETA_DRVINFO): LongInt; syscall 14 49;
+procedure Metainit(out buffer: TMETAINFO); syscall 14 48;
+function Metaopen(drive: smallint; out buffer: TMETA_DRVINFO): LongInt; syscall 14 49;
 function Metaclose(drive: smallint): LongInt; syscall 14 50;
 function Metaread(drive: smallint; buffer: Pointer; blockno: LongInt; count: smallint): LongInt; syscall 14 51;
 function Metawrite(drive: smallint; buffer: Pointer; blockno: LongInt; count: smallint): LongInt; syscall 14 52;
@@ -280,7 +280,7 @@ function sversion: smallint; syscall 1 48;
 procedure ptermres(keepcnt: longint; returncode: smallint); syscall 1 49;
 function sconfig(mode: smallint; flags: longint): longint; syscall 1 51;
 
-function dfree(var buf: TDISKINFO; driveno: smallint): smallint; syscall 1 54;
+function dfree(out buf: TDISKINFO; driveno: smallint): smallint; syscall 1 54;
 
 function dcreate(const path: String): longint;
 function ddelete(const path: String): longint;
@@ -296,7 +296,7 @@ function fattrib(const filename: String; wflag: smallint; attrib: smallint): sma
 function mxalloc(amount: longint; mode: smallint): pointer; syscall 1 68;
 function fdup(handle: smallint): smallint; syscall 1 69;
 function fforce(stdh: smallint; nonstdh: smallint): smallint; syscall 1 70;
-function dgetpath(var path: String; driveno: smallint): smallint;
+function dgetpath(out path: String; driveno: smallint): smallint;
 function malloc(number: dword): pointer; syscall 1 72;
 function free(block: pointer): dword; syscall 1 73;
 function mfree(block: pointer): dword; syscall 1 73;
@@ -313,7 +313,7 @@ procedure fdatime(timeptr: PDOSTIME; handle: smallint; wflag: smallint); syscall
 function Flock(handle, mode: smallint; start, length: LongInt): LongInt; syscall 1 92;
 
 function Syield: smallint; syscall 1 255;
-function Fpipe(var usrh: ARRAY of smallint): smallint; syscall 1 256;
+function Fpipe(out usrh: ARRAY of smallint): smallint; syscall 1 256;
 function Ffchown(fd, uid, gid: smallint): longint; syscall 1 257;
 function Ffchmod(fd: smallint; mode: word): longint; syscall 1 258;
 function Fsync(fd: smallint): longint; syscall 1 259;
@@ -341,9 +341,9 @@ function Pusrval(arg: LongInt): LongInt; syscall 1 280;
 function Pdomain(newdom: smallint): smallint; syscall 1 281;
 procedure Psigreturn; syscall 1 282;
 function Pfork: smallint; syscall 1 283;
-function Pwait3(flag: smallint; var rusage: ARRAY of LongInt): LongInt; syscall 1 284;
-function Fselect(timeout: Word; var rfds, wfds, xfds: LongInt): smallint; syscall 1 285;
-function Prusage(var r: ARRAY of LongInt): LongInt; syscall 1 286;
+function Pwait3(flag: smallint; out rusage: ARRAY of LongInt): LongInt; syscall 1 284;
+function Fselect(timeout: Word; out rfds, wfds, xfds: LongInt): smallint; syscall 1 285;
+function Prusage(out r: ARRAY of LongInt): LongInt; syscall 1 286;
 function Psetlimit(lim: smallint; value: LongInt): LongInt; syscall 1 287;
 function Talarm(secs: LongInt): LongInt; syscall 1 288;
 procedure Pause; syscall 1 289;
@@ -354,10 +354,10 @@ function Pmsg(mode: smallint; mbox: LongInt; var msg: TMSGTYPE): LongInt; syscal
 function Fmidipipe(pid, inp, outp: smallint): LongInt; syscall 1 294;
 function Prenice(pid, delta: smallint): smallint; syscall 1 295;
 function Dopendir(const name: String; flag: smallint): LongInt;
-function Dreaddir(buflen: smallint; dir: LongInt; var buf: String): LongInt;
+function Dreaddir(buflen: smallint; dir: LongInt; out buf: String): LongInt;
 function Drewinddir(dir: LongInt): LongInt; syscall 1 298;
 function Dclosedir(dir: LongInt): LongInt; syscall 1 299;
-function Fxattr(flag: smallint; const name: String; var buf: TXATTR): LongInt;
+function Fxattr(flag: smallint; const name: String; out buf: TXATTR): LongInt;
 function Flink(const oldname: String; const newname: String): LongInt;
 function Fsymlink(const oldname: String; const newname: String): LongInt;
 function Freadlink(size: smallint; out buf: String; const name: String): LongInt;
@@ -371,12 +371,12 @@ procedure Psigpause(mask: LongInt); syscall 1 310;
 function Psigaction(sig: smallint; act, oact: PSIGACTION): LongInt; syscall 1 311;
 function Pgeteuid: smallint; syscall 1 312;
 function Pgetegid: smallint; syscall 1 313;
-function Pwaitpid(pid, flag: smallint; var rusage: ARRAY of LongInt): LongInt; syscall 1 314;
+function Pwaitpid(pid, flag: smallint; out rusage: ARRAY of LongInt): LongInt; syscall 1 314;
 function Dgetcwd(path: Pchar; drv, size: smallint): LongInt; syscall 1 315;
 procedure Salert(str: Pchar); syscall 1 316;
 function Tmalarm(time: longint): LongInt; syscall 1 317;
 { function Psigintr(vec, sig: smallint): LongInt; syscall 1 318; }
-function Suptime(var uptime: longint; var loadaverage: longint): LongInt; syscall 1 319;
+function Suptime(out uptime: longint; out loadaverage: longint): LongInt; syscall 1 319;
 
 
 (* ++++++++++++++++++++++++++++++++++++++++ *)
@@ -485,7 +485,7 @@ begin
   dsetpath := gemdos_dsetpath(s);
 end;
 
-function dgetpath(var path: String; driveno: smallint): smallint;
+function dgetpath(out path: String; driveno: smallint): smallint;
 var s: array[0..255] of char;
 begin
   Dgetpath := gemdos_dgetpath(s, driveno);
@@ -521,7 +521,7 @@ begin
   Dopendir := gemdos_dopendir(s, flag);
 end;
 
-function Dreaddir(buflen: smallint; dir: LongInt; var buf: String): LongInt;
+function Dreaddir(buflen: smallint; dir: LongInt; out buf: String): LongInt;
 var s: array[0..255] of char;
 begin
   Dreaddir := gemdos_dreaddir(buflen, dir, s);
@@ -529,7 +529,7 @@ begin
     buf := PChar(@s[0]);
 end;
 
-function Fxattr(flag: smallint; const name: String; var buf: TXATTR): LongInt;
+function Fxattr(flag: smallint; const name: String; out buf: TXATTR): LongInt;
 var s: array[0..255] of char;
 begin
   s := name;