diff options
Diffstat (limited to 'net/cvsup/files')
-rw-r--r-- | net/cvsup/files/p-amd64-aa | 92 | ||||
-rw-r--r-- | net/cvsup/files/p-amd64-zlib | 56 | ||||
-rw-r--r-- | net/cvsup/files/patch-ae | 43 |
3 files changed, 0 insertions, 191 deletions
diff --git a/net/cvsup/files/p-amd64-aa b/net/cvsup/files/p-amd64-aa deleted file mode 100644 index 6845cdf8023b..000000000000 --- a/net/cvsup/files/p-amd64-aa +++ /dev/null @@ -1,92 +0,0 @@ -# -# This should not be needed. The amd64 port of ezm3 has -# compiler bugs that manifest as sorting problems. Once that -# is fixed, this can go away. -# ---- suplib/src/ChannelMux.m3 Sun Oct 26 11:09:31 2003 -+++ suplib/src/ChannelMux.m3 Tue Mar 4 11:26:19 2003 -@@ -778,5 +778,5 @@ - PROCEDURE ChanPut(self: Channel; - READONLY arr: ARRAY OF CHAR) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - VAR - pos := 0; ---- suplib/src/EscapedWr.m3 Sun Oct 26 11:10:20 2003 -+++ suplib/src/EscapedWr.m3 Tue Mar 4 11:26:20 2003 -@@ -46,5 +46,5 @@ - - PROCEDURE Close(self: T) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - BEGIN - TRY -@@ -63,5 +63,5 @@ - - PROCEDURE Flush(self: T) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - BEGIN - Seek(self, self.cur); -@@ -91,5 +91,5 @@ - - PROCEDURE Seek(self: T; n: CARDINAL) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - VAR - ch: CHAR; ---- suplib/src/GzipWr.m3 Sun Oct 26 11:11:22 2003 -+++ suplib/src/GzipWr.m3 Tue Mar 4 11:26:23 2003 -@@ -58,5 +58,5 @@ - - PROCEDURE Close(self: T) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - VAR - status: INTEGER; -@@ -112,5 +112,5 @@ - - PROCEDURE Flush(self: T) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - VAR - status: INTEGER; -@@ -170,5 +170,5 @@ - - PROCEDURE Seek(self: T; n: CARDINAL) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - VAR - oldLo: CARDINAL; ---- suplib/src/MD5Wr.m3 Sun Oct 26 11:10:48 2003 -+++ suplib/src/MD5Wr.m3 Tue Mar 4 11:26:24 2003 -@@ -48,5 +48,5 @@ - - PROCEDURE Close(self: T) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - BEGIN - IF self.closeChild THEN -@@ -56,5 +56,5 @@ - - PROCEDURE Flush(self: T) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - BEGIN - Seek(self, self.cur); -@@ -96,5 +96,5 @@ - - PROCEDURE Seek(self: T; n: CARDINAL) -+ RAISES {Wr.Failure, Thread.Alerted} = -- RAISES {Thread.Alerted, Wr.Failure} = - BEGIN - <* ASSERT n = self.cur *> ---- suptcp/src/POSIX/SupTCP.m3 Sun Oct 26 11:08:21 2003 -+++ suptcp/src/POSIX/SupTCP.m3 Sun Apr 6 16:48:58 2003 -@@ -289,5 +289,5 @@ - PROCEDURE GetBytesFD( - t: T; VAR arr: ARRAY OF CHAR; timeout: LONGREAL) : CARDINAL -+ RAISES {Rd.Failure, Thread.Alerted, ConnFD.TimedOut} = -- RAISES {Rd.Failure, ConnFD.TimedOut, Thread.Alerted} = - VAR - len: INTEGER; diff --git a/net/cvsup/files/p-amd64-zlib b/net/cvsup/files/p-amd64-zlib deleted file mode 100644 index f00ec4917e89..000000000000 --- a/net/cvsup/files/p-amd64-zlib +++ /dev/null @@ -1,56 +0,0 @@ ---- suplib/src/GzipWr.m3.orig Tue Jun 1 21:09:44 2004 -+++ suplib/src/GzipWr.m3 Wed Jun 2 08:59:02 2004 -@@ -32,7 +32,7 @@ UNSAFE MODULE GzipWr; - - IMPORT - GzipError, OSError, StreamWrClass, Thread, Ugzip, Wr, WrClass; --FROM Ctypes IMPORT unsigned_char_star; -+FROM Ctypes IMPORT unsigned_char_star, int; - - REVEAL - T = Public BRANDED OBJECT -@@ -102,12 +102,15 @@ PROCEDURE Deflate(strmp: Ugzip.z_stream_ - (* Call "Ugzip.deflate", making sure that pointers into the (traced) - input and output buffers are on the stack or in registers. This - ensures that the collector will not move the buffers. *) -+ VAR -+ rc: int; - BEGIN - strmp.next_in := next_in; - strmp.avail_in := avail_in; - strmp.next_out := next_out; - strmp.avail_out := avail_out; -- RETURN Ugzip.deflate(strmp, flush); -+ rc := Ugzip.deflate(strmp, flush); -+ RETURN rc; - END Deflate; - - PROCEDURE Flush(self: T) ---- suplib/src/GzipRd.m3.orig Tue Mar 4 19:26:22 2003 -+++ suplib/src/GzipRd.m3 Wed Jun 2 08:59:22 2004 -@@ -32,7 +32,7 @@ UNSAFE MODULE GzipRd; - - IMPORT - GzipError, OSError, Rd, RdClass, StreamRdClass, Thread, Ugzip; --FROM Ctypes IMPORT unsigned_char_star; -+FROM Ctypes IMPORT unsigned_char_star, int; - - REVEAL - T = Public BRANDED OBJECT -@@ -83,12 +83,15 @@ PROCEDURE Inflate(strmp: Ugzip.z_stream_ - (* Call "Ugzip.inflate", making sure that pointers into the (traced) - input and output buffers are on the stack or in registers. This - ensures that the collector will not move the buffers. *) -+ VAR -+ rc: int; - BEGIN - strmp.next_in := next_in; - strmp.avail_in := avail_in; - strmp.next_out := next_out; - strmp.avail_out := avail_out; -- RETURN Ugzip.inflate(strmp, flush); -+ rc := Ugzip.inflate(strmp, flush); -+ RETURN rc; - END Inflate; - - PROCEDURE Init(self: T; diff --git a/net/cvsup/files/patch-ae b/net/cvsup/files/patch-ae deleted file mode 100644 index 85462dcd5745..000000000000 --- a/net/cvsup/files/patch-ae +++ /dev/null @@ -1,43 +0,0 @@ -Index: server/src/TreeComp.m3 -=================================================================== -RCS file: /home/cvsupcvs/cvsup/server/src/TreeComp.m3,v -retrieving revision 1.76 -diff -u -r1.76 TreeComp.m3 ---- server/src/TreeComp.m3 4 Mar 2003 19:26:17 -0000 1.76 -+++ server/src/TreeComp.m3 25 Mar 2005 19:34:43 -0000 -@@ -662,21 +662,20 @@ - type := FileInfo.Type.Live); - END; - | CVTree.FileType.AtticFile => -- WITH atticPath = SupMisc.AtticName(path) DO -- IF attr.fileType = FileAttr.FileType.File -- AND SupMisc.IsRCS(path) THEN -- IF m.sfr.fileFilter.test(atticPath) THEN -- RETURN NEW(FileInfo.T, -- name := path, -- attr := attr, -- type := FileInfo.Type.Dead); -- END; -- ELSE (* Non-RCS file in the Attic?! *) -- WITH fullPath = SupMisc.CatPath(m.sfr.serverPrefix, atticPath) -- DO -- Warning(m.treeComp, -- "Non-RCS file \"" & fullPath & "\" in Attic"); -- END; -+ IF attr.fileType = FileAttr.FileType.File -+ AND SupMisc.IsRCS(path) THEN -+ IF m.sfr.fileFilter.test(path) THEN -+ RETURN NEW(FileInfo.T, -+ name := path, -+ attr := attr, -+ type := FileInfo.Type.Dead); -+ END; -+ ELSE (* Non-RCS file in the Attic?! *) -+ WITH fullPath = SupMisc.CatPath(m.sfr.serverPrefix, -+ SupMisc.AtticName(path)) -+ DO -+ Warning(m.treeComp, -+ "Non-RCS file \"" & fullPath & "\" in Attic"); - END; - END; - | CVTree.FileType.DirUp => |