fix result type

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8474 8c9fc860-2736-0410-a75d-ab315db34111

source/BIOS.ATADisks.Mod

@@ -215,7 +215,7 @@ TYPE
 		buffer: POINTER TO ARRAY OF CHAR;
 		bufferAdr: ADDRESS;
 
-		PROCEDURE ExecuteCommand*(command: Command; ms: LONGINT; VAR status: SET): LONGINT;
+		PROCEDURE ExecuteCommand*(command: Command; ms: LONGINT; VAR status: SET): WORD;
 		CONST
 			PIO = SYSTEM.VAL(LONGINT, Protocol_PIO);
 			DMA = SYSTEM.VAL(LONGINT, Protocol_DMA);
@@ -1021,7 +1021,7 @@ TYPE
 			END;
 		END Transfer;
 
-		PROCEDURE GetSize*(VAR size, res: LONGINT);
+		PROCEDURE GetSize*(VAR size: LONGINT; VAR res: WORD);
 		BEGIN
 			size := SELF.size;
 			res := Disks.Ok;
@@ -1354,7 +1354,7 @@ TYPE
 		VAR
 			name: Plugins.Name;
 			str: ARRAY 32 OF CHAR;
-			i, res: LONGINT;
+			i: LONGINT; res: WORD;
 		BEGIN
 			name := Name;
 			i := 0; WHILE name[i] # 0X DO INC(i) END;
@@ -1422,7 +1422,7 @@ TYPE
 			size := cap;
 		END SetCapacity;
 
-		PROCEDURE GetSize*(VAR asize, res: LONGINT);
+		PROCEDURE GetSize*(VAR asize: LONGINT; VAR res: WORD);
 		BEGIN
 			res := Res_OK;
 			IF RemovableBit IN id.type THEN
@@ -1461,7 +1461,7 @@ TYPE
 		PROCEDURE ExecuteCommand*(read: BOOLEAN; VAR packet, data: ARRAY OF CHAR; ofs, size: LONGINT; dma: BOOLEAN): LONGINT;
 		VAR
 			command: CommandPacket;
-			i, res: LONGINT;
+			i: LONGINT; res: WORD;
 			status: SET;
 		BEGIN {EXCLUSIVE}
 			ASSERT(LEN(packet) <= LEN(command.packet));
@@ -1509,7 +1509,7 @@ TYPE
 		PROCEDURE TransferEx*(op: LONGINT; lba: HUGEINT; num: LONGINT; bufAdr: ADDRESS; dma: BOOLEAN): LONGINT;
 		VAR
 			command: Command;
-			res, timeout: LONGINT;
+			res: WORD; timeout: LONGINT;
 			status: SET;
 		BEGIN {EXCLUSIVE}
 			IF (op # Disks.Read) & (op # Disks.Write) & (op # WriteAndVerify) THEN RETURN Disks.Unsupported; END;
@@ -1550,7 +1550,7 @@ TYPE
 
 		PROCEDURE Reset(): LONGINT;
 		VAR
-			i, res : LONGINT;
+			i: LONGINT; res: WORD;
 			status: SET;
 			command: Command;
 		BEGIN
@@ -1571,7 +1571,7 @@ TYPE
 				IF res # Res_OK THEN res := Reset^(); END;
 			END;
 			IF res # Res_OK THEN RETURN 2816; END;
-			GetSize(i, i);
+			GetSize(i, res); (* ignore res *)
 			(*undocumented: the first command after Reset Device shall be a PACKET command, other
 			   commands like Set Features otherwise abort.*)
 			RETURN Res_OK;
@@ -1642,7 +1642,7 @@ TYPE
 		PROCEDURE MediaEject*(immediate, load: BOOLEAN): LONGINT;
 		VAR
 			command: CommandPacket;
-			res, timeout: LONGINT;
+			res: WORD; timeout: LONGINT;
 			status: SET;
 		BEGIN {EXCLUSIVE}
 			command := NewCommandPacket(1BH); (* start/stop unit *)

source/BIOS.BootShell.Mod

@@ -536,7 +536,7 @@ TYPE
 			commandLine : Strings.String;
 			nbr : ARRAY 8 OF CHAR;
 			msg, command : ARRAY 128 OF CHAR;
-			i, length, res : LONGINT;
+			i, length : LONGINT; res : WORD;
 		BEGIN
 			commandLine := textBuffer.GetCurrentLine();
 			Strings.TrimWS(commandLine^);

source/BIOS.Diskettes.Mod

@@ -61,7 +61,7 @@ TYPE
 			END;
 		END Transfer;
 
-		PROCEDURE GetSize*(VAR size, res: LONGINT);
+		PROCEDURE GetSize*(VAR size: LONGINT; VAR res: WORD);
 		BEGIN
 			GetSize1(SELF, size, res)
 		END GetSize;
@@ -440,7 +440,7 @@ BEGIN {EXCLUSIVE}
 	Transfer0(d, op, start, num, buf, ofs, res)
 END Transfer1;
 
-PROCEDURE GetSize1(d: Disks.Device;  VAR size, res: LONGINT);
+PROCEDURE GetSize1(d: Disks.Device;  VAR size: LONGINT; VAR res: WORD);
 VAR dev: Device;  buf: ARRAY BS OF CHAR;
 BEGIN {EXCLUSIVE}
 	dev := d(Device);
@@ -536,7 +536,7 @@ BEGIN
 END Init;
 
 PROCEDURE Register;
-VAR i, res: LONGINT; dev: Device; name: Plugins.Name;
+VAR i: LONGINT; res: WORD; dev: Device; name: Plugins.Name;
 BEGIN
 	FOR i := 0 TO MaxDevices-1 DO
 		dev := device[i];

source/BIOS.DisplayLinear.Mod

@@ -56,7 +56,7 @@ BEGIN
 END InitPalette;
 
 PROCEDURE Init;
-VAR w, h, f, mem, res: LONGINT; ts : ARRAY 16 OF CHAR; padr, vadr: ADDRESS;
+VAR w, h, f, mem: LONGINT; res: WORD; ts : ARRAY 16 OF CHAR; padr, vadr: ADDRESS;
 BEGIN
 	w := GetVal("DWidth", 1024); h := GetVal("DHeight", 768);
 	CASE GetVal("DDepth", 16) DIV 8 OF

source/BIOS.EnsoniqSound.Mod

@@ -1416,7 +1416,7 @@ BEGIN
 END Cleanup;
 
 PROCEDURE ScanPCI(vendor, device: LONGINT; name: Plugins.Name);
-VAR index, bus, dev, fct, res, base, irq, i : LONGINT;
+VAR index, bus, dev, fct, base, irq, i : LONGINT; res: WORD;
 	driver : Driver;
 	drivername : Plugins.Name;
 BEGIN

source/BIOS.Ethernet3Com90x.Mod

@@ -234,7 +234,7 @@ TYPE
 		(* Initialize the controller. *)
 
 		PROCEDURE &Init*(dev: LinkDevice; base, irq, model: LONGINT; flags, media: SET);
-		VAR res, i: LONGINT;
+		VAR res: WORD; i: LONGINT;
 		BEGIN
 			SELF.interrupted := FALSE;
 			SELF.base := base; SELF.irq := irq;  SELF.dev := dev; SELF.model := model; SELF.media := media;

source/BIOS.MemCache.Mod

@@ -16,7 +16,7 @@ CONST
 TYPE
 	SetCacheMessage = POINTER TO RECORD (Machine.Message)
 		physAdr: ADDRESS; size, type: LONGINT;
-		res: ARRAY Machine.MaxCPU OF LONGINT
+		res: ARRAY Machine.MaxCPU OF WORD
 	END;
 
 (* Return the value of the MTTRcap register. *)

source/BIOS.i810Sound.Mod

@@ -134,7 +134,7 @@ MODULE i810Sound; (** AUTHOR "krijo210@student.liu.se"; PURPOSE "Intel 810 Sound
 
 			PROCEDURE RegRead32(offset : LONGINT) : LONGINT;
 			VAR
-				res : WORD;
+				res: LONGINT;
 			BEGIN
 				Machine.Portin32(base + offset, res);
 				RETURN res

source/BluetoothHCI.Mod

@@ -219,7 +219,7 @@ TYPE
 			BF: broadcast flag
 		*)
 		PROCEDURE SendACL*(PBF, BF: LONGINT; VAR data: ARRAY OF CHAR; ofs, len: LONGINT): LONGINT;
-		VAR v, res: LONGINT; aclhdr: ARRAY 4 OF CHAR;
+		VAR v: LONGINT; res: WORD; aclhdr: ARRAY 4 OF CHAR;
 		BEGIN
 			ASSERT((pbfContinuing <= PBF) & (PBF <= pbfFirst));
 			ASSERT((bfPointToPoint <= BF) & (BF <= bfPiconet));
@@ -240,7 +240,7 @@ TYPE
 		END SendACL;
 
 		PROCEDURE SendACLH*(PBF, BF: LONGINT; VAR hdr: ARRAY OF CHAR; hdrlen: LONGINT; VAR data: ARRAY OF CHAR; ofs, len: LONGINT): LONGINT;
-		VAR v, res, totlen: LONGINT; aclhdr: ARRAY 4 OF CHAR;
+		VAR v, totlen: LONGINT; res: WORD; aclhdr: ARRAY 4 OF CHAR;
 		BEGIN
 			totlen := len + hdrlen;
 			ASSERT((pbfContinuing <= PBF) & (PBF <= pbfFirst));
@@ -595,7 +595,7 @@ TYPE
 			par: ARRAY 13 OF CHAR;
 			event: Bluetooth.EventPacket;
 			pending: BOOLEAN;
-			i, res: LONGINT;
+			i: LONGINT; res: WORD;
 		BEGIN
 			FOR i := 0 TO Bluetooth.BDAddrLen-1 DO par[i] := bdAddr[i] END;
 			par[6] := 08X; par[7] := 00X;	(* packet type: DM1 only *)
@@ -664,7 +664,7 @@ TYPE
 		PROCEDURE SetEventFilter*(type, conditionType: CHAR; condition: ARRAY OF CHAR): LONGINT;
 		VAR
 			par: ARRAY 9 OF CHAR;
-			i, len, res: LONGINT;
+			i, len: LONGINT; res: WORD;
 			event: Bluetooth.EventPacket;
 			pending: BOOLEAN;
 		BEGIN
@@ -809,7 +809,7 @@ TYPE
 		VAR
 			event: Bluetooth.EventPacket;
 			pending: BOOLEAN;
-			res, i: LONGINT;
+			res: WORD; i: LONGINT;
 		BEGIN
 			IF TraceHCI THEN
 				KernelLog.String(ModuleName);

source/BluetoothL2CAP.Mod

@@ -336,7 +336,7 @@ TYPE
 
 		END Connect;
 
-		PROCEDURE ConnectResponse(identifier: CHAR; response, status: LONGINT): LONGINT;
+		PROCEDURE ConnectResponse(identifier: CHAR; response, status: LONGINT): WORD;
 		VAR cmd: ARRAY 12 OF CHAR; res: WORD; sc: SignallingChannel;
 		BEGIN {EXCLUSIVE}
 			ASSERT(state = W4L2CAConnectRsp);
@@ -464,7 +464,7 @@ TYPE
 			END
 		END Configure;
 
-		PROCEDURE ConfigurationResponse(identifier: CHAR; outMTU, inFlow: LONGINT): LONGINT;
+		PROCEDURE ConfigurationResponse(identifier: CHAR; outMTU, inFlow: LONGINT): WORD;
 
 		VAR
 			cmd: ARRAY 48 OF CHAR;
@@ -832,7 +832,7 @@ TYPE
 
 		(* signal an remote L2CAP entity using link *)
 		(* LEN(command) must be >= 4 and the first 4 bytes of command MUST be left free *)
-		PROCEDURE Signal(link: HCI.Link; code, identifier: CHAR; command: ARRAY OF CHAR; len: LONGINT): LONGINT;
+		PROCEDURE Signal(link: HCI.Link; code, identifier: CHAR; command: ARRAY OF CHAR; len: LONGINT): WORD;
 
 		VAR
 				res : WORD;
@@ -1661,7 +1661,7 @@ TYPE
 		(*----- L2CAP interface -----*)
 
 		(** request a callback when the selected indication event occurs *)
-		PROCEDURE EventIndication*(event: Event; callback: EventIndicationCallback; VAR result: LONGINT);
+		PROCEDURE EventIndication*(event: Event; callback: EventIndicationCallback; VAR result: WORD);
 		BEGIN
 			IF (MinEventIndication <= event) & (event <= MaxEventIndication) THEN
 				indications[event-MinEventIndication] := callback;
@@ -1732,7 +1732,7 @@ TYPE
 		END Connect;
 
 		(** issues a response to a connection request event indication *)
-		PROCEDURE ConnectResponse*(bdAddr: Bluetooth.BDAddr; identifier : CHAR; lcid, response, status: LONGINT; VAR result: LONGINT);
+		PROCEDURE ConnectResponse*(bdAddr: Bluetooth.BDAddr; identifier : CHAR; lcid, response, status: LONGINT; VAR result: WORD);
 		VAR c: Channel;
 		BEGIN
 			c := channelManager.FindChannel(lcid);
@@ -1777,7 +1777,7 @@ TYPE
 		END Configure;
 
 		(** issues a response to a configuration request event indication *)
-		PROCEDURE ConfigurationResponse*(cid: LONGINT; identifier: CHAR; outMTU, inFlow: LONGINT; VAR result: LONGINT);
+		PROCEDURE ConfigurationResponse*(cid: LONGINT; identifier: CHAR; outMTU, inFlow: LONGINT; VAR result: WORD);
 		VAR c: Channel;
 		BEGIN
 			IF TraceL2CAP THEN

source/BluetoothRFCOMM.Mod

@@ -55,7 +55,7 @@ TYPE
 			dead := TRUE;
 		END Close;
 
-		PROCEDURE Get(VAR ch : CHAR; VAR result : LONGINT);
+		PROCEDURE Get(VAR ch : CHAR; VAR result : WORD);
 		BEGIN {EXCLUSIVE}
 			IF TraceBuffer THEN
 				KernelLog.String(ModuleName);
@@ -480,7 +480,7 @@ TYPE
 
 		(* --------------------------------------------- *)
 
-		PROCEDURE Receiver(VAR buf: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len, res: LONGINT);
+		PROCEDURE Receiver(VAR buf: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len: LONGINT; VAR res: WORD);
 
 		BEGIN
 
@@ -547,7 +547,7 @@ TYPE
 
 		PROCEDURE &Init*(l2capLayer : BluetoothL2CAP.L2CAP);
 		VAR
-			result : LONGINT;
+			result : WORD;
 			controlChannel : ControlChannel;
 			i : LONGINT;
 		BEGIN
@@ -695,14 +695,14 @@ TYPE
 
 		PROCEDURE SendInformation*(serverChannel : LONGINT; info : ARRAY OF CHAR; infoLength : LONGINT);
 		VAR
-			result : LONGINT;
+			result : WORD;
 		BEGIN
 			channelList[serverChannel * 2].Sender(info,0,infoLength,TRUE,result);
 		END SendInformation;
 
 		PROCEDURE ReceiveInformation*(serverChannel : LONGINT; VAR info : ARRAY OF CHAR; VAR infoLength : LONGINT);
 		VAR
-			result : LONGINT;
+			result : WORD;
 		BEGIN
 			channelList[serverChannel * 2].Receiver(info,0,LEN(info),1,infoLength,result);
 		END ReceiveInformation;
@@ -771,7 +771,7 @@ TYPE
 
 		PROCEDURE L2CAPConfigIndication(inParam : BluetoothL2CAP.Indication);
 		VAR
-			result : LONGINT;
+			result : WORD;
 		BEGIN
 			WITH inParam : BluetoothL2CAP.ConfigInd DO
 				IF TraceRFCOMM THEN

source/BluetoothTest.Mod

@@ -263,7 +263,7 @@ END TraceMode;
 PROCEDURE ReadLocalName*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	event: Bluetooth.EventPacket; pending: BOOLEAN; res, i: LONGINT;
+	event: Bluetooth.EventPacket; pending: BOOLEAN; res: WORD; i: LONGINT;
 BEGIN
 	IF context.arg.GetString(ident) THEN
 		d := Find(ident);
@@ -314,7 +314,7 @@ END ChangeLocalName;
 PROCEDURE ReadClassOfDevice*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	event: Bluetooth.EventPacket; pending: BOOLEAN; res, i: LONGINT;
+	event: Bluetooth.EventPacket; pending: BOOLEAN; res: WORD; i: LONGINT;
 BEGIN
 	IF context.arg.GetString(ident) THEN
 		d := Find(ident);
@@ -338,7 +338,7 @@ END ReadClassOfDevice;
 PROCEDURE WriteClassOfDevice*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	event: Bluetooth.EventPacket; pending: BOOLEAN; res, i: LONGINT; cod: Bluetooth.DeviceClass;
+	event: Bluetooth.EventPacket; pending: BOOLEAN; res: WORD;  i: LONGINT; cod: Bluetooth.DeviceClass;
 BEGIN
 	context.arg.SkipWhitespace; context.arg.String(ident); context.arg.SkipWhitespace;
 	FOR i := 0 TO LEN(cod)-1 DO cod[i] := HexToChar(context.arg.Get(), context.arg.Get()) END;
@@ -404,7 +404,7 @@ END ReadScanEnable;
 PROCEDURE WriteScanEnable*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	res, scanMode: LONGINT; param: ARRAY 1 OF CHAR; event: Bluetooth.EventPacket; pending: BOOLEAN;
+	res: WORD;  scanMode: LONGINT; param: ARRAY 1 OF CHAR; event: Bluetooth.EventPacket; pending: BOOLEAN;
 BEGIN
 	IF context.arg.GetString(ident) & context.arg.GetInteger(scanMode, TRUE) THEN
 		IF (0 <= scanMode) & (scanMode <= 3) THEN
@@ -445,7 +445,7 @@ END SetFilter;
 PROCEDURE ReadPageScanActivity*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	interval, window, res: LONGINT; pending: BOOLEAN; event: Bluetooth.EventPacket; intStr, winStr: ARRAY 16 OF CHAR;
+	interval, window: LONGINT; res: WORD; pending: BOOLEAN; event: Bluetooth.EventPacket; intStr, winStr: ARRAY 16 OF CHAR;
 BEGIN
 	IF context.arg.GetString(ident) THEN
 		d := Find(ident);
@@ -473,7 +473,7 @@ END ReadPageScanActivity;
 PROCEDURE WritePageScanActivity*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	interval, window, res: LONGINT; pending: BOOLEAN; event: Bluetooth.EventPacket; param: ARRAY 4 OF CHAR;
+	interval, window: LONGINT; res: WORD; pending: BOOLEAN; event: Bluetooth.EventPacket; param: ARRAY 4 OF CHAR;
 BEGIN
 	IF context.arg.GetString(ident) & context.arg.GetInteger(interval, TRUE) & context.arg.GetInteger(window, TRUE) THEN
 		d := Find(ident);
@@ -501,7 +501,7 @@ END WritePageScanActivity;
 PROCEDURE ReadInquiryScanActivity*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	interval, window, res: LONGINT; pending: BOOLEAN; event: Bluetooth.EventPacket; intStr, winStr: ARRAY 16 OF CHAR;
+	interval, window: LONGINT; res: WORD; pending: BOOLEAN; event: Bluetooth.EventPacket; intStr, winStr: ARRAY 16 OF CHAR;
 BEGIN
 	IF context.arg.GetString(ident) THEN
 		d := Find(ident);
@@ -529,7 +529,7 @@ END ReadInquiryScanActivity;
 PROCEDURE WriteInquiryScanActivity*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	interval, window, res: LONGINT; pending: BOOLEAN; event: Bluetooth.EventPacket; param: ARRAY 4 OF CHAR;
+	interval, window: LONGINT; res: WORD; pending: BOOLEAN; event: Bluetooth.EventPacket; param: ARRAY 4 OF CHAR;
 BEGIN
 	IF context.arg.GetString(ident) & context.arg.GetInteger(interval, TRUE) & context.arg.GetInteger(window, TRUE) THEN
 		d := Find(ident);
@@ -558,7 +558,7 @@ PROCEDURE Inquiry*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device; lap: ARRAY 3 OF CHAR;
 	params: ARRAY 5 OF CHAR; event: Bluetooth.EventPacket; pending: BOOLEAN;
-	length, numResponses, i, res: LONGINT;
+	length, numResponses, i: LONGINT; res: WORD;
 BEGIN
 	context.arg.SkipWhitespace; context.arg.String(ident); context.arg.SkipWhitespace;
 	FOR i := 0 TO LEN(lap)-1 DO lap[i] := HexToChar(context.arg.Get(), context.arg.Get()) END;
@@ -720,7 +720,7 @@ END ListHCIConnections;
 PROCEDURE ReadClockOffset*(context : Commands.Context);
 VAR
 	ident: Ident; d: Device;
-	handle, res: LONGINT; event: Bluetooth.EventPacket; pending: BOOLEAN; param: ARRAY 2 OF CHAR;
+	handle: LONGINT; res: WORD; event: Bluetooth.EventPacket; pending: BOOLEAN; param: ARRAY 2 OF CHAR;
 BEGIN
 	IF context.arg.GetString(ident) & context.arg.GetInteger(handle, TRUE) THEN
 		d := Find(ident);

source/CDRecord.Mod

@@ -382,7 +382,7 @@ TYPE
 
 		PROCEDURE UpdateCapacity*;
 		VAR
-			size, res: LONGINT;
+			size: LONGINT; res: WORD;
 		BEGIN
 			dev.GetSize(size, res);
 		END UpdateCapacity;
@@ -633,7 +633,7 @@ TYPE
 
 		PROCEDURE Abort;
 		VAR
-			size, res: LONGINT;
+			size: LONGINT; res: WORD;
 		BEGIN
 			Unlock();
 			(* restore previous blockSize *)
@@ -929,7 +929,7 @@ TYPE
 		PROCEDURE WaitUntilFinished*;
 		VAR
 			msg: ATADisks.GetSenseMsg;
-			res, tmp: LONGINT;
+			res, tmp: WORD;
 			timer: Kernel.Timer;
 		BEGIN
 			NEW(timer);

source/DNS.Mod

@@ -287,7 +287,7 @@ BEGIN
 	name[j] := 0X
 END Domain;
 
-PROCEDURE RetrieveInfo(qtype: LONGINT; VAR adr: IP.Adr; VAR buf, hname: ARRAY OF CHAR; VAR len, timeout, res: LONGINT);
+PROCEDURE RetrieveInfo(qtype: LONGINT; VAR adr: IP.Adr; VAR buf, hname: ARRAY OF CHAR; VAR len, timeout: LONGINT; VAR res: WORD);
 VAR
 	name0: Name;
 	adr0: IP.Adr;
@@ -382,7 +382,7 @@ BEGIN
 	INC(NDNSSent);
 END SendQuery;
 
-PROCEDURE ReceiveReply(pcb: UDP.Socket; VAR buf: ARRAY OF CHAR; VAR len, res: LONGINT);
+PROCEDURE ReceiveReply(pcb: UDP.Socket; VAR buf: ARRAY OF CHAR; VAR len: LONGINT; VAR res: WORD);
 VAR radr: IP.Adr; rport: LONGINT;
 BEGIN
 	REPEAT
@@ -391,7 +391,7 @@ BEGIN
 	IF res = Ok THEN INC(NDNSReceived) ELSE len := 0 END
 END ReceiveReply;
 
-PROCEDURE QueryDNS(type: LONGINT; VAR buf, qname, hname: ARRAY OF CHAR; VAR adr: IP.Adr; VAR timeout, res: LONGINT);
+PROCEDURE QueryDNS(type: LONGINT; VAR buf, qname, hname: ARRAY OF CHAR; VAR adr: IP.Adr; VAR timeout: LONGINT; VAR res: WORD);
 VAR
 	j, k, len, serverCount: LONGINT;
 	pcb: UDP.Socket;

source/DiskBenchmark.Mod

@@ -149,7 +149,7 @@ TYPE
 			avgDuration : REAL;
 			milliTimer : Kernel.MilliTimer;
 			time : LONGINT;
-			i, res : LONGINT;
+			i : LONGINT; res : WORD;
 			temp : ARRAY 256 OF CHAR;
 		BEGIN
 			ASSERT((mode = Disks.Read) OR (mode = Disks.Write));
@@ -198,7 +198,7 @@ TYPE
 			nbrOfBytes : HUGEINT;
 			milliTimer : Kernel.MilliTimer;
 			time : LONGINT;
-			i, res : LONGINT;
+			i : LONGINT; res : WORD;
 			temp : ARRAY 256 OF CHAR;
 		BEGIN
 			ASSERT((mode = Disks.Read) OR (mode = Disks.Write));

source/DiskTests.Mod

@@ -51,7 +51,7 @@ TYPE
 		END FillWithTestData;
 
 		PROCEDURE DoOperation*;
-		VAR pos, num, nbrOfBlocks, blocksWritten, res : LONGINT; temp : ARRAY 256 OF CHAR;
+		VAR pos, num, nbrOfBlocks, blocksWritten : LONGINT; res : WORD; temp : ARRAY 256 OF CHAR;
 		BEGIN
 			SetStatus(state.status, "Writing test data...", 0, 0, disk.table[partition].size, TRUE);
 			NEW(buffer, disk.device.blockSize * sectorsPerTransfer);
@@ -87,7 +87,7 @@ TYPE
 
 		PROCEDURE DoOperation*;
 		VAR
-			pos, num, nbrOfBlocks, blocksRead, res : LONGINT; string, nbr : ARRAY 128 OF CHAR;
+			pos, num, nbrOfBlocks, blocksRead : LONGINT; res : WORD; string, nbr : ARRAY 128 OF CHAR;
 			expected, found, foundAt : LONGINT;
 		BEGIN
 			SetStatus(state.status, "Verifying test data...", 0, 0, disk.table[partition].size, TRUE);
@@ -220,7 +220,7 @@ TYPE
 		END WriteSummary;
 
 		PROCEDURE PerformStep;
-		VAR pos, num, res, expected, found, foundAt : LONGINT; string, nbr : ARRAY 128 OF CHAR;
+		VAR pos, num, expected, found, foundAt : LONGINT; res : WORD; string, nbr : ARRAY 128 OF CHAR;
 		BEGIN
 			num := random.Dice(maxNbrOfSectors) + 1;
 			IF maxNbrOfSectors > 1 THEN testedSectors[num - 1] := TRUE; END;
@@ -349,7 +349,7 @@ PROCEDURE TransferBlocks*(context : Commands.Context); (** dev#part "READ"|"WRIT
 VAR
 	selection : Lib.Selection;
 	string : ARRAY 32 OF CHAR; dev : Disks.Device;
-	op, block, numblocks, res : LONGINT;
+	op, block, numblocks : LONGINT; res : WORD;
 	buffer : POINTER TO ARRAY OF CHAR;
 BEGIN
 	IF Partitions.GetSelection(context, FALSE, selection) THEN

source/DriverDatabase.Mod

@@ -100,7 +100,7 @@ VAR
 
 (* Compare the specified XML attritbute value to the specified integer value *)
 PROCEDURE Matches(driver : XML.Element; CONST attribute : ARRAY OF CHAR; value : LONGINT) : BOOLEAN;
-VAR string : XML.String; number, res : LONGINT;
+VAR string : XML.String; number : LONGINT; res : WORD;
 BEGIN
 	ASSERT(driver # NIL);
 	string := driver.GetAttributeValue(attribute);

source/FATScavenger.Mod

@@ -980,7 +980,7 @@ TYPE
 			buffer : POINTER TO ARRAY OF CHAR;
 			buffersize, reads : LONGINT;
 			operation : String;
-			i, j, k, res : LONGINT;
+			i, j, k : LONGINT; res : WORD;
 		BEGIN
 			IF Trace THEN KernelLog.String("Comparing FATs... "); END;
 			INC(curOp); operation := GetString(curOp, maxOp, "", "Comparing FAT structures");
@@ -1174,7 +1174,7 @@ TYPE
 		VAR
 			temp, temp2 : LostCluster;
 			string, error : String;
-			counter, res : LONGINT;
+			counter : LONGINT; res : WORD;
 		BEGIN
 			IF Trace THEN KernelLog.String("Deleting lost clusters... "); END;
 			ASSERT((lostErrorList#NIL) & (fileList#NIL));
@@ -1600,7 +1600,7 @@ TYPE
 			temp2 : Entry;
 			test : BOOLEAN;
 			address : Files.Address;
-			offset, res : LONGINT;
+			offset : LONGINT; res : WORD;
 		BEGIN
 			ASSERT((entry # NIL) & (vol # NIL) & (dev # NIL));
 			test:=TRUE;
@@ -1650,7 +1650,7 @@ TYPE
 			RETURN string;
 		END GetString;
 
-		PROCEDURE ReportTransferError(name : ARRAY OF CHAR; op, adr, res : LONGINT);
+		PROCEDURE ReportTransferError(name : ARRAY OF CHAR; op, adr: LONGINT; res: WORD);
 		VAR temp: ARRAY 256 OF CHAR;
 		BEGIN
 			Strings.Append(name, " (");
@@ -1731,7 +1731,7 @@ TYPE
 			rootDirSectors, firstDataSector : LONGINT;
 			freeCount, firstFree, media: LONGINT;
 			spc, type : LONGINT; (* sectors per cluster *)
-			i, res : LONGINT;
+			i : LONGINT; res : WORD;
 			temp: ARRAY 256 OF CHAR;
 		BEGIN
 			type := disk.table[partition].type;

source/FirewireSBP2.Mod

@@ -193,7 +193,7 @@ TYPE
 		t: Kernel.Timer;
 
 		PROCEDURE Config;
-		VAR size, diskres,payloadNotCoded: LONGINT;
+		VAR size ,payloadNotCoded: LONGINT; diskres: WORD;
 		BEGIN
 			payloadNotCoded:= SYSTEM.VAL(LONGINT,LSH({0},maxPayload+1));
 			NEW(dataBufferFIFO,10,payloadNotCoded);
@@ -297,7 +297,7 @@ BEGIN
 	END
 END CreateCommandOrb;
 
-PROCEDURE LinkCommandOrb(commandOrb: Sbp2CommandOrb;VAR diskres: LONGINT);
+PROCEDURE LinkCommandOrb(commandOrb: Sbp2CommandOrb;VAR diskres: WORD);
 VAR buffer: ARRAY 2 OF SET; quadlet: SET;
 BEGIN
 	diskres:= 0;
@@ -378,7 +378,7 @@ BEGIN
 	SYSTEM.PUT32(statusBufAddr,{});
 END HandleStatus;
 
-PROCEDURE SendCommand(VAR command: Command;VAR diskres: LONGINT): BOOLEAN;
+PROCEDURE SendCommand(VAR command: Command;VAR diskres: WORD): BOOLEAN;
 VAR
 	commandOrb: Sbp2CommandOrb;i,addr,retBufferAddr : LONGINT; (* t: Kernel.Timer; *)
 	statusHi,statusLow: SET;
@@ -432,7 +432,7 @@ BEGIN
 	RETURN TRUE;
 END SendCommand;
 
-PROCEDURE Handle *(VAR msg: Disks.Message; VAR diskres: LONGINT);
+PROCEDURE Handle *(VAR msg: Disks.Message; VAR diskres: WORD);
 (* VAR command: Command; cylinders,heads,sectors,i: LONGINT; *)
 BEGIN
 	KernelLog.String("HANDLE"); KernelLog.Ln;
@@ -466,7 +466,7 @@ BEGIN
 	(* KernelLog.Int(SELF.blockSize,2); *)
 END Handle;
 
-PROCEDURE Transfer*(op,block,num: LONGINT; VAR data: ARRAY OF CHAR; ofs: LONGINT; VAR diskres: LONGINT);
+PROCEDURE Transfer*(op,block,num: LONGINT; VAR data: ARRAY OF CHAR; ofs: LONGINT; VAR diskres: WORD);
 VAR i, payloadNotCoded: LONGINT; command: Command; numOfBlocks,tries: LONGINT;
 BEGIN
 
@@ -513,7 +513,7 @@ BEGIN
 	END;
 END Transfer;
 
-PROCEDURE GetSize*(VAR size: LONGINT;VAR diskres: LONGINT);
+PROCEDURE GetSize*(VAR size: LONGINT;VAR diskres: WORD);
 VAR command: Command; i: LONGINT; (* dev: Sbp2Dev; *)
 BEGIN
 
@@ -1183,7 +1183,7 @@ END Print;
 
 (** Test procedure *)
 PROCEDURE TestTransfer*;
-VAR diskres,ofs,i: LONGINT; data: ARRAY 1024 OF CHAR; dev: Sbp2Dev;grp: SbpDevGrp;
+VAR diskres: WORD; ofs,i: LONGINT; data: ARRAY 1024 OF CHAR; dev: Sbp2Dev;grp: SbpDevGrp;
 	tempSet: SET;
 BEGIN
 	ofs:= 0;

source/IP.Mod

@@ -374,7 +374,8 @@ VAR
 	hexToChar: ARRAY 3 OF CHAR;
 	leftParts: LONGINT;					(* number of bytes before :: *)
 	rightParts: LONGINT;				(* number of bytes after :: *)
-	val, res: LONGINT;
+	val: LONGINT;
+	res: WORD;
 	state: LONGINT;						(* state of the FSM look at the eof for more info *)
 	dPointOcc: BOOLEAN;				(* double point occured *)
 	prefixVal: LONGINT;

source/InitNetwork.Mod

@@ -856,7 +856,8 @@ VAR
 	intv4: IPv4.Interface;
 	intv6: IPv6.Interface;
 	intName: IP.Name; (* if autoconf = true; there are two ip interfaces (v4 & v6) *)
-	i, res: LONGINT;
+	i: LONGINT;
+	res: WORD;
 	linkLocalAdr: IP.Adr;
 	linkLocalPrefix: IP.Adr;
 	routerConfigItem: IPv6.RouterConfig;

source/Installer.Mod

@@ -456,7 +456,7 @@ TYPE
 		END PackagesProgress;
 
 		PROCEDURE DoOperation*;
-		VAR i, res : LONGINT;
+		VAR i : LONGINT; res : WORD;
 		BEGIN
 			ASSERT((config.disk.device = disk.device) & (config.partition = partition));
 			installLog.String("Starting installation on partition "); installLog.String(diskpartString); installLog.String("..."); installLog.Ln; installLog.Update;

source/Intel8255x.Mod

@@ -209,7 +209,7 @@ TYPE
 			rcvAdr, rcvSize: LONGINT;
 
 		PROCEDURE &Init*(dev: LinkDevice; base: ADDRESS; irq: LONGINT);
-		VAR res, i: LONGINT;
+		VAR res: WORD; i: LONGINT;
 			configCmd, iASetupCmd: DataBlock;
 		BEGIN
 			SELF.next := installedControllers; installedControllers := SELF;

source/Mail.Mod

@@ -184,7 +184,7 @@ TYPE
 
 TYPE
 	Sender* = OBJECT
-		PROCEDURE Send*(m : Message; VAR result : LONGINT);
+		PROCEDURE Send*(m : Message; VAR result : WORD);
 		END Send;
 	END Sender;
 

source/MakeIsoImages.Mod

@@ -857,7 +857,7 @@ TYPE
 
 		PROCEDURE ReadDir(parent: Directory): LONGINT;
 		VAR
-			index, size, lba, len, res: LONGINT;
+			index, size, lba, len: LONGINT; res: WORD;
 			name : ARRAY MaxLen OF CHAR;
 			dirRec: DirectoryRecord;
 			file: File;
@@ -1748,7 +1748,7 @@ END DirExists;
 (* SaveImage is used to copy data cds *)
 PROCEDURE SaveImage*(dev: ATADisks.DeviceATAPI; startsec: LONGINT; CONST dest: ARRAY OF CHAR; onWriteStatusChanged: Utils.StatusProc): LONGINT;
 VAR
-	sec, size, res: LONGINT;
+	sec, size: LONGINT; res: WORD;
 	buf: ARRAY TransferSize*SectorSize OF CHAR;
 	pvd: PSVolumeDescriptor;
 	f: Files.File;
@@ -1796,7 +1796,7 @@ END SaveImage;
 PROCEDURE GetVolumeDescriptor*(dev: ATADisks.DeviceATAPI; startsec: LONGINT; VAR descr: PSVolumeDescriptor; descrType: LONGINT): LONGINT;
 VAR
 	type: CHAR;
-	sec, res: LONGINT;
+	sec: LONGINT; res: WORD;
 	tmp: ARRAY MaxLen OF CHAR;
 	buf: ARRAY SectorSize OF CHAR;
 BEGIN

source/MouseSerial.Mod

@@ -157,7 +157,7 @@ TYPE
 			"bps" - V24.BPS*
 			"rate" - sample rate (not all mice support this) *)
 		PROCEDURE &Init*(port : Serials.Port; type : LONGINT);
-		VAR c: CHAR; res, n: LONGINT;
+		VAR c: CHAR; res: WORD; n: LONGINT;
 		BEGIN
 			(* ASSERT: Port is already open *)
 			ASSERT(port # NIL);
@@ -322,7 +322,7 @@ BEGIN
 END GetMouseType;
 
 PROCEDURE Detect(port : Serials.Port; VAR mouseType : LONGINT): BOOLEAN;
-VAR ch: CHAR; i, res : LONGINT; mouseIdent : ARRAY DetectMaxIdent OF CHAR;
+VAR ch: CHAR; i : LONGINT; res : WORD; mouseIdent : ARRAY DetectMaxIdent OF CHAR;
 BEGIN
 	ASSERT(port # NIL);
 	port.Open(BPS, 7,  Serials.ParNo, Serials.Stop1, res);

source/NCR810Disks.Mod

@@ -27,7 +27,7 @@ IMPORT SYSTEM, Machine, KernelLog, ASPI := SymbiosASPI, Disks, Plugins;
 			END
 		END Transfer;
 
-		PROCEDURE GetSize*(VAR size, res: LONGINT);
+		PROCEDURE GetSize*(VAR size: LONGINT; VAR res: WORD);
 		BEGIN
 			size := devs[drive].capacity;
 			res := Disks.Ok
@@ -315,7 +315,7 @@ IMPORT SYSTEM, Machine, KernelLog, ASPI := SymbiosASPI, Disks, Plugins;
 	END Init;
 
 	PROCEDURE Register;
-	VAR i, res: LONGINT;  dev: Device; name : ARRAY 12 OF CHAR;
+	VAR i: LONGINT; res: WORD; dev: Device; name : ARRAY 12 OF CHAR;
 	BEGIN
 		FOR i := 0 TO numdevs-1 DO
 			NEW(dev); devs[i].dev := dev;

source/NetworkMii.Mod

@@ -329,7 +329,7 @@ TYPE
 		END GetAutoNegotiationResult;
 
 		(** Get the current link status *)
-		PROCEDURE GetLinkStatus*(VAR linkStatus, res : LONGINT);
+		PROCEDURE GetLinkStatus*(VAR linkStatus: LONGINT; VAR res : WORD);
 		VAR value : SET;
 		BEGIN
 			ASSERT(lockedBy = Objects.ActiveObject());

source/OSCEval.Mod

@@ -27,7 +27,8 @@ TYPE
 			buffer: POINTER TO ARRAY OF CHAR;
 			receivefip: IP.Adr;
 			receivefport: LONGINT;
-			got, res: LONGINT;
+			got: LONGINT;
+			res: WORD;
 			fip: IP.Adr;
 		PROCEDURE &Init*;
 		VAR
@@ -57,7 +58,8 @@ TYPE
 	tcpagent = OBJECT(TCPServices.Agent);
 		VAR
 			newpacket: OSC.OSCPacket;
-			res, len: LONGINT;
+			res: WORD;
+			len: LONGINT;
 			buffer: POINTER TO ARRAY OF CHAR;
 			sizebuf: ARRAY 4 OF CHAR;
 			packetsize: LONGINT;

source/OSCNet.Mod

@@ -118,7 +118,8 @@ TYPE
 			fip2: IP.Adr; fport2: LONGINT;
 			size: LONGINT;
 			buffer: Strings.String;
-			got, res: LONGINT;
+			got: LONGINT;
+			res: WORD;
 			endticks: LONGINT;
 			istimeout: BOOLEAN;
 		BEGIN
@@ -162,7 +163,8 @@ TYPE
 			newUDPData: OSCUDPData;
 			buffer: OSC.String; (* ARRAY MaxUDPPacketLength OF CHAR; *)
 			receivefip: IP.Adr; receivefport: LONGINT;
-			got, res: LONGINT;
+			got: LONGINT;
+			res: WORD;
 
 		(* Sets the signal to stop the service *)
 		PROCEDURE Stop*;
@@ -358,7 +360,7 @@ TYPE
 
 	PROCEDURE ReceiveTCP(client: TCP.Connection; VAR p: OSC.OSCPacket): LONGINT;
 	VAR
-		res, len: LONGINT;
+		res: WORD; len: LONGINT;
 		buffer: POINTER TO ARRAY OF CHAR;
 		sizebuf: ARRAY 4 OF CHAR;
 		packetsize: LONGINT;

source/OldDiskFS.Mod

@@ -547,7 +547,7 @@ TYPE
 		END Init;
 
 		PROCEDURE New0*(name: ARRAY OF CHAR): Files.File;
-		VAR i, res: LONGINT; f: File; buf: Buffer; head: FileHd; namebuf: FileName;
+		VAR i: LONGINT; res: WORD; f: File; buf: Buffer; head: FileHd; namebuf: FileName;
 		BEGIN {EXCLUSIVE}
 			f := NIL; Check(name, namebuf, res);
 			IF res <= 0 THEN

source/PartitionEditor.Mod

@@ -41,7 +41,7 @@ TYPE
 		PROCEDURE HandleButtons(sender, data : ANY);
 		VAR
 			deviceName : ARRAY 32 OF CHAR;
-			pt : PartitionTable.PartitionTable; blockNumber, res : LONGINT;
+			pt : PartitionTable.PartitionTable; blockNumber : LONGINT; res : WORD;
 			message: ARRAY 256 OF CHAR;
 		BEGIN
 			IF (sender = storeBtn) THEN

source/PartitionEditorTable.Mod

@@ -58,7 +58,7 @@ END GetDevice;
 
 (* Get the disk geometry of a named device *)
 PROCEDURE GetDiskGeometry(CONST devicename : ARRAY OF CHAR; VAR diskGeometry : DiskGeometry; VAR res : WORD);
-VAR device : Disks.Device; geometry : Disks.GetGeometryMsg; ignore : LONGINT;
+VAR device : Disks.Device; geometry : Disks.GetGeometryMsg; ignore : WORD;
 BEGIN
 	device := GetDevice(devicename);
 	IF (device # NIL) THEN
@@ -79,7 +79,7 @@ END GetDiskGeometry;
 
 (* read a block from device with name devicename. Returns with res = Disks.Ok, if successful *)
 PROCEDURE ReadBlock*(CONST devicename : ARRAY OF CHAR;  block : LONGINT; VAR buffer: Buffer; VAR res: WORD);
-VAR device : Disks.Device; ignore : LONGINT;
+VAR device : Disks.Device; ignore : WORD;
 BEGIN
 	device := GetDevice(devicename);
 	IF (device # NIL) THEN
@@ -99,7 +99,7 @@ END ReadBlock;
 
 (* write a block to device with name devicename. Returns with res = Disks.Ok, if successful*)
 PROCEDURE WriteBlock*(CONST devicename : ARRAY OF CHAR; block : LONGINT; VAR buffer: Buffer; VAR res: WORD);
-VAR device : Disks.Device; ignore : LONGINT;
+VAR device : Disks.Device; ignore : WORD;
 BEGIN
 	device := GetDevice(devicename);
 	IF (device # NIL) THEN

source/PartitionsLib.Mod

@@ -184,9 +184,9 @@ TYPE
 	Disk* = RECORD
 		device* : AosDisks.Device;
 		table* : AosDisks.PartitionTable; (* extended copy of device.table *)
-		size*, res*: LONGINT; (* device.GetSize(size, res); Size is valid only when res = AosDisks.Ok *)
+		size*: LONGINT; res*: WORD; (* device.GetSize(size, res); Size is valid only when res = AosDisks.Ok *)
 		geo* : AosDisks.GetGeometryMsg; (* device.Handle(geo, res); geo is valid only when res = AosDisks.Ok *)
-		gres* : LONGINT;
+		gres* : WORD;
 		fs* : POINTER TO ARRAY OF Files.FileSystem;
 		isDiskette* : BOOLEAN; (* is this a floppy drive diskette? *)
 	END;
@@ -363,14 +363,14 @@ TYPE
 		END ShowLocks;
 
 		PROCEDURE &Init*;
-		VAR ignore : LONGINT;
+		VAR res : WORD;
 		BEGIN
 			NEW(usedDisks);
 			AosDisks.registry.GetAll(devTable);
 			NEW(onChanged, SELF,Strings.NewString("DiskModelChanged"), NIL, NIL);
 			lockLevel := 0;
 			UpdateAllDisks;
-			AosDisks.registry.AddEventHandler(DiskEventHandler, ignore);
+			AosDisks.registry.AddEventHandler(DiskEventHandler, res);
 		END Init;
 
 		(** Update partition tables & file systems of all disk devices *)
@@ -386,7 +386,7 @@ TYPE
 			doClose : BOOLEAN;
 			errorWriter : Streams.StringWriter;
 			errorString : ARRAY 1024 OF CHAR;
-			i, j, res : LONGINT;
+			i, j : LONGINT; res: WORD;
 		BEGIN (* caller must hold lock *)
 			Acquire;
 			IF devTable # NIL THEN
@@ -454,7 +454,7 @@ TYPE
 		END UpdateDisk;
 
 		PROCEDURE UpdateDiskInternal(i : LONGINT);
-		VAR dev : AosDisks.Device; errorWriter : Streams.StringWriter; errorString : ARRAY 1024 OF CHAR; doClose : BOOLEAN; j, res : LONGINT;
+		VAR dev : AosDisks.Device; errorWriter : Streams.StringWriter; errorString : ARRAY 1024 OF CHAR; doClose : BOOLEAN; j : LONGINT; res: WORD;
 		BEGIN
 			dev := disks[i].device;
 			IF dev # NIL THEN
@@ -558,7 +558,7 @@ TYPE
 
 		(* Get geometry from partition table, if possible. *)
 		PROCEDURE GetTableGeometry(dev: AosDisks.Device; VAR hds, spt: LONGINT): BOOLEAN;
-		VAR buf: ARRAY BS OF CHAR; res, p, hd, sec, i: LONGINT; ok: BOOLEAN;
+		VAR buf: ARRAY BS OF CHAR; res: WORD; p, hd, sec, i: LONGINT; ok: BOOLEAN;
 		BEGIN
 			ok := FALSE;
 			IF dev.blockSize # BS THEN RETURN FALSE; END;
@@ -887,9 +887,9 @@ TYPE
 		END PartitionsOverlap;
 
 		PROCEDURE Finalize;
-		VAR ignore : LONGINT;
+		VAR res : WORD;
 		BEGIN
-			AosDisks.registry.RemoveEventHandler(DiskEventHandler, ignore);
+			AosDisks.registry.RemoveEventHandler(DiskEventHandler, res);
 		END Finalize;
 
 	END DisksModel;
@@ -1605,7 +1605,7 @@ TYPE
 	PartitionToFile* = OBJECT(Image);
 
 		PROCEDURE DoOperation*;
-		VAR f : Files.File; w: Files.Writer; error : String; pos, i, num, res : LONGINT; temp: ARRAY 256 OF CHAR;
+		VAR f : Files.File; w: Files.Writer; error : String; pos, i, num : LONGINT; res : WORD; temp: ARRAY 256 OF CHAR;
 		BEGIN
 			f := Files.New(filename);
 			IF f # NIL THEN
@@ -1650,7 +1650,7 @@ TYPE
 	FileToPartition* = OBJECT(Image);
 
 		PROCEDURE DoOperation*; (** dev#part filename [block numblocks] ~ *)
-		VAR f: Files.File; r: Files.Reader; error : String; len, res, pos, num, i : LONGINT;
+		VAR f: Files.File; r: Files.Reader; error : String; len, pos, num, i : LONGINT; res: WORD;
 		BEGIN
 			f := Files.Old(filename);
 			IF f # NIL THEN
@@ -1775,7 +1775,7 @@ TYPE
 			maxblocks : LONGINT;
 			buf : ARRAY Size OF CHAR;
 			start, size : LONGINT;
-			seed, res, len, i, ticks: LONGINT;
+			seed, len, i, ticks: LONGINT; res: WORD;
 			temp: ARRAY 256 OF CHAR;
 		BEGIN
 			start := disk.table[partition].start; size := disk.table[partition].size;
@@ -1878,7 +1878,7 @@ TYPE
 		VAR
 			f : Files.File;
 			error : String;
-			fs, type, size, res : LONGINT;
+			fs, type, size : LONGINT; res : WORD;
 		BEGIN
 			IF (fsName = "NatFS") OR (fsName = "NatFS1") THEN type := NativeType1
 			ELSIF fsName = "NatFS2" THEN type := NativeType2
@@ -2112,7 +2112,7 @@ TYPE
 		PROCEDURE DoOperation*; (** dev#part block [numblocks] ~ *)
 		VAR
 			text : Texts.Text; tw : TextUtilities.TextWriter;
-			pos, num, res : LONGINT;
+			pos, num : LONGINT; res : WORD;
 			buf: POINTER TO ARRAY OF CHAR;
 			temp: ARRAY 256 OF CHAR;
 		BEGIN
@@ -2199,7 +2199,7 @@ TYPE
 		END SetParameters;
 
 		PROCEDURE DoOperation*;
-		VAR  res, fs : LONGINT; string: ARRAY 256 OF CHAR; f : Files.File;
+		VAR  res: WORD; fs : LONGINT; string: ARRAY 256 OF CHAR; f : Files.File;
 		BEGIN
 			fs := DetectFS(disk.device, partition);
 			IF (fs = AosFS32) OR (fs = AosFS128) THEN
@@ -2294,7 +2294,7 @@ TYPE
 
 		(* Update the boot file in an existing Oberon partition. *)
 		PROCEDURE DoOperation*; (** dev#part [ BootFile ] ~ *)
-		VAR  f : Files.File; res, fs : LONGINT; temp: ARRAY 256 OF CHAR;
+		VAR  f : Files.File; res: WORD; fs : LONGINT; temp: ARRAY 256 OF CHAR;
 		BEGIN
 			fs := DetectFS(disk.device, partition);
 			IF (fs # UnknownFS) THEN
@@ -2356,7 +2356,7 @@ TYPE
 		VAR
 			f: Files.File; r: Files.Reader; buf1, buf2: ARRAY BS OF CHAR;
 			string : ARRAY 256 OF CHAR;
-			res, len, i: LONGINT;
+			res: WORD; len, i: LONGINT;
 		BEGIN
 			f := Files.Old(filename);
 			IF f # NIL THEN
@@ -2424,7 +2424,7 @@ TYPE
 		END GetTable;
 
 		PROCEDURE DoOperation*;
-		VAR config : Configuration; fs, res : LONGINT; temp: ARRAY 256 OF CHAR;
+		VAR config : Configuration; fs : LONGINT; res : WORD; temp: ARRAY 256 OF CHAR;
 		BEGIN
 			fs := DetectFS(disk.device, partition);
 			IF (fs = AosFS32) OR (fs = AosFS128) THEN
@@ -2472,7 +2472,7 @@ TYPE
 		END SetParameters;
 
 		PROCEDURE DoOperation*;
-		VAR config : Configuration; fs, i , res : LONGINT; temp: ARRAY 256 OF CHAR;
+		VAR config : Configuration; fs, i  : LONGINT; res : WORD; temp: ARRAY 256 OF CHAR;
 		BEGIN
 			fs := DetectFS(disk.device, partition);
 			IF (fs = AosFS32) OR (fs = AosFS128) THEN
@@ -3111,7 +3111,7 @@ TYPE
 		PROCEDURE CreatePrimary(size, type: LONGINT) : BOOLEAN;
 		VAR
 			mbr, epbr : Block;
-			i, e, res : LONGINT;
+			i, e : LONGINT; res: WORD;
 			temp: ARRAY 256 OF CHAR;
 		BEGIN
 			ASSERT((disk.device.blockSize = BS) & (disk.table[partition].type = FreeSpace));
@@ -3169,7 +3169,7 @@ TYPE
 		VAR
 			epbr, new : Block;
 			slot1, slot2 : ARRAY 16 OF CHAR;
-			extStart, extPart, lastLogical, i, res : LONGINT;
+			extStart, extPart, lastLogical, i: LONGINT; res: WORD;
 		BEGIN
 			ASSERT((disk.device.blockSize = BS) & (disk.table[partition].type = FreeSpace));
 			IF IsExtendedPartition(type) THEN
@@ -3329,7 +3329,7 @@ TYPE
 		PROCEDURE DeletePrimary(type: LONGINT) : BOOLEAN;
 		VAR
 			mbr, epbr: Block;
-			e, i, res: LONGINT;
+			e, i: LONGINT; res: WORD;
 			result : BOOLEAN;
 			temp: ARRAY 256 OF CHAR;
 		BEGIN
@@ -3372,7 +3372,7 @@ TYPE
 		PROCEDURE DeleteLogical(type: LONGINT) : BOOLEAN;
 		VAR
 			epbr, temp : Block;
-			nextLogical, i, res, start : LONGINT;
+			nextLogical, i, start : LONGINT; res: WORD;
 			slot2 : ARRAY 16 OF CHAR;
 			extStart : LONGINT; (* adr of EPBR of extended partition *)
 			writebackAdr : LONGINT;
@@ -3503,7 +3503,7 @@ TYPE
 		(* Set active bit of dev#part to <on> *)
 		PROCEDURE DoOperation*;
 		VAR
-			res, e: LONGINT; b: ARRAY BS OF CHAR; mod: BOOLEAN;
+			res: WORD; e: LONGINT; b: ARRAY BS OF CHAR; mod: BOOLEAN;
 			string : ARRAY 256 OF CHAR;
 		BEGIN
 			disk.device.Transfer(AosDisks.Read, disk.device.table[partition].ptblock, 1, b, 0, res);
@@ -3648,7 +3648,7 @@ END WritePart;
  1 for a Native file system, 2 for an old Aos file system and 3 for a new Aos file system, 4 for unknown but
  valid boot signature  *)
 PROCEDURE DetectFS*(dev: AosDisks.Device; part: LONGINT): LONGINT;
-VAR b: ARRAY BS OF CHAR; res, fs: LONGINT; doClose : BOOLEAN;
+VAR b: ARRAY BS OF CHAR; res: WORD; fs: LONGINT; doClose : BOOLEAN;
 BEGIN
 	IF dev.blockSize # BS THEN RETURN 0; END;
 	(* special handling for diskettes *)
@@ -3694,7 +3694,7 @@ BEGIN
 END DisketteInserted;
 
 (* Read OBL variables from the specified partition. *)
-PROCEDURE GetVars(dev: AosDisks.Device; part: LONGINT; VAR tsize, reserved, fsOfs, res: LONGINT);
+PROCEDURE GetVars(dev: AosDisks.Device; part: LONGINT; VAR tsize, reserved, fsOfs: LONGINT; VAR res: WORD);
 VAR b: ARRAY BS OF CHAR;
 BEGIN
 	ASSERT(dev.blockSize = BS);
@@ -3709,7 +3709,7 @@ BEGIN
 END GetVars;
 
 (* Write the specified file to the device, starting at block pos. *)
-PROCEDURE WriteFile(f: Files.File; dev: AosDisks.Device; pos: LONGINT; VAR sum, res: LONGINT);
+PROCEDURE WriteFile(f: Files.File; dev: AosDisks.Device; pos: LONGINT; VAR sum: LONGINT; VAR res: WORD);
 CONST Size = 32;
 VAR buf: ARRAY Size*BS OF CHAR; r: Files.Rider; n, num: LONGINT;
 BEGIN
@@ -4094,7 +4094,7 @@ BEGIN
 	END;
 END GetErrorMsg;
 
-PROCEDURE GetTransferError*(dev: AosDisks.Device; op, start, res: LONGINT; VAR result: ARRAY OF CHAR);
+PROCEDURE GetTransferError*(dev: AosDisks.Device; op, start: LONGINT; res: WORD; VAR result: ARRAY OF CHAR);
 VAR w : Streams.StringWriter;
 BEGIN
 	NEW(w, 1024);

source/Ping.Mod

@@ -22,7 +22,7 @@ VAR
 	i: LONGINT;
 	hostname: DNS.Name;
 	fip: IP.Adr;
-	res1, res2: LONGINT;
+	res1, res2: WORD;
 	data: ARRAY PingHdrSize+MaxPingSize OF CHAR;
 
 BEGIN {EXCLUSIVE}

source/RMSMTP.Mod

@@ -41,7 +41,8 @@ END Send;
 PROCEDURE SendMessage*(message: IMAPClient.Message; CONST server, thisHost: ARRAY OF CHAR): LONGINT;
 VAR
 	smtp: SMTPClient.SMTPSession;
-	i, res: LONGINT;
+	i: LONGINT;
+	res: WORD;
 	returnValue: LONGINT;
 	w: Streams.Writer;
 	p: ANY;

source/RTL8139.Mod

@@ -216,7 +216,7 @@ TYPE
 	END Reset;
 
 		PROCEDURE &Init*(dev: LinkDevice; base: ADDRESS; irq, model: LONGINT);
-		VAR res, dp, ver, i, dummy: LONGINT; val, nval: SET;
+		VAR res: WORD; dp, ver, i, dummy: LONGINT; val, nval: SET;
 		BEGIN
 			SELF.next:=installedControllers; installedControllers:=SELF;
 			NEW(timer);

source/RTL8169.Mod

@@ -114,7 +114,7 @@ TYPE
 
 		PROCEDURE &Init*(dev: LinkDevice; base: ADDRESS; irq: LONGINT);
 		VAR
-			res, i: LONGINT;
+			res: WORD; i: LONGINT;
 			s: SET;
 		BEGIN
 			(* update list of installed controllers, insert at head *)

source/RfsClientProxy.Mod

@@ -147,7 +147,7 @@ TYPE
 
 		(** does nothing, just for benchmarking **)
 		PROCEDURE Error*(VAR errorcode: LONGINT);
-			VAR msgBytes, procID, testID, dataBytes, res, received: LONGINT;
+			VAR msgBytes, procID, testID, dataBytes, received: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := ERROR;
@@ -179,7 +179,7 @@ TYPE
 
 		(** retrieves fileLength, time and date of a file identified by fileID **)
 		PROCEDURE GetAttr*(fileID: LONGINT; VAR fileLen, time, date, errorcode: LONGINT);
-			VAR procID, testID, dataBytes, msgBytes, res, received: LONGINT;
+			VAR procID, testID, dataBytes, msgBytes,  received: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := GETATTR;
@@ -221,7 +221,7 @@ TYPE
 
 		(** Sets the attributes time and date of a file identified by filename **)
 		PROCEDURE SetAttr*(VAR filename: ARRAY OF CHAR; time, date: LONGINT; VAR errorcode: LONGINT);
-			VAR msgBytes, procID, testID, dataBytes, res, filenameLen, received: LONGINT;
+			VAR msgBytes, procID, testID, dataBytes, filenameLen, received: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := SETATTR;
@@ -256,7 +256,7 @@ TYPE
 
 		(** transforms a filename into a fileID **)
 		PROCEDURE Lookup*(VAR filename : ARRAY OF CHAR; VAR fileID, errorcode: LONGINT);
-			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, fileIDLen, res: LONGINT;
+			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, fileIDLen: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := LOOKUP;
@@ -299,7 +299,7 @@ TYPE
 
 		(** Reads len Bytes of data from a given offset off in a file identified by fileID and returns the data in buf at offset dstOff **)
 		PROCEDURE Read*(fileID, off, len: LONGINT; VAR buffer: ARRAY OF CHAR; dstOff: LONGINT; VAR received, errorcode: LONGINT);
-			VAR procID, testID, dataBytes, msgBytes, fileLen, res: LONGINT;
+			VAR procID, testID, dataBytes, msgBytes, fileLen: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := READ;
@@ -342,7 +342,7 @@ TYPE
 
 		(** Writes len Bytes of data beginning off bytes from the beginning of file into a file identified by fileID **)
 		PROCEDURE Write*(fileID, off, len: LONGINT; VAR buffer: ARRAY OF CHAR; VAR written, errorcode: LONGINT);
-			VAR procID, testID, dataBytes, msgBytes, res, received: LONGINT;
+			VAR procID, testID, dataBytes, msgBytes, received: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := WRITE;
@@ -383,7 +383,7 @@ TYPE
 
 		(** Creates a file with name filename and return a fileID for it **)
 		PROCEDURE Create*(VAR filename : ARRAY OF CHAR; VAR fileID, errorcode: LONGINT);
-			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, fileIDLen, res: LONGINT;
+			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, fileIDLen: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := CREATE;
@@ -425,7 +425,7 @@ TYPE
 
 		(** Deletes a File with name filename **)
 		PROCEDURE Remove*(VAR filename : ARRAY OF CHAR; VAR errorcode: LONGINT);
-			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, res: LONGINT;
+			VAR filenameLen, procID, testID, received, dataBytes, msgBytes: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := REMOVE;
@@ -459,7 +459,7 @@ TYPE
 
 		(** Renames a file with name filenemFrom into a new name filenameTo **)
 		PROCEDURE Rename*(VAR filenameFrom, filenameTo: ARRAY OF CHAR; VAR errorcode: LONGINT);
-			VAR filenameLenFrom, filenameLenTo, procID, testID, received, dataBytes, msgBytes, res: LONGINT;
+			VAR filenameLenFrom, filenameLenTo, procID, testID, received, dataBytes, msgBytes: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := RENAME;
@@ -498,7 +498,7 @@ TYPE
 			  the detail is set to 1 if time, data and size information is also to be retrieved. the offset value tells how many entries
 			  should be skip first **)
 		PROCEDURE ReadDir*(VAR filename, mask : ARRAY OF CHAR; detail, cookie: LONGINT; dir: Dir; VAR endOfDir, errorcode: LONGINT);
-			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, currentIndex, maskLen, res, time, date, size: LONGINT;
+			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, currentIndex, maskLen, time, date, size: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := READDIR;
@@ -565,7 +565,7 @@ TYPE
 
 		(** Creates a temporary File on the server and returns the name for it **)
 		PROCEDURE CreateTmp*(VAR filename : ARRAY OF CHAR; VAR hashval, errorcode: LONGINT);
-			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, hashvalLen, res: LONGINT;
+			VAR filenameLen, procID, testID, received, dataBytes, msgBytes, hashvalLen: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := CREATETMP;
@@ -614,7 +614,7 @@ TYPE
 
 		(** Changes the Directory of the corresponding rfsServerProxy Process **)
 		PROCEDURE ChDir*(VAR dir : ARRAY OF CHAR; VAR errorcode: LONGINT);
-			VAR dirLen, procID, testID, received, dataBytes, msgBytes, res: LONGINT;
+			VAR dirLen, procID, testID, received, dataBytes, msgBytes: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := CHDIR;
@@ -649,7 +649,7 @@ TYPE
 
 		(** cleans the open file structure on the server an kills the process **)
 		PROCEDURE Kill*(VAR errorcode: LONGINT);
-			VAR msgBytes, procID, testID, dataBytes, res, received: LONGINT;
+			VAR msgBytes, procID, testID, dataBytes, received: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := KILL;
@@ -680,7 +680,7 @@ TYPE
 
 		(** Authenticates the session. User and Passwd are sending in plainttext **)
 		PROCEDURE Authent*(VAR user, passwd, path: ARRAY OF CHAR; VAR errorcode: LONGINT);
-			VAR userLen, passwdLen, pathLen, procID, received, dataBytes, msgBytes, res: LONGINT;
+			VAR userLen, passwdLen, pathLen, procID, received, dataBytes, msgBytes: LONGINT; res: WORD;
 		BEGIN
 			(*prepare params and send*)
 			procID := AUTHENT;

source/RfsConnection.Mod

@@ -66,7 +66,7 @@ TYPE
 		END Close;
 
 		(** If Connection down, Receive tries to connect again **)
-		PROCEDURE Receive*(VAR buf: ARRAY OF CHAR; off, len: LONGINT; VAR received, res: LONGINT);
+		PROCEDURE Receive*(VAR buf: ARRAY OF CHAR; off, len: LONGINT; VAR received: LONGINT; VAR res: WORD);
 		BEGIN{EXCLUSIVE}
 			received := 0;
 			res := TCP.NotConnected;

source/RfsFS.Mod

@@ -135,7 +135,7 @@ TYPE
 		END Old0;
 
 		(** deletes a file, res = 0 indicates succsess **)
-		PROCEDURE Delete0*(name: ARRAY OF CHAR; VAR key, res: LONGINT);
+		PROCEDURE Delete0*(name: ARRAY OF CHAR; VAR key: LONGINT; VAR res: WORD);
 		VAR namebuf: FileName; errorcode: LONGINT;
 		BEGIN {EXCLUSIVE}
 			Check(name, namebuf, res);

source/SCSI.Mod

@@ -194,7 +194,7 @@ TYPE
 			END
 		END Transfer;
 
-		PROCEDURE GetSize*(VAR size, res: LONGINT);
+		PROCEDURE GetSize*(VAR size: LONGINT; VAR res: WORD);
 		VAR  blkSize: LONGINT;
 		BEGIN
 			DoReadCapacity(bus, target, 0, size, blkSize, res);
@@ -331,7 +331,7 @@ BEGIN
 	c.target := t;  c.lun := l;  c.chan := 0;
 END NewCmd;
 
-PROCEDURE DoSense*(b: Bus;  target,  lun: SHORTINT;  VAR key, code, res: LONGINT);
+PROCEDURE DoSense*(b: Bus;  target,  lun: SHORTINT;  VAR key, code: LONGINT; VAR res: WORD);
 VAR requ: Command; data: ARRAY 36 OF CHAR;
 BEGIN
 	MakeCmd6(requ.cmd, RequestSense, lun, 0, 36, 0);
@@ -512,7 +512,7 @@ END NumToChar;
 (** SCSI Bus Handling *)
 
 PROCEDURE InitBus(bus: Bus);
-VAR  i: SHORTINT;  d: Disk; data: InquiryData;  max, j, k, res: LONGINT;  name: Plugins.Name;
+VAR  i: SHORTINT;  d: Disk; data: InquiryData;  max, j, k: LONGINT; res: WORD; name: Plugins.Name;
 BEGIN
 	i := 0;
 	IF bus.wide THEN  max := 16  ELSE  max := 8  END;

source/SMTPClient.Mod

@@ -53,7 +53,7 @@ TYPE
 			IF w.res = Streams.Ok THEN res := Ok ELSE res := w.res END
 		END SendCommand;
 
-		PROCEDURE Open*(CONST server, thisHost : ARRAY OF CHAR; port: LONGINT; VAR result : LONGINT);
+		PROCEDURE Open*(CONST server, thisHost : ARRAY OF CHAR; port: LONGINT; VAR result : WORD);
 		VAR fip : IP.Adr;
 				res: WORD; reply : LONGINT;
 		BEGIN

source/SSFS.Mod

@@ -87,7 +87,7 @@ TYPE
 
 		(* finalizer: called when the filesystem goes down. As we do not make use of caches, this only closes the device for the time being *)
 		PROCEDURE Finalize;
-		VAR ignore : LONGINT;
+		VAR ignore : WORD;
 		BEGIN
 			device.Close(ignore);
 		END Finalize;
@@ -349,7 +349,7 @@ TYPE
 		PROCEDURE New0*(name: ARRAY OF CHAR): Files.File;
 		VAR
 			file : File; filename : Files.FileName; fileExists : BOOLEAN;
-			inodeAdr, index, i, res : LONGINT; dateTime : Dates.DateTime;
+			inodeAdr, index, i : LONGINT; res : WORD; dateTime : Dates.DateTime;
 			inode : Inode; block : Block;
 		BEGIN {EXCLUSIVE}
 			IF Trace THEN KernelLog.String("New: "); KernelLog.String(name); KernelLog.Ln; END;
@@ -407,7 +407,7 @@ TYPE
 
 		(** Open an existing file. The same file descriptor is returned if a file is opened multiple times.  End users use Files.Old instead. *)
 		PROCEDURE Old0*(name: ARRAY OF CHAR): Files.File;
-		VAR file : File; filename : Files.FileName; block : Block; inode : Inode;  index, res : LONGINT;
+		VAR file : File; filename : Files.FileName; block : Block; inode : Inode;  index : LONGINT; res : WORD;
 		BEGIN {EXCLUSIVE}
 			IF Trace THEN KernelLog.String("Old: "); KernelLog.String(name); KernelLog.Ln; END;
 			file := NIL;
@@ -471,7 +471,7 @@ TYPE
 		END FindEntry;
 
 		(** Delete a file. res = 0 indicates success.  End users use Files.Delete instead. *)
-		PROCEDURE Delete0*(name: ARRAY OF CHAR; VAR key, res: LONGINT);
+		PROCEDURE Delete0*(name: ARRAY OF CHAR; VAR key: LONGINT; VAR res: WORD);
 		VAR filename : Files.FileName; index : LONGINT; block : Block;
 		BEGIN {EXCLUSIVE}
 			IF Trace THEN KernelLog.String("Delete: "); KernelLog.String(name); KernelLog.Ln; END;
@@ -530,7 +530,7 @@ TYPE
 
 		(** Enumerate canonical file names. mask may contain * wildcards.  For internal use only.  End users use Enumerator instead. *)
 		PROCEDURE Enumerate0*(mask: ARRAY OF CHAR; flags: SET; enum: Files.Enumerator);
-		VAR i : LONGINT; block : Block; inode : Inode; name : Files.FileName; attributes : SET; time, date, size, res : LONGINT;
+		VAR i : LONGINT; block : Block; inode : Inode; name : Files.FileName; attributes : SET; time, date, size: LONGINT; res : WORD;
 		BEGIN {EXCLUSIVE}
 			IF( mask # "") THEN
 				FOR i := 0 TO LEN(rootDirectory)-1 DO
@@ -582,7 +582,7 @@ TYPE
 
 		(** Remove a directory. If force=TRUE, any subdirectories and files should be automatically deleted.
 			End users use Files.RemoveDirectory instead. *)
-		PROCEDURE RemoveDirectory0*(name: ARRAY OF CHAR; force: BOOLEAN; VAR key, res: LONGINT);
+		PROCEDURE RemoveDirectory0*(name: ARRAY OF CHAR; force: BOOLEAN; VAR key: LONGINT; VAR res: WORD);
 		BEGIN {EXCLUSIVE}
 			res := -1; (* not supported *)
 		END RemoveDirectory0;
@@ -689,7 +689,7 @@ TYPE
 		Less bytes will be read when reading over the end of the file.
 		r.res indicates the number of unread bytes. x must be big enough to hold all the bytes. *)
 		PROCEDURE ReadBytes*(VAR r:  Files.Rider; VAR x: ARRAY OF CHAR; ofs, len: LONGINT);
-		VAR dnode : Dnode; dataLeft, nofBytes, pos, res : LONGINT; eof : BOOLEAN;
+		VAR dnode : Dnode; dataLeft, nofBytes, pos : LONGINT; res: WORD; eof : BOOLEAN;
 		BEGIN {EXCLUSIVE}
 			ASSERT(r.file = SELF);
 			ASSERT(LEN(x) >= ofs + len); (* buffer big enough *)
@@ -749,7 +749,7 @@ TYPE
 
 		(** Write the buffer x containing len bytes (starting at offset ofs) into a file at the Rider position. *)
 		PROCEDURE WriteBytes*(VAR r: Files.Rider; CONST x: ARRAY OF CHAR; ofs, len: LONGINT);
-		VAR dnode : Dnode; blockNumber, spaceLeft, nofBytes, pos, res : LONGINT;
+		VAR dnode : Dnode; blockNumber, spaceLeft, nofBytes, pos : LONGINT; res : WORD;
 		BEGIN {EXCLUSIVE}
 			ASSERT(r.file = SELF);
 			ASSERT(r.bpos * BlockSize + r.apos <= inode.size); (* rider not positioned beyond end of file *)

source/SVNAdmin.Mod

@@ -270,7 +270,7 @@ TYPE
 		PROCEDURE Add* ( CONST path : ARRAY OF CHAR; CONST name : ARRAY OF CHAR; addGlobal : BOOLEAN; VAR res : WORD );
 		VAR
 			file, entryfile, tmp, tmp2 : Files.FileName;
-			res1, time, date, size : LONGINT;
+			res1 : WORD; time, date, size : LONGINT;
 			w : Files.Writer;
 			flags : SET;
 			enum : Files.Enumerator;
@@ -753,7 +753,7 @@ TYPE
 		key = "svn:wc:ra_dav:version-url";
 	VAR
 		tmp,fstr,fstr2 : ARRAY 256 OF CHAR;
-		read, len, keyLength, i, res : LONGINT;
+		read, len, keyLength, i : LONGINT; res : WORD;
 		fr, fw : Files.File;
 		r : Files.Reader;
 		w : Files.Writer;

source/SymbiosDisks.Mod

@@ -122,7 +122,7 @@ MODULE SymbiosDisks;	(** non-portable *)
 *)
 			END Transfer;
 
-			PROCEDURE GetSize* (VAR size, res: LONGINT);
+			PROCEDURE GetSize* (VAR size: LONGINT; VAR res: WORD);
 			BEGIN
 				size := capacity; res := Disks.Ok;
 				IF TraceVerbose THEN
@@ -192,7 +192,7 @@ VAR
 	END GetCapacity;
 
 	PROCEDURE Init;
-	VAR res, ha, targ, lun, num, regres: LONGINT; srb: ASPI.GetDevTypeSRB; dev: Device; name: Plugins.Name;
+	VAR res, ha, targ, lun, num: LONGINT; regres: WORD; srb: ASPI.GetDevTypeSRB; dev: Device; name: Plugins.Name;
 	BEGIN
 		freeSRB := NIL;
 		NEW(fallbackBuf, 2*BS);

source/TCP.Mod

@@ -469,7 +469,7 @@ TYPE
 
 
 		(** Receive data on a TCP connection. The data parameter specifies the buffer. The ofs parameters specify the position in the buffer where data should be received (usually 0), and the size parameters specifies how many bytes of data can be received in the buffer. The min parameter specifies the minimum number of bytes to receive before Receive returns and must by <= size. The len parameter returns the number of bytes received, and the res parameter returns 0 if ok, or a non-zero error code otherwise (e.g. if the connection is closed by the communication partner, or by a call of the Close method). *)
-		PROCEDURE Receive*(VAR data: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len, res: LONGINT);
+		PROCEDURE Receive*(VAR data: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len: LONGINT; VAR res: WORD);
 		VAR
 			buf: Network.Buffer;
 			rlen: LONGINT;

source/TFSMTPServer.Mod

@@ -83,7 +83,7 @@ TYPE
 		PROCEDURE SaveMessage(m : Message) : BOOLEAN;
 		VAR path, filePath : ARRAY 256 OF CHAR;
 			f : Files.File; w : Files.Writer;
-			i, res : LONGINT; p : ANY;
+			i : LONGINT; res: WORD; p : ANY;
 		BEGIN
 			COPY(mailPath^, path);
 			Strings.Append(path, "/"); Strings.Append(path, userName^);
@@ -112,7 +112,7 @@ TYPE
 
 		PROCEDURE Forward(m : Message; CONST sender : ARRAY OF CHAR) : BOOLEAN;
 		VAR smtpSession : SMTPClient.SMTPSession; p : ANY;
-			res, i : LONGINT;
+			res: WORD; i : LONGINT;
 		BEGIN
 			NEW(smtpSession);
 			smtpSession.Open(mailRelay, mailHost, 25, res);
@@ -236,7 +236,7 @@ TYPE
 		PROCEDURE SaveLostMessage(m : Message) : BOOLEAN;
 		VAR path, filePath : ARRAY 256 OF CHAR;
 			f : Files.File; w : Files.Writer;
-			i, res : LONGINT; p : ANY;
+			i : LONGINT; res: WORD; p : ANY;
 		BEGIN
 			COPY(mailPath^, path);
 			Strings.Append(path, "/"); Strings.Append(path, "lost");

source/TFTP.Mod

@@ -83,7 +83,7 @@ TYPE
 
 		(* ReceiveAck - receives a server answer *)
 		PROCEDURE ReceiveAck(socket: UDP.Socket; VAR fip: IP.Adr; VAR fport: LONGINT; blockNr: LONGINT; VAR ack: ARRAY OF CHAR): BOOLEAN;
-		VAR ip: IP.Adr; port, len, ofs, res, wait: LONGINT; acked: BOOLEAN; msg: ARRAY 256 OF CHAR;
+		VAR ip: IP.Adr; port, len, ofs, wait: LONGINT; res: WORD; acked: BOOLEAN; msg: ARRAY 256 OF CHAR;
 		BEGIN
 			wait := 0;
 			REPEAT
@@ -141,7 +141,7 @@ TYPE
 
 		(* GetSocket - finds & initializes a free UDP socket *)
 		PROCEDURE GetSocket*(VAR socket: UDP.Socket): BOOLEAN;
-		VAR retries, lport, res: LONGINT;
+		VAR retries, lport: LONGINT; res: WORD;
 		BEGIN
 			REPEAT
 				INC(retries); lport := 1024 + generator.Integer() MOD 64512;
@@ -154,7 +154,7 @@ TYPE
 		(* Send - send a file to TFTP server at fip:fport *)
 		PROCEDURE Send*(localFN, remoteFN: ARRAY OF CHAR; fip: IP.Adr; fport: LONGINT): BOOLEAN;
 		VAR buf, ack: ARRAY 4+BlockSize OF CHAR; socket: UDP.Socket; msg: ARRAY 256 OF CHAR;
-			file: Files.File; r: Files.Rider; ofs, res, retries, blockNr, errNo: LONGINT; acked: BOOLEAN;
+			file: Files.File; r: Files.Rider; ofs, retries, blockNr, errNo: LONGINT; res: WORD; acked: BOOLEAN;
 		BEGIN
 			acked := FALSE;
 			file := Files.Old(localFN);
@@ -232,7 +232,7 @@ TYPE
 
 		(* Receive - receive a file from TFTP server at source:port *)
 		PROCEDURE Receive*(remoteFN, localFN: ARRAY OF CHAR; fip: IP.Adr; fport: LONGINT): BOOLEAN;
-		VAR socket: UDP.Socket; ofs, blockNr, port, len, res, retries, waitPacket: LONGINT; ok, Abort: BOOLEAN; ip: IP.Adr;
+		VAR socket: UDP.Socket; ofs, blockNr, port, len, retries, waitPacket: LONGINT; res: WORD; ok, Abort: BOOLEAN; ip: IP.Adr;
 			buf: ARRAY 4+BlockSize OF CHAR; file: Files.File; r: Files.Rider;
 		BEGIN
 			ok := FALSE;

source/TFTPFS.Mod

@@ -574,7 +574,7 @@ TYPE
 		END Init;
 
 		PROCEDURE New0(name: ARRAY OF CHAR): Files.File;
-		VAR i, res: LONGINT; f: File; buf: Buffer; head: FileHd; namebuf: FileName;
+		VAR i: LONGINT; res: WORD; f: File; buf: Buffer; head: FileHd; namebuf: FileName;
 		BEGIN (*{EXCLUSIVE}*)
 			lock.Acquire;
 			f := NIL; Check(name, namebuf, res);
@@ -597,7 +597,7 @@ TYPE
 
 		PROCEDURE Old0(name: ARRAY OF CHAR): Files.File;
 		VAR
-			i, k, res: LONGINT; f: File; header: DiskAdr; buf: Buffer; head: FileHd;
+			i, k: LONGINT; res: WORD; f: File; header: DiskAdr; buf: Buffer; head: FileHd;
 			namebuf, local: FileName; super: SuperIndex; sub: SubIndex; sec: IndexSector;
 		BEGIN (*{EXCLUSIVE}*)
 			lock.Acquire;
@@ -651,7 +651,7 @@ TYPE
 			RETURN f
 		END Old0;
 
-		PROCEDURE Delete0(name: ARRAY OF CHAR; VAR key, res: LONGINT);
+		PROCEDURE Delete0(name: ARRAY OF CHAR; VAR key: LONGINT; VAR res: WORD);
 		VAR adr: DiskAdr; namebuf: FileName; head: FileHeader;
 		BEGIN (*{EXCLUSIVE}*)
 			lock.Acquire;

source/TV.Mod

@@ -441,7 +441,8 @@ PROCEDURE BuildChannelTableImpl(filename : ARRAY OF CHAR);
 CONST
 	Delay = 500;
 VAR
-	ch, max, i, found, length, res : LONGINT;
+	ch, max, i, found, length: LONGINT;
+	res: WORD;
 	tvWnd : TvWindow;
 	tvCh : TVChannels.TVChannel;
 	channels : TVChannels.ChannelList;

source/TestFiles.Mod

@@ -513,7 +513,7 @@ TYPE
 			arg : Streams.StringReader;
 			commandStr : ARRAY 128 OF CHAR; parameterStr : Strings.String;
 			msg : ARRAY 128 OF CHAR;
-			pos, res : LONGINT;
+			pos  : LONGINT; res : WORD;
 		BEGIN
 			NEW(parameterStr, 4096); Strings.Truncate(parameterStr^, 0);
 			r.SkipWhitespace; r.String(commandStr);

source/TestStrings.Mod

@@ -64,7 +64,7 @@ PROCEDURE TestNegativeHexConversion*(context : Commands.Context);
 VAR i : LONGINT;
 
 	PROCEDURE Test(number : HUGEINT);
-	VAR string, signedString : ARRAY 16 OF CHAR; val, idx, res : LONGINT;
+	VAR string, signedString : ARRAY 16 OF CHAR; val, idx: LONGINT; res: WORD;
 	BEGIN
 		Strings.IntToHexStr(number, 8, string);
 		signedString[0] := "-";

source/UDP.Mod

@@ -127,7 +127,7 @@ TYPE
 		"len" returns the actual datagram size and "data[ofs..ofs+len-1]" returns the data.
 		"res" returns "Timeout" in case of a timeout and "BufferOverflow" if the received datagram was too big.
 		*)
-		PROCEDURE Receive*(VAR data: ARRAY OF CHAR; ofs, size, ms: LONGINT; VAR fip: IP.Adr; VAR fport, len, res: LONGINT);
+		PROCEDURE Receive*(VAR data: ARRAY OF CHAR; ofs, size, ms: LONGINT; VAR fip: IP.Adr; VAR fport, len: LONGINT; VAR res: WORD);
 		VAR
 			buffer: Network.Buffer;
 			fragmentBuffer: Network.Buffer;

source/Usb.Mod

@@ -797,7 +797,7 @@ TYPE
 			temp : RegisteredDriver;
 			drv : Usbdi.Driver;
 			interface : InterfaceDescriptor;
-			i, res : LONGINT;
+			i : LONGINT; res : WORD;
 			name : Usbdi.Name;
 			suffix : LONGINT; (* 0-99; suffix is used to generate unique names for AosPlugin.Name *)
 		BEGIN
@@ -1720,9 +1720,9 @@ BEGIN {EXCLUSIVE}
 END RemoveRootHub;
 
 PROCEDURE InstallRootHubs;
-VAR table : Plugins.Table; i : LONGINT;
+VAR table : Plugins.Table; i : LONGINT; res: WORD;
 BEGIN
-	UsbHcdi.controllers.AddEventHandler(RootHubEvent, i); (* ignore res *)
+	UsbHcdi.controllers.AddEventHandler(RootHubEvent, res); (* ignore res *)
 	UsbHcdi.controllers.GetAll(table);
 	IF table # NIL THEN
 		FOR i := 0 TO LEN(table)-1 DO AddRootHub(table[i](UsbHcdi.Hcd)); END;

source/UsbFTDI.Mod

@@ -1007,7 +1007,7 @@ TYPE
 
 		(** Receive size characters into buf, starting at ofs and return the effective number of bytes read in len.
 			Wait until at least min bytes (possibly zero) are available. res is non-zero on error. *)
-		PROCEDURE Receive*(VAR buf: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len, res: LONGINT);
+		PROCEDURE Receive*(VAR buf: ARRAY OF CHAR; ofs, size, min: LONGINT; VAR len: LONGINT; VAR res: WORD);
 		VAR ch: CHAR;
 		BEGIN
 			len := 0;

source/UsbHidDriver.Mod

@@ -1119,7 +1119,7 @@ TYPE
 		VAR
 			joystickColl		: UsbHidReport.HidCollection;
 			temp			: UsbHidReport.HidReport;
-			res,i			: LONGINT;
+			res,i			: WORD;
 		BEGIN
 			(*get joystick collection: joystick collection uses UsagePage(Generic Desktop Controlsl)->1 and Usage(Joystick)->4*)
 			joystickColl := reportManager.GetCollection(UsagePage.GenericDesktopPage,4);

source/UsbNetwork.Mod

@@ -105,7 +105,7 @@ TYPE
 		END Diag;
 
 		PROCEDURE InitLinkDevice() : BOOLEAN;
-		VAR name : Plugins.Name; nofDevices, i, res : LONGINT;
+		VAR name : Plugins.Name; nofDevices, i : LONGINT; res : WORD;
 		BEGIN
 			NEW(linkDevice, Network.TypeEthernet, 1000, AddressSize);
 

source/UsbNetworkUSB200M.Mod

@@ -405,7 +405,7 @@ TYPE
 
 		PROCEDURE ScanRxBuffer;
 		VAR
-			index, packetSize, packetSizeChecksum, packetSizeEven, packetStart, type, res : LONGINT;
+			index, packetSize, packetSizeChecksum, packetSizeEven, packetStart, type : LONGINT; res : WORD;
 			contiguousLength, bytesCopied : LONGINT;
 			error : BOOLEAN;
 			buffer : Network.Buffer;
@@ -828,7 +828,7 @@ TYPE
 			RETURN status = Usbdi.Ok;
 		END WriteMonitorMode;
 
-		PROCEDURE GetPhyId(VAR primaryPhyId, primaryPhyType, secondaryPhyId, secondaryPhyType, res : LONGINT);
+		PROCEDURE GetPhyId(VAR primaryPhyId, primaryPhyType, secondaryPhyId, secondaryPhyType: LONGINT; VAR res : WORD);
 		VAR set : SET; buffer : Usbdi.BufferPtr; status : Usbdi.Status;
 		BEGIN
 			NEW(buffer, 2);
@@ -974,7 +974,7 @@ TYPE
 			monitorMode, wakeupOnLinkup, wakeupOnMagicPacket : BOOLEAN; usbSpeed : LONGINT;
 			priId, priType, secId, secType : LONGINT;
 			set : SET;
-			i, word, res : LONGINT;
+			i, word : LONGINT; res : WORD;
 		BEGIN
 			Diag^;
 			GetLinkAddress(linkAdr, res);
@@ -1037,7 +1037,7 @@ TYPE
 
 (* Converts a string formatted as AA:BB:CC:DD:EE:FF:GG into a Network link address *)
 PROCEDURE StringToLinkAdr(CONST string : ARRAY OF CHAR; VAR linkAdr : Network.LinkAdr) : BOOLEAN;
-VAR stringArray : Strings.StringArray; value, i, res : LONGINT;
+VAR stringArray : Strings.StringArray; value, i : LONGINT; res : WORD;
 BEGIN
 	stringArray := Strings.Split(string, ":");
 	IF LEN(stringArray) = 6 THEN

source/UsbStorageBase.Mod

@@ -166,7 +166,7 @@ TYPE
 		number : LONGINT; (* Suffix appended to name to get unique device name *)
 		next : UsbStorageDevice;
 
-		PROCEDURE Transfer* (op, block, num: LONGINT; VAR data: ARRAY OF CHAR; ofs: LONGINT; VAR diskres: LONGINT);
+		PROCEDURE Transfer* (op, block, num: LONGINT; VAR data: ARRAY OF CHAR; ofs: LONGINT; VAR diskres: WORD);
 		VAR direction : SET; cmd : ARRAY 12 OF CHAR; i, tlen, trans, offset, num0 : LONGINT;
 		BEGIN {EXCLUSIVE}
 			IF (op = Disks.Read) OR (op = Disks.Write) THEN
@@ -215,7 +215,7 @@ TYPE
 		END Transfer;
 
 		(** Get number of blocks and size of blocks using the UFI Read Capacity command *)
-		PROCEDURE GetSize* (VAR size, res: LONGINT);
+		PROCEDURE GetSize* (VAR size: LONGINT; VAR res: WORD);
 		BEGIN {EXCLUSIVE}
 			IF Debug.Trace & Debug.traceInfo THEN KernelLog.String("UsbStorage: GetSize: "); KernelLog.Ln; END;
 			(* Some devices I've seen didn't like to be asked for their capacity when no medium was inserted... *)
@@ -235,7 +235,7 @@ TYPE
 			res := ResOk; (* Allow short transfer *)
 		END GetSize;
 
-		PROCEDURE Handle*(VAR msg: Disks.Message; VAR diskres: LONGINT);
+		PROCEDURE Handle*(VAR msg: Disks.Message; VAR diskres: WORD);
 		VAR cmd : ARRAY 12 OF CHAR; i : LONGINT; fdp : FlexibleDiskPage;
 		BEGIN {EXCLUSIVE}
 			FOR i := 0 TO 11 DO cmd[i] := CHR(0); END;

source/UsbTools.Mod

@@ -82,7 +82,7 @@ VAR
 	devicename, msg : ARRAY 128 OF CHAR;
 	commandList : POINTER TO ARRAY OF CHAR;
 	plugin : Plugins.Plugin;
-	i, size, len, res : LONGINT;
+	i, size, len : LONGINT; res : WORD;
 BEGIN
 	context.arg.SkipWhitespace; context.arg.String(devicename);
 

source/WAVRecorder.Mod

@@ -21,7 +21,7 @@ TYPE
 
 		(* Initialize Recorder with the given File *)
 		PROCEDURE &Init*(out : Streams.Writer);
-		VAR i, res : LONGINT;
+		VAR i: LONGINT; res: WORD;
 		BEGIN
 			ready := FALSE; recording := FALSE; paused := FALSE; finished := FALSE;
 			SELF.out := out; recLength := 0;
@@ -128,7 +128,7 @@ TYPE
 
 		(* Initialize Recorder with the given File *)
 		PROCEDURE &Init*;
-		VAR i, res : LONGINT;
+		VAR i, res : WORD;
 		BEGIN
 			ready := FALSE; recording := FALSE; paused := FALSE; finished := FALSE;
 

source/WMBuilder.Mod

@@ -789,7 +789,7 @@ TYPE
 			);
 		END FixBounds;
 
-		PROCEDURE IsInActiveFrameHandle(x, y : LONGINT) : LONGINT;
+		PROCEDURE IsInActiveFrameHandle(x, y : LONGINT) : WORD;
 		VAR res : WORD;
 		BEGIN
 			res := IsInFrameHandle(x, y);
@@ -1312,7 +1312,7 @@ TYPE
 		insertObjAt : WMComponents.VisualComponent;
 
 		downX, downY, lastX, lastY, dragX, dragY : LONGINT;
-		oldPointerInfo: LONGINT;
+		oldPointerInfo: WORD;
 		selectInsertObjAt : BOOLEAN;
 
 		showSnapGrid : WMProperties.BooleanProperty;
@@ -1588,7 +1588,7 @@ TYPE
 			END;
 		END InvalidateFrame;
 
-		PROCEDURE GetLimitMode(x, y : LONGINT; VAR bounds : WMRectangles.Rectangle) : LONGINT;
+		PROCEDURE GetLimitMode(x, y : LONGINT; VAR bounds : WMRectangles.Rectangle) : WORD;
 		VAR
 			vc : WMComponents.VisualComponent; mode : LONGINT;
 			ci : ComponentInfo;
@@ -1864,7 +1864,7 @@ TYPE
 		END PointerLeave;
 
 		PROCEDURE PointerDown*(x, y : LONGINT; keys : SET);
-		VAR down : BOOLEAN; res : WORD; rect : WMRectangles.Rectangle;
+		VAR down : BOOLEAN; res: LONGINT; rect : WMRectangles.Rectangle;
 		BEGIN
 			PointerDown^(x, y, keys);
 			mouseKeys := keys;
@@ -2820,7 +2820,7 @@ TYPE
 		END ButtonHandler;
 
 		PROCEDURE HandleOpenBtn(sender, data : ANY);
-		VAR filename : Files.FileName; res, ignoreRes : LONGINT;
+		VAR filename : Files.FileName; res: LONGINT; ignoreRes: WORD;
 		BEGIN
 			res := WMDialogs.QueryString("Open...", filename);
 			IF (res = WMDialogs.ResOk) THEN
@@ -3367,7 +3367,7 @@ BEGIN
 END LabelComponent;
 
 PROCEDURE Open*(context : Commands.Context); (** {filename} ~ *)
-VAR window : MainWindow; filename : Files.FileName; count, ignoreRes : LONGINT;
+VAR window : MainWindow; filename : Files.FileName; count: LONGINT;  ignoreRes : WORD;
 BEGIN
 	NEW(window, NIL);
 	count := 0;

source/WMCDRecorder.Mod

@@ -307,7 +307,7 @@ TYPE
 			recorder: CDRecord.CDRecorder;
 			disc: CDRecord.Disc;
 			compilation: CDRecord.Compilation;
-			res, tmp, startsec, size, freeSpace: LONGINT;
+			res, tmp: WORD; startsec, size, freeSpace: LONGINT;
 			toc: Lib.TocDescriptor;
 			dest: String;
 			pvd: MakeIsoImages.PSVolumeDescriptor;
@@ -645,7 +645,7 @@ TYPE
 		VAR
 			audioDlg: AudioDialog;
 			waitDlg: WaitDialog;
-			tmp, res, freeSpace, wavSpace: LONGINT;
+			tmp, res: WORD; freeSpace, wavSpace: LONGINT;
 			dest:String;
 			cur: Node;
 			project: AudioProject;
@@ -841,7 +841,7 @@ TYPE
 		PROCEDURE BurnDataHandler(sender, data: ANY);
 		VAR
 			dataDlg: DataDialog;
-			res, tmp: LONGINT;
+			res, tmp: WORD;
 			root: ANY;
 			dest: String;
 			compilation: CDRecord.Compilation;

source/WMInstaller.Mod

@@ -754,7 +754,7 @@ TYPE
 		END OpenDevice;
 
 		PROCEDURE CloseDevice(device : Disks.Device);
-		VAR ignore : LONGINT;
+		VAR ignore : WORD;
 		BEGIN
 			IF opened & (device # NIL) THEN
 				device.Close(ignore);

source/WMPartitions.Mod

@@ -253,7 +253,7 @@ TYPE
 			fs : Files.FileSystem;
 			fstype : LONGINT;
 			doClose : BOOLEAN;
-			result, res : LONGINT;
+			result : LONGINT; res : WORD;
 		BEGIN
 			SELF.selection := selection;
 			IF IsValid(selection) THEN
@@ -533,7 +533,7 @@ TYPE
 		VAR
 			block: POINTER TO ARRAY  OF CHAR;
 			type : LONGINT;
-			res, fs: LONGINT;
+			res: WORD; fs: LONGINT;
 		BEGIN
 			IF (dev.table=NIL) OR (part >= LEN(dev.table)) THEN RETURN 0; END;
 			type := dev.table[part].type;
@@ -1448,7 +1448,7 @@ TYPE
 		VAR
 			fileToPartition : PartitionsLib.FileToPartition;
 			popup : PopupWindow; param : Parameters;
-			block, numblocks, res : LONGINT;
+			block, numblocks : LONGINT; res : WORD;
 		BEGIN
 			IF IsValid(selection) THEN
 				NEW(param, 3);
@@ -1478,7 +1478,7 @@ TYPE
 		VAR
 			partitionToFile : PartitionsLib.PartitionToFile;
 			popup : PopupWindow; param : Parameters;
-			block, numblocks, res : LONGINT;
+			block, numblocks : LONGINT; res : WORD;
 		BEGIN
 			IF IsValid(selection) THEN
 				NEW(param, 3);
@@ -1515,7 +1515,7 @@ TYPE
 		VAR
 			showBlocks : PartitionsLib.ShowBlocks;
 			popup : PopupWindow; param : Parameters;
-			block, numblocks, res : LONGINT;
+			block, numblocks : LONGINT; res : WORD;
 		BEGIN
 			IF IsValid(selection) THEN
 				NEW(param, 2);
@@ -1589,7 +1589,7 @@ TYPE
 		popup : PopupWindow;
 
 		PROCEDURE Config(sender, data : ANY);
-		VAR configEditor : ConfigEditor; doClose : BOOLEAN; fsType, res : LONGINT;
+		VAR configEditor : ConfigEditor; doClose : BOOLEAN; fsType : LONGINT; res : WORD;
 		BEGIN
 			IF IsValid(selection) &
 			    ((Disks.Valid IN selection.disk.table[selection.partition].flags) OR (selection.disk.isDiskette)) THEN
@@ -2056,7 +2056,7 @@ TYPE
 			benchPartition : DiskBenchmark.DiskBench;
 			popup : PopupWindow; param : Parameters;
 			blocksizes : SET;
-			i, blocksize, res : LONGINT;
+			i, blocksize : LONGINT; res : WORD;
 			string : ARRAY 128 OF CHAR;
 		BEGIN
 			IF IsValid(selection) & (selection.disk.device # NIL) THEN

source/WMPerfMonPluginUsb.Mod

@@ -85,10 +85,10 @@ BEGIN
 END EventHandler;
 
 PROCEDURE InitPlugins;
-VAR table : Plugins.Table; i : LONGINT;
+VAR table : Plugins.Table; i : LONGINT; res: WORD;
 BEGIN
 	IF UsbDebug.PerformanceMonitoring THEN
-		UsbHcdi.controllers.AddEventHandler(EventHandler, i);
+		UsbHcdi.controllers.AddEventHandler(EventHandler, res);
 		UsbHcdi.controllers.GetAll(table);
 		IF table # NIL THEN FOR i := 0 TO LEN(table)-1 DO AddPlugin(table[i] (UsbHcdi.Hcd)); END; END;
 	ELSE KernelLog.String("WMPerfMonUsbPlugin: Performance counters not enabled in UsbHcdi.Mod"); KernelLog.Ln;
@@ -99,7 +99,7 @@ PROCEDURE Install*;
 END Install;
 
 PROCEDURE Cleanup;
-VAR ignore : LONGINT;
+VAR ignore : WORD;
 BEGIN
 	IF UsbDebug.PerformanceMonitoring THEN
 		UsbHcdi.controllers.RemoveEventHandler(EventHandler, ignore);

source/WebWormWatch.Mod

@@ -105,7 +105,7 @@ END Cached;
 PROCEDURE MyHandle(vn, fn: ARRAY OF CHAR; VAR in: Streams.Reader; VAR out: Streams.Writer;
 	VAR header : WebHTTP.RequestHeader; VAR reply: WebHTTP.ResponseHeader);
 VAR
-	f: Files.File; w : Files.Writer; res, i, time, date: LONGINT;
+	f: Files.File; w : Files.Writer; res: WORD; i, time, date: LONGINT;
 	ch :CHAR;
 	md : ARRAY 32 OF CHAR;
 	origin : ARRAY 64 OF CHAR;

source/YMF754.Mod

@@ -1068,7 +1068,7 @@ TYPE
 		(* Constructor *)
 		PROCEDURE &Constr*(name: ARRAY OF CHAR; physbase, irq: LONGINT; CntrlInst1E: BOOLEAN);
 		VAR
-			i, res: LONGINT;
+			i: LONGINT; res: WORD;
 			PCDbase: LONGINT; (* physical base address of PCI Audio play control data table *)
 		BEGIN
 			SELF.irq := irq;
@@ -1396,7 +1396,7 @@ TYPE
 		END StartPCIAudio;
 
 		(* Check channel parameters and convert the values for internal use *)
-		PROCEDURE CheckChannelParam(onlyNativeFreq: BOOLEAN; VAR sRate, sResolution, nofSubCh, format, res: LONGINT);
+		PROCEDURE CheckChannelParam(onlyNativeFreq: BOOLEAN; VAR sRate, sResolution, nofSubCh, format: LONGINT; VAR res: WORD);
 		VAR i: LONGINT;
 		BEGIN
 			res := SoundDevices.ResOK;