ports/55517: team port broken

[David Gilbert]

>Number:         55517
>Category:       ports
>Synopsis:       team port broken
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 12 18:50:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     David Gilbert
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
DaveG.ca
>Environment:
System: FreeBSD canoe.velocet.net 5.1-CURRENT FreeBSD 5.1-CURRENT #4: Sun Aug 10 13:03:32 EDT 2003 dgilbert at canoe.velocet.net:/usr/src/sys/i386/compile/CANOE i386


FreeBSD-5.1-CURRENT, made today.
>Description:
Something in the compiler change seems to have changed such that
'off_t unsigned' is not accepted as a varible type.
>How-To-Repeat:
cd /usr/ports/misc/team
make
>Fix:

This patch to team.c appears to make it compile.  The patch simply
removes 'unsigned' from every instance of 'off_t.*unsigned' in the code.


--- work/team-3.1/team.c	Tue Aug 12 21:42:12 2003
+++ team.c	Tue Aug 12 21:42:07 2003
@@ -58,8 +58,8 @@
   upstream to it, which has much the same effect.
 */
 
-#define TeamLVOLSZ	(off_t unsigned)(1L<<10)
-#define TeamHVOLSZ	((off_t unsigned) 3 * ((off_t unsigned) 1 << 62))
+#define TeamLVOLSZ	(off_t )(1L<<10)
+#define TeamHVOLSZ	((off_t ) 3 * ((off_t) 1 << 62))
 
 #define TeamLBUFSZ	(64)		/* Low buffer size		*/
 #define TeamDBUFSZ	(60*512)	/* Default buffer size		*/
@@ -203,7 +203,7 @@
 {
   int 	    fd;
   short	    status;
-  off_t unsigned   size;
+  off_t    size;
 };
 
 local Fd		FdIn,FdOut;
@@ -212,7 +212,7 @@
 (
   fast Fd		  *fd
 _ int			  ffd
-_ off_t unsigned	  size
+_ off_t 	  size
 )
 {
   fd->status = (ffd >= 0) ? FdOPEN :   FdCLOSED;
@@ -265,12 +265,12 @@
   to->fd	= from->fd;
 }
 
-local off_t unsigned	FdRetry on((fd,which,done,space)) is
+local off_t 	FdRetry on((fd,which,done,space)) is
 (
   fast Fd		  *fd
 _ char			  *which
-_ off_t	unsigned	  done
-_ off_t	unsigned	  space
+_ off_t	  done
+_ off_t	  space
 )
 {
   int			  tty;
@@ -338,7 +338,7 @@
 local unsigned		FdCanDo on((remaining,available)) is
 (
   fast address		  remaining
-_ fast off_t unsigned	  available
+_ fast off_t 	  available
 )
 {
   return (remaining < available)
@@ -350,10 +350,10 @@
   fast Fd		  *fd
 _ pointer		  buffer
 _ fast address		  todo
-_ off_t unsigned	  done
+_ off_t 	  done
 )
 {
-  fast off_t unsigned	  space;
+  fast off_t 	  space;
   fast int		  bytesRead;
   fast address		  justDone;
 
@@ -391,10 +391,10 @@
   fast Fd		  *fd
 _ pointer		  buffer
 _ fast address		  todo
-_ off_t unsigned	  done
+_ off_t 	  done
 )
 {
-  fast off_t unsigned	  space;
+  fast off_t 	  space;
   fast int		  bytesWritten;
   fast address		  justDone;
 
@@ -471,7 +471,7 @@
 {
   Token			  token;
   short			  status;
-  off_t unsigned	  done;
+  off_t 	  done;
 };
 
 local bool		StreamSend on((fd,token,status,done)) is
@@ -479,7 +479,7 @@
   fast Fd		  *fd
 _ Token 		  token
 _ short 		  status
-_ off_t unsigned	  done
+_ off_t 	  done
 )
 {
   fast int		  n;
@@ -501,7 +501,7 @@
   fast Fd		  *fd
 _ Token 		  *tokenp
 _ short 		  *statusp
-_ off_t unsigned	  *donep
+_ off_t 	  *donep
 )
 {
   fast int		  n;
@@ -554,7 +554,7 @@
 #define GuyRECEIVE(guy,tokenp,statusp,donep) \
   StreamReceive(&guy->upStream,tokenp,statusp,donep)
 
-local bool		GuyStop of((Guy *,char *,off_t unsigned));
+local bool		GuyStop of((Guy *,char *,off_t ));
 
 local bool		GuyStart on((guy,bufsize)) is
 (
@@ -565,7 +565,7 @@
   fast char		  *buffer;
   Token 		  token;
   short 		  status;
-  off_t unsigned	  done;
+  off_t 	  done;
   bool		  received;
   static int 		  bytesRead,bytesWritten;
 
@@ -637,7 +637,7 @@
 (
   fast Guy		  *guy
 _ char			  *errormsg
-_ off_t unsigned	  done
+_ off_t 	  done
 )
 {
   Mesg(("GuyStop guy %#o\n",guy));
@@ -646,7 +646,7 @@
   {
     if (report)
       mesg("%qu kilobytes, %lu seconds\r\n",
-	  done>>10,(off_t unsigned) (time((time_t *) 0)-origin));
+	  done>>10,(off_t ) (time((time_t *) 0)-origin));
     else if (verbose)
       mesg("\n");
   }
@@ -715,8 +715,8 @@
 (
   fast Team		  *team
 _ address		  bufsize
-_ off_t unsigned		  isize
-_ off_t unsigned		  osize
+_ off_t 		  isize
+_ off_t 		  osize
 )
 {
   /*
@@ -956,19 +956,19 @@
   /*NOTREACHED*/
 }
 
-local off_t unsigned	atos on((s)) is
+local off_t 	atos on((s)) is
 (
   fast char		  *s
 )
 {
-  fast off_t unsigned	  l;
+  fast off_t 	  l;
 
   for (
     s, l = 0L;
     *s >= '0' && *s <= '9';
     s++
   )
-    l = l*10L + (off_t unsigned) (*s-'0');
+    l = l*10L + (off_t ) (*s-'0');
 
   if (*s == 'b') l *= (1L<<9);
   if (*s == 'k') l *= (1L<<10);
@@ -987,8 +987,8 @@
   short unsigned	  teamsize;
 
   address		  bufsize;
-  off_t unsigned	  isize;
-  off_t unsigned	  osize;
+  off_t 	  isize;
+  off_t 	  osize;
   int			  opt;
 
   teamsize = TeamDTEAMSZ;


>Release-Note:
>Audit-Trail:
>Unformatted: