Patch #:	9
Type:		bug fix
Priority:	medium
Affects:        sites running UAR under SGI IRIX
Reported:       David Hornsby <djh@munnari.OZ.AU>
Summary:        fix compiler errors & warnings under IRIX 5.2
Archived:       munnari.OZ.AU  mac/cap.patches/uar.1.0.patch09
Application:    'cd uar; patch -p < uar.1.0.patch09'


*** aarp.c.orig		Sun Oct 24 19:07:46 1993
--- aarp.c		Mon Aug 22 18:51:29 1994
***************
*** 15,21 ****
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1 $
   *
   */
  
--- 15,21 ----
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.1 $
   *
   */
  
***************
*** 542,548 ****
  	u_char node;
  	struct aarpq *p, *q, *t;
  	void aarp_lookup(), aarp_enqueue();
! 	void zone_getnetinfo(), cap_start();
  
  	p = aarpQueue;
  	q = AARPQNULL;
--- 542,548 ----
  	u_char node;
  	struct aarpq *p, *q, *t;
  	void aarp_lookup(), aarp_enqueue();
! 	void log(), zone_getnetinfo(), cap_start();
  
  	p = aarpQueue;
  	q = AARPQNULL;
*** ddp.c.orig		Thu May 19 17:26:24 1994
--- ddp.c		Mon Aug 22 18:49:12 1994
***************
*** 15,21 ****
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.2 $
   *
   */
  
--- 15,21 ----
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.3 $
   *
   */
  
***************
*** 623,631 ****
  struct rtmp *rtmp;
  {
  	short len;
- 	u_short cksum;
- 	u_short dstNet;
  	u_char dstNode;
  	u_char *addr, *pkt, *hdr;
  	struct aarp *aarp, *aarp_find();
  	struct rtmp rtmpn;
--- 623,631 ----
  struct rtmp *rtmp;
  {
  	short len;
  	u_char dstNode;
+ 	u_short dstNet;
+ 	u_short cksum, chkSum();
  	u_char *addr, *pkt, *hdr;
  	struct aarp *aarp, *aarp_find();
  	struct rtmp rtmpn;
*** rtmp.c.orig		Tue Oct 26 18:26:25 1993
--- rtmp.c		Mon Aug 22 18:48:13 1994
***************
*** 15,21 ****
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.1 $
   *
   */
  
--- 15,21 ----
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.2 $
   *
   */
  
***************
*** 432,437 ****
--- 432,438 ----
  {
  	int i;
  	extern int numintfc;
+ 	void rtmp_send();
  
  	for (i = 0; i < numintfc; i++)
  	  rtmp_send(i, NULL, 1);
*** zip.c.orig		Fri Mar 11 11:37:12 1994
--- zip.c		Mon Aug 22 18:47:40 1994
***************
*** 15,21 ****
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.3 $
   *
   */
  
--- 15,21 ----
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.4 $
   *
   */
  
***************
*** 115,120 ****
--- 115,121 ----
  struct rtmp *rtmp;
  {
  	u_char *pkt;
+ 	void zip_query_send();
  
  	if (rtmp->rnet  != zrnet
  	 || rtmp->rnode != zrnode
***************
*** 367,372 ****
--- 368,374 ----
  	short zlen;
  	u_char *data;
  	struct zit *zit;
+ 	void zip_reply_send();
  
  	if ((zit = rtmp->zitlist) == ZITNULL)
  	  return;
***************
*** 666,671 ****
--- 668,674 ----
  	u_char *pkt, *znam, *mcast, *zaddr, *zone_mcast();
  	short len, zlen, zvalid, zcount;
  	struct rtmp *rtmp, *rtmp_find();
+ 	struct rtmp *rtmp_route();
  	struct zit *zit;
  	struct pd opd;
  
***************
*** 890,896 ****
  	short len, zlen, mlen;
  	u_char *pkt, *znam, *mcast;
  	struct zone *zone, *zone_find(), *zone_new();
! 	void rtmp_intfc();
  
  	pkt = pd->data;
  	len = pd->dataLen;
--- 893,899 ----
  	short len, zlen, mlen;
  	u_char *pkt, *znam, *mcast;
  	struct zone *zone, *zone_find(), *zone_new();
! 	void zone_insert(), rtmp_intfc();
  
  	pkt = pd->data;
  	len = pd->dataLen;
***************
*** 1255,1260 ****
--- 1258,1264 ----
  	short len;
  	u_char *pkt;
  	struct pd opd;
+ 	struct rtmp *rtmp_route();
  
  	pkt = zbuf+HDRSIZ+LDDPHDRSIZ;
  
*** uar.c.orig		Thu May 19 19:53:22 1994
--- uar.c		Mon Aug 22 18:46:36 1994
***************
*** 15,21 ****
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.3 $
   *
   */
  
--- 15,21 ----
   * djh@munnari.OZ.AU
   *
   * $Author: djh $
!  * $Revision: 1.1.1.4 $
   *
   */
  
***************
*** 491,496 ****
--- 491,497 ----
  cleanup()
  {
  	int i;
+ 	void log(), zip_multicast();
  
  	for (i = 0; i < numintfc; i++) {
  	  if (iflist[i].itype == ITYPE_ETHERTALK) {
*** README.orig		Mon Jun  6 07:16:53 1994
--- README		Mon Aug 22 19:00:58 1994
***************
*** 4,10 ****
  		     The University of Melbourne
  			  djh@munnari.OZ.AU
  			    October, 1993
! 			    version 1.0.8
  
  
  
--- 4,10 ----
  		     The University of Melbourne
  			  djh@munnari.OZ.AU
  			    October, 1993
! 			    version 1.0.9