fix result type

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

source/AlmSmtpReceiver.Mod

@@ -437,7 +437,7 @@ TYPE
 		receiveTime, remoteIP : String;
 
 		PROCEDURE WriteIPNr( ip : IP.Adr );
-			VAR result : LONGINT; str : ARRAY 128 OF CHAR;
+			VAR result : WORD; str : ARRAY 128 OF CHAR;
 		BEGIN
 					IP.AdrToStr(ip, remoteIP);
 					msgWr.String (" (");

source/DataErrors.Mod

@@ -519,7 +519,7 @@ VAR refs: Modules.Bytes; refpos: LONGINT; adr: LONGINT;
 		Error.Log is automatically opened whenever this module is loaded into memory,
 		and it only needs to be reopened manually if you had previously closed it manually. *)
 	PROCEDURE Open*;
-	VAR ignor: NbrInt.Integer;  backup, current: Files.FileName;
+	VAR ignor: WORD;  backup, current: Files.FileName;
 	BEGIN
 		beepedError := FALSE;  beepedWarning := FALSE;  COPY( "Error.Log", current );  COPY( "Error.Log.Bak", backup );  Files.Delete( backup, ignor );
 		Files.Rename( current, backup, ignor );  F := Files.New( current );  Files.OpenWriter( W, F, 0 )

source/DataIO.Mod

@@ -105,7 +105,7 @@ TYPE
 			IF res = Streams.Ok THEN RETURN TRUE
 			ELSIF res = Streams.EOF THEN DataErrors.Error( "Attempted to read past the end of file." );  RETURN FALSE
 			ELSIF res = Streams.FormatError THEN DataErrors.Error( "A format error encounter by the reader." );  RETURN FALSE
-			ELSE DataErrors.IntError( res, "The 'res' error number originating from an Streams reader error." );  RETURN FALSE
+			ELSE DataErrors.IntError( NbrInt.Integer( res ), "The 'res' error number originating from an Streams reader error." );  RETURN FALSE
 			END
 		END ReaderAvailable;
 

source/OdClient.Mod

@@ -224,7 +224,7 @@ TYPE
 			reqHeader: WebHTTP.RequestHeader; resHeader: WebHTTP.ResponseHeader;
 			doc: XML.Document; lenStr: ARRAY 16 OF CHAR;
 			root: XML.Element; s: XML.String;
-			url, info: ARRAY 128 OF CHAR; rc: LONGINT;
+			url, info: ARRAY 128 OF CHAR; rc: WORD;
 			all, unversioned, checkedin, checkedout: OdUtil.Lines;
 		BEGIN
 			toPut := ClientRes(local);
@@ -313,7 +313,7 @@ TYPE
 		VAR
 			all, unversioned, checkedin, checkedout: OdUtil.Lines;
 			reqHeader : WebHTTP.RequestHeader; resHeader: WebHTTP.ResponseHeader;
-			out : Streams.Reader; rc: LONGINT;
+			out : Streams.Reader; rc: WORD;
 			doc: XML.Document; root: XML.Element; info, rootStr: ARRAY 128 OF CHAR; s: XML.String;
 			props: WebHTTP.AdditionalField;
 		BEGIN
@@ -431,7 +431,7 @@ TYPE
 		PROCEDURE checkout * (CONST remote: ARRAY OF CHAR);
 		VAR
 			resHeader: WebHTTP.ResponseHeader;
-			out : Streams.Reader; rc: LONGINT;
+			out : Streams.Reader; rc: WORD;
 			doc: XML.Document; root: XML.Element; info, rootStr: ARRAY 128 OF CHAR; elName: OdUtil.Line;
 			all, unversioned, checkedin, checkedout: OdUtil.Lines;
 		BEGIN
@@ -466,7 +466,7 @@ TYPE
 		PROCEDURE uncheckout * (CONST remote: ARRAY OF CHAR);
 		VAR
 			reqHeader: WebHTTP.RequestHeader; resHeader: WebHTTP.ResponseHeader;
-			out : Streams.Reader; rc: LONGINT;
+			out : Streams.Reader; rc: WORD;
 			doc: XML.Document; root: XML.Element; info, rootStr: ARRAY 128 OF CHAR; elName: OdUtil.Line;
 			all, unversioned, checkedin, checkedout: OdUtil.Lines;
 		BEGIN

source/OdSvn.Mod

@@ -546,7 +546,7 @@ TYPE
 	VAR resBody: XML.Document;
 		reqBody: UpdateReq;
 		resHeader: WebHTTP.ResponseHeader;
-		out : Streams.Reader; res2 : LONGINT;
+		out : Streams.Reader; res2 : WORD;
 		txDelta: Files.File;
 		repos : OdClient.Repos;
 	BEGIN
@@ -591,7 +591,7 @@ TYPE
 	VAR
 		pathName, path, collUrl, name, workName, workUrl, vcc, ver, err: ARRAY 256 OF CHAR;
 		resHeader: WebHTTP.ResponseHeader;
-		version,headVersion, pos, res: LONGINT;
+		version,headVersion, pos: LONGINT; res: WORD;
 		props: WebHTTP.AdditionalField;
 		act: Activity;
 	BEGIN
@@ -1139,7 +1139,7 @@ TYPE
 		strRdr : StringReader;
 		wtr: Files.Writer;
 		f : Files.File;
-		res2 : LONGINT;
+		res2 : WORD;
 		str : U.String;
 		data : SVNAdmin.EntryEntity;
 		w : Files.Writer;
@@ -1416,7 +1416,7 @@ TYPE
 	PROCEDURE SvnWritePROPS ( CONST path, filename : ARRAY OF CHAR; props : SvnProps );
 	VAR
 		tmp,fstr,fstr2 : ARRAY 256 OF CHAR;
-		len, i, res : LONGINT;
+		len, i: LONGINT; res: WORD;
 		fr, fw : Files.File;
 		r : Files.Reader;
 		w : Files.Writer;

source/OdVCSBase.Mod

@@ -160,7 +160,7 @@ BEGIN
 END splitDirBase;
 
 (** Create directory for a filename if it doesn't exist. *)
-PROCEDURE makeDirs(name: ARRAY OF CHAR): LONGINT;
+PROCEDURE makeDirs(name: ARRAY OF CHAR): WORD;
 VAR
 	dir, base: ARRAY 128 OF CHAR;
 	res: WORD;
@@ -794,9 +794,9 @@ END newVersion;
 (** Get a version from <name>.VCS and save it as <newFileName>.
 DeltaV.Select: can be used because the complete paths are already given for source and sink.
 *)
-PROCEDURE View*(name: TFileName; n: LONGINT; newFileName: TFileName): LONGINT;
+PROCEDURE View*(name: TFileName; n: LONGINT; newFileName: TFileName): WORD;
 VAR
-	version, res: LONGINT;
+	version: LONGINT; res: WORD;
 	ok: BOOLEAN;
 	dFileName: TFileName;
 	old, new: TData;

source/PrettyPrint.Mod

@@ -40,7 +40,7 @@ VAR
 	
 	PROCEDURE Convert*( context: Commands.Context );	(*  {filename} ~ *)
 	VAR 
-		filename, dest: ARRAY 64 OF CHAR;  format, l, res: LONGINT;
+		filename, dest: ARRAY 64 OF CHAR;  format, l: LONGINT; res: WORD;
 		f: Files.File;  text: Texts.Text;
 		highlighter: SyntaxHighlighter.Highlighter;
 	BEGIN

source/ReleaseVisualizer.Mod

@@ -353,7 +353,7 @@ TYPE
 		END ParseModule;
 
 		PROCEDURE ScanModule(CONST filename : ARRAY OF CHAR);
-		VAR text : Texts.Text; format, res : LONGINT; s : Scanner.Scanner;
+		VAR text : Texts.Text; format : LONGINT; res: WORD; s : Scanner.Scanner;
 		BEGIN
 			COPY(filename, currentFile);
 			NEW(text);

source/SVNOutput.Mod

@@ -40,7 +40,7 @@ TYPE
 			context := c;
 		END Init;
 
-		PROCEDURE Print* ( num : LONGINT; CONST msg : ARRAY OF CHAR );
+		PROCEDURE Print* ( num : WORD; CONST msg : ARRAY OF CHAR );
 		BEGIN
 			IF num = ResOK THEN
 				RETURN;

source/SVNUtil.Mod

@@ -181,7 +181,7 @@ END UrlEncode;
 
 PROCEDURE UrlDecode* (CONST input : ARRAY OF CHAR; VAR output : ARRAY OF CHAR );
 VAR
-	i, j, value, res : LONGINT;
+	i, j, value: LONGINT; res: WORD;
 	tmp : ARRAY 3 OF CHAR;
 BEGIN
 	i := 0; j := 0;

source/SVNWebDAV.Mod

@@ -179,7 +179,7 @@ IMPORT
 		vcc, vurl, ver, tmp, tmp2, path, name, date : ARRAY 256 OF CHAR;
 		creationdate, creator, status : ARRAY 33 OF CHAR;
 		version : ARRAY 10 OF CHAR;
-		len, res, ft,fd : LONGINT;
+		len, ft,fd : LONGINT; res: WORD;
 		adminDir : SVNAdmin.Entry;
 		f : Files.File;
 	BEGIN

source/Sage.UDPChatBase.Mod

@@ -234,7 +234,7 @@ TYPE
 		PROCEDURE AddInt* (n, len: LONGINT);
 		VAR
 			i: INTEGER;
-			b, res: LONGINT;
+			b: LONGINT; res: WORD;
 			s: ARRAY 4 OF CHAR;
 		BEGIN
 			ASSERT (len <= 4);

source/Sage.UDPChatClient.Mod

@@ -45,7 +45,7 @@ TYPE
 		password, passwordConfirm: ARRAY 33 OF CHAR;
 		shortName, fullName, eMail: ARRAY 65 OF CHAR;
 
-		uin, res: LONGINT;
+		uin: LONGINT; res: WORD;
 		dt: Dates.DateTime;
 
 		keepAliveTimer: Kernel.MilliTimer;
@@ -109,7 +109,7 @@ TYPE
 		VAR seqNum: INTEGER; sendBuf: Base.Buffer;
 		s: UDP.Socket; ip: IP.Adr);
 	VAR
-		len, res: LONGINT;
+		len: LONGINT; res: WORD;
 		string: String;
 	BEGIN {EXCLUSIVE}
 		Base.ClientPacketInit (Base.NEW_USER_REG, seqNum, 0, sendBuf);
@@ -144,7 +144,7 @@ TYPE
 		VAR seqNum: INTEGER; uin: LONGINT; sendBuf: Base.Buffer;
 		s: UDP.Socket; ip: IP.Adr);
 	VAR
-		len, res: LONGINT;
+		len: LONGINT; res: WORD;
 		string: String;
 	BEGIN {EXCLUSIVE}
 		Base.ClientPacketInit (Base.LOGIN, seqNum, uin, sendBuf);
@@ -190,7 +190,7 @@ TYPE
 		s: UDP.Socket; ip: IP.Adr);
 	VAR
 		string: String;
-		len, res: LONGINT;
+		len: LONGINT; res: WORD;
 	BEGIN {EXCLUSIVE}
 		Base.ClientPacketInit (Base.SEND_MESSAGE, seqNum, uin, sendBuf);
 
@@ -221,7 +221,7 @@ TYPE
 		s: UDP.Socket; ip: IP.Adr);
 	VAR
 		string: String;
-		len, res: LONGINT;
+		len: LONGINT; res: WORD;
 	BEGIN {EXCLUSIVE}
 		Base.ClientPacketInit (Base.SEND_TEXT_CODE, seqNum, uin, sendBuf);
 

source/Sage.UDPChatServer.Mod

@@ -30,7 +30,7 @@ TYPE
 		running, terminated: BOOLEAN;
 		ip: IP.Adr;
 		branch, command, seqNum, messageType: INTEGER;
-		uin, receiverUin, port, len, res, receiveBufOffset: LONGINT;
+		uin, receiverUin, port, len, receiveBufOffset: LONGINT; res: WORD;
 		user: Base.User;
 		users: Base.Users;
 		clients: Base.List;
@@ -139,7 +139,7 @@ TYPE
 		user: Base.User; sendBuf: Base.Buffer; s: UDP.Socket);
 	VAR
 		string: String;
-		res, len: LONGINT;
+		res: WORD; len: LONGINT;
 	BEGIN {EXCLUSIVE}
 		Base.ServerPacketInit (Base.INFO_REPLY, client.inSeqNum, sendBuf);
 
@@ -189,7 +189,7 @@ TYPE
 		messageType: INTEGER; message: String; sendBuf: Base.Buffer; s: UDP.Socket);
 	VAR
 		string: String;
-		res, len: LONGINT;
+		res: WORD; len: LONGINT;
 	BEGIN {EXCLUSIVE}
 		Base.ServerPacketInit (Base.RECEIVE_MESSAGE, receiver.outSeqNum, sendBuf);
 

source/SambaClient.Mod

@@ -80,7 +80,7 @@ TYPE
 
 		(** 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
 			check : BOOLEAN;
 			closekey : LONGINT;
@@ -354,7 +354,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);
 		VAR check: BOOLEAN;
 		BEGIN
 			IF Trace THEN

source/SambaServer.Mod

@@ -461,7 +461,7 @@ END HandleRead;
 PROCEDURE HandleWrite(c: Connection);
 VAR
 	fidToWrite, count : INTEGER;
-	offset, len, res: LONGINT;
+	offset, len: LONGINT; res: WORD;
 	buffer: ARRAY 65536 OF CHAR;
 	filename: ARRAY 256 OF CHAR;
 	f: Files.File;

source/TestVideo.Mod

@@ -577,7 +577,7 @@ BEGIN
 END GetFreq;
 
 PROCEDURE Label2(buffer : Raster.Image);
-VAR nof, length, res, i, j : LONGINT; w, h: LONGINT;
+VAR nof, length, i, j : LONGINT; w, h: LONGINT; res: WORD;
 	path : ARRAY 1024*4 OF Point;
 	poly : ARRAY 40 OF Point;
 	nofPoints : LONGINT;

source/VideoExample.Mod

@@ -144,7 +144,7 @@ VAR
 PROCEDURE SimulateImage*(context : Commands.Context); (** filename ~ *)
 VAR
 	fn, name : Files.FileName;
-	res, w, h, x : LONGINT;
+	res: WORD; w, h, x : LONGINT;
 	dec : Codecs.ImageDecoder;
 	rdr : Streams.Reader;
 	ext : ARRAY 16 OF CHAR;

source/Visualizer.Mod

@@ -1421,7 +1421,7 @@ VAR
 	reader : TextUtilities.TextReader;
 	diagnostics : Diagnostics.StreamDiagnostics;
 	writer : Streams.Writer;
-	format, res : LONGINT;
+	format : LONGINT; res: WORD;
 BEGIN
 	module := NIL;
 	NEW(text);

source/WMOverlay.Mod

@@ -297,7 +297,7 @@ TYPE
 
 		PROCEDURE KeyEvent*(ucs : LONGINT; flags : SET; keySym : LONGINT);
 		VAR
-			filename : Files.FileName; newImg : WMGraphics.Image; oldMode, res: LONGINT;
+			filename : Files.FileName; newImg : WMGraphics.Image; oldMode: LONGINT; res: WORD;
 			string : ARRAY 2 OF CHAR; dx, dy : LONGINT;
 			font : WMGraphics.Font;
 		BEGIN

source/WebHTTP.Mod

@@ -201,7 +201,7 @@ TYPE
 			eof := FALSE; first := TRUE;
 		END Init;
 
-		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);
 		VAR i: LONGINT; token: ARRAY 16 OF CHAR; ch: CHAR;
 		BEGIN
 			IF ~eof THEN
@@ -297,7 +297,7 @@ TYPE
 			Streams.OpenReader(outR, Receiver);
 		END Init;
 
-		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);
 		VAR l: LONGINT;
 		BEGIN
 			IF remain > 0 THEN

source/WebHTTPClient.Mod

@@ -31,10 +31,10 @@ TYPE
 			END;
 		END InitContentReader;
 
-		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
 			token: ARRAY 16 OF CHAR;
-			i, total, r: LONGINT;
+			i, total: LONGINT; r: WORD;
 			ch: CHAR;
 		BEGIN
 			IF (encoding # "") & Strings.Match("chunked", encoding) THEN

source/Windows.SVNAdmin.Mod

@@ -277,7 +277,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;
@@ -760,7 +760,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/YMF754Util.Mod

@@ -13,7 +13,7 @@ VAR
 	w, binW: Files.Writer;
 	token: ARRAY 1024 OF CHAR;
 	f, binF: Files.File;
-	c, l, res: LONGINT;
+	c, l: LONGINT; res: WORD;
 BEGIN
 	context.arg.SkipWhitespace; context.arg.String(name);
 	c := 1;