Subject: None
To: None <kdulzo@mcs.com>
From: Charles M. Hannum <mycroft@ai.mit.edu>
List: netbsd-help
Date: 06/13/1995 14:41:25
	   after compiling for 2 hours --
	   cc1: warnings being treated as errors
	   ../../../../netinet/ip_mroute.c: In function `tbf_control':
	   ../../../../netinet/ip_mroute.c: warning:passing arg 1 of `timeout' from incompatible pointer type

I've fixed those warnings in the current sources, but the changes
aren't yet available because of the shuffling of ftp.netbsd.org.


Here they are, for your edification:

Index: ip_mroute.c
===================================================================
RCS file: /a/cvsroot/src/sys/netinet/ip_mroute.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -2 -r1.19 -r1.20
*** ip_mroute.c	1995/06/04 06:46:08	1.19
--- ip_mroute.c	1995/06/04 06:55:30	1.20
***************
*** 98,102 ****
  static	void tbf_dequeue __P((struct vif *, int));
  static	void tbf_process_q __P((struct vif *));
! static	void tbf_reprocess_q __P((struct vif *));
  static	int tbf_dq_sel __P((struct vif *, struct ip *));
  static	void tbf_send_packet __P((struct vif *, struct mbuf *));
--- 98,102 ----
  static	void tbf_dequeue __P((struct vif *, int));
  static	void tbf_process_q __P((struct vif *));
! static	void tbf_reprocess_q __P((void *));
  static	int tbf_dq_sel __P((struct vif *, struct ip *));
  static	void tbf_send_packet __P((struct vif *, struct mbuf *));
***************
*** 1518,1522 ****
  	    /* queue packet and timeout till later */
  	    tbf_queue(vifp, m, ip);
! 	    timeout(tbf_reprocess_q, (caddr_t)vifp, 1);
  	}
      } else if (vifp->v_tbf.q_len < MAXQSIZE) {
--- 1518,1522 ----
  	    /* queue packet and timeout till later */
  	    tbf_queue(vifp, m, ip);
! 	    timeout(tbf_reprocess_q, vifp, 1);
  	}
      } else if (vifp->v_tbf.q_len < MAXQSIZE) {
***************
*** 1622,1637 ****
  
  static void
! tbf_reprocess_q(vifp)
!     register struct vif *vifp;
  {
!     if (ip_mrouter == NULL) 
! 	return;
  
!     tbf_update_tokens(vifp);
  
!     tbf_process_q(vifp);
  
!     if (vifp->v_tbf.q_len)
! 	timeout(tbf_reprocess_q, (caddr_t)vifp, 1);
  }
  
--- 1622,1638 ----
  
  static void
! tbf_reprocess_q(arg)
! 	void *arg;
  {
! 	register struct vif *vifp = arg;
  
! 	if (ip_mrouter == NULL) 
! 		return;
  
! 	tbf_update_tokens(vifp);
! 	tbf_process_q(vifp);
  
! 	if (vifp->v_tbf.q_len)
! 		timeout(tbf_reprocess_q, vifp, 1);
  }