Jelajahi Sumber

fix result type & signatures

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8472 8c9fc860-2736-0410-a75d-ab315db34111
eth.metacore 6 tahun lalu
induk
melakukan
fb97ec91b7

+ 1 - 1
source/Unix.IP.Mod

@@ -136,7 +136,7 @@ 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;

+ 1 - 1
source/Unix.Machine.Mod

@@ -562,7 +562,7 @@ END GetTimer;
 
 	(* function returning the number of processors that are available to Aos *)
 	PROCEDURE NumberOfProcessors*( ): LONGINT;
-	VAR res: WORD;
+	VAR res: LONGINT;
 	BEGIN
 		res := Unix.getnprocs();
 		RETURN res;

+ 1 - 1
source/Unix.StdIO.Mod

@@ -93,7 +93,7 @@ END Args;
 
 #END
 
-PROCEDURE ReceiveStdin( VAR data: ARRAY OF CHAR;  ofs, size, min: LONGINT;  VAR len, res: LONGINT );
+PROCEDURE ReceiveStdin( VAR data: ARRAY OF CHAR;  ofs, size, min: LONGINT;  VAR len: LONGINT; VAR res: WORD );
 VAR ures: SIZE;  i, err: LONGINT;
 BEGIN
 	len := 0;

+ 1 - 1
source/Unix.TCP.Mod

@@ -154,7 +154,7 @@ TYPE
 					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 p, x: LONGINT;
 				BEGIN {EXCLUSIVE}
 					ASSERT( (ofs >= 0) & (ofs + size <= LEN( data )) & (min <= size) );   (* parameter consistency check *)

+ 1 - 1
source/Unix.UDP.Mod

@@ -85,7 +85,7 @@ TYPE
 					too big.
 				*)
 				PROCEDURE Receive*( VAR data: ARRAY OF CHAR;  ofs, size, ms: LONGINT;  
-									 VAR fip: IP.Adr;  VAR fport, len, res: LONGINT );
+									 VAR fip: IP.Adr;  VAR fport, len: LONGINT; VAR res: WORD );
 				VAR 
 					addr: Sockets.SocketAdr; i: LONGINT;
 				BEGIN {EXCLUSIVE}

+ 4 - 4
source/Unix.UnixFiles.Mod

@@ -83,7 +83,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 );
 			BEGIN
 				fs.Delete0( name, key, res );
 			END Delete0;
@@ -109,7 +109,7 @@ TYPE
 				fs.CreateDirectory0( name, res );
 			END CreateDirectory0;
 
-			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
 				fs.RemoveDirectory0( name, force, key, res );
 			END RemoveDirectory0;
@@ -323,7 +323,7 @@ TYPE
 					RETURN 0
 				END FileKey;
 
-				PROCEDURE Delete0*( name: ARRAY OF CHAR;  VAR key, res: LONGINT );
+				PROCEDURE Delete0*( name: ARRAY OF CHAR;  VAR key: LONGINT; VAR res: WORD );
 				VAR r: LONGINT;
 				BEGIN  {EXCLUSIVE}
 					r := Unix.unlink( ADDRESSOF( name ) );
@@ -406,7 +406,7 @@ TYPE
 				END CreateDirectory0;
 				
 
-				PROCEDURE RemoveDirectory0*( path: ARRAY OF CHAR;  force: BOOLEAN;  VAR key, res: LONGINT );
+				PROCEDURE RemoveDirectory0*( path: ARRAY OF CHAR;  force: BOOLEAN;  VAR key: LONGINT; VAR res: WORD );
 				VAR r: LONGINT;
 				BEGIN {EXCLUSIVE}
 					r := Unix.rmdir( ADDRESSOF( path ) );

+ 5 - 5
source/Unix.V24.Mod

@@ -158,19 +158,19 @@ TYPE
 		END SendChar;
 
 		PROCEDURE Send*( CONST buf: ARRAY OF CHAR;  ofs, len: LONGINT; propagate: BOOLEAN; VAR res: WORD );
-		VAR r: SIZE;
+		VAR r: SIZE; writeRes: LONGINT;
 		BEGIN
 			ASSERT ( LEN( buf ) >= ofs + len );   (* array bound check not implemented in Kernel32.WriteFile *)
-			r := Unix.write( fd, ADDRESSOF(buf[ofs]), len );  res := LONGINT(r);
-			IF res < 0 THEN 
+			r := Unix.write( fd, ADDRESSOF(buf[ofs]), len );  writeRes := LONGINT( r );
+			IF writeRes < 0 THEN
 				res := Serials.TransportError;
 			ELSE	
-				INC( charactersSent, res );
+				INC( charactersSent, writeRes );
 				res := Serials.Ok;
 			END;			
 		END Send;
 
-		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 i, l: LONGINT;  read: SIZE;
 		BEGIN
 			ASSERT ( LEN( buf ) >= ofs + size );