From: srittau <srittau>
Date: Thu, 7 Feb 2002 23:58:46 +0000 (+0000)
Subject: Trunk-BP: warning fixes.
X-Git-Tag: netatalk-1-5-2~32
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=a29969cf6b790d8cf2031a8a49324ef576abd35d

Trunk-BP: warning fixes.
---

diff --git a/etc/atalkd/nbp.c b/etc/atalkd/nbp.c
index ea662599..45f5ef06 100644
--- a/etc/atalkd/nbp.c
+++ b/etc/atalkd/nbp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbp.c,v 1.5.2.1 2001-12-31 20:05:20 srittau Exp $
+ * $Id: nbp.c,v 1.5.2.2 2002-02-07 23:58:46 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -85,6 +85,7 @@ int nbp_packet( ap, from, data, len )
     struct rtmptab	*rtmp;
     char		*end, *nbpop, *zonep, packet[ ATP_BUFSIZ ];
     int			n, i, cc, locallkup;
+    u_char		tmplen;
 
     end = data + len;
     if ( data >= end ) {
@@ -122,30 +123,36 @@ int nbp_packet( ap, from, data, len )
     nn.nn_sat.sat_port = nt.nt_port;
 
     /* object */
-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
+    tmplen = (u_char) *data;
+    if ( data >= end || tmplen > 32 || data + tmplen > end ) {
 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
 	return 1;
     }
-    nn.nn_objlen = *data++;
+    nn.nn_objlen = tmplen;
+    data++;
     memcpy( nn.nn_obj, data, nn.nn_objlen );
     data += nn.nn_objlen;
 
     /* type */
-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
+    tmplen = (u_char) *data;
+    if ( data >= end || tmplen > 32 || data + tmplen > end ) {
 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
 	return 1;
     }
-    nn.nn_typelen = *data++;
+    nn.nn_typelen = tmplen;
+    data++;
     memcpy( nn.nn_type, data, nn.nn_typelen );
     data += nn.nn_typelen;
 
     /* zone */
-    if ( data >= end || ( *data < 0 || *data > 32 ) || data + *data > end ) {
+    tmplen = (u_char) *data;
+    if ( data >= end || tmplen > 32 || data + tmplen > end ) {
 	syslog( LOG_INFO, "nbp_packet: malformed packet" );
 	return 1;
     }
     zonep = data;			/* remember for fwd */
-    nn.nn_zonelen = *data++;
+    nn.nn_zonelen = tmplen;
+    data++;
     memcpy( nn.nn_zone, data, nn.nn_zonelen );
     data += nn.nn_zonelen;
 
diff --git a/libatalk/atp/atp_packet.c b/libatalk/atp/atp_packet.c
index 994c775b..0296af24 100644
--- a/libatalk/atp/atp_packet.c
+++ b/libatalk/atp/atp_packet.c
@@ -1,5 +1,5 @@
 /*
- * $Id: atp_packet.c,v 1.4 2001-08-15 02:17:57 srittau Exp $
+ * $Id: atp_packet.c,v 1.4.2.1 2002-02-08 00:03:27 srittau Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -121,7 +121,7 @@ void atp_build_req_packet( struct atpbuf *pktbuf,
 
     /* set length
     */
-    pktbuf->atpbuf_dlen = ATP_HDRSIZE + atpb->atp_sreqdlen;
+    pktbuf->atpbuf_dlen = ATP_HDRSIZE + (size_t) atpb->atp_sreqdlen;
 }
 
 void atp_build_resp_packet( struct atpbuf *pktbuf,
@@ -145,7 +145,7 @@ void atp_build_resp_packet( struct atpbuf *pktbuf,
 
     /* set length
     */
-    pktbuf->atpbuf_dlen = ATP_HDRSIZE + atpb->atp_sresiov[ seqnum ].iov_len;
+    pktbuf->atpbuf_dlen = ATP_HDRSIZE + (size_t) atpb->atp_sresiov[ seqnum ].iov_len;
 }
 
 
@@ -205,7 +205,7 @@ atp_recv_atp( ATP ah,
     if ( cq != NULL ) {
 	/* we found one in the queue -- copy to rbuf
 	*/
-	dlen = cq->atpbuf_dlen;
+	dlen = (int) cq->atpbuf_dlen;
 	*func = rfunc;
 	memcpy( fromaddr, &cq->atpbuf_addr, sizeof( struct sockaddr_at ));
 	memcpy( rbuf, cq->atpbuf_info.atpbuf_data, cq->atpbuf_dlen );
@@ -301,7 +301,7 @@ atp_recv_atp( ATP ah,
 		memcpy( &inbuf->atpbuf_addr, &faddr, 
 			sizeof( struct sockaddr_at ));
 		inbuf->atpbuf_next = ah->atph_queue;
-		inbuf->atpbuf_dlen = recvlen;
+		inbuf->atpbuf_dlen = (size_t) recvlen;
 		memcpy( inbuf->atpbuf_info.atpbuf_data, rbuf, recvlen );
 	    }
 	}
diff --git a/libatalk/atp/atp_rresp.c b/libatalk/atp/atp_rresp.c
index 5f96ced6..795d8719 100644
--- a/libatalk/atp/atp_rresp.c
+++ b/libatalk/atp/atp_rresp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: atp_rresp.c,v 1.4 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: atp_rresp.c,v 1.4.2.1 2002-02-08 00:03:27 srittau Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -50,7 +50,8 @@ atp_rresp( ah, atpb )
     ATP			ah;		/* open atp handle */
     struct atp_block	*atpb;		/* parameter block */
 {
-    int		len, i, rc;
+    int		i, rc;
+    size_t	len;
 
 #ifdef EBUG
     atp_print_bufuse( ah, "atp_rresp" );
@@ -81,7 +82,7 @@ atp_rresp( ah, atpb )
 	    return( -1 );
 	}
 #ifdef EBUG
-	fprintf( stderr, "atp_rresp copying %d bytes packet %d\n",
+	fprintf( stderr, "atp_rresp copying %ld bytes packet %d\n",
 		len, i );
 	bprint( (char *)ah->atph_resppkt[ i ]->atpbuf_info.atpbuf_data,
 		len + ATP_HDRSIZE );
diff --git a/libatalk/atp/atp_rsel.c b/libatalk/atp/atp_rsel.c
index ba05bcd5..48a67632 100644
--- a/libatalk/atp/atp_rsel.c
+++ b/libatalk/atp/atp_rsel.c
@@ -1,5 +1,5 @@
 /*
- * $Id: atp_rsel.c,v 1.3 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: atp_rsel.c,v 1.3.2.1 2002-02-08 00:03:27 srittau Exp $
  *
  * Copyright (c) 1990,1997 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -41,7 +41,7 @@ resend_request( ah )
     struct atphdr	req_hdr;
 
 #ifdef EBUG
-    printf( "\n<%d> resend_request: resending %d byte request packet",
+    printf( "\n<%d> resend_request: resending %ld byte request packet",
 	    getpid(), ah->atph_reqpkt->atpbuf_dlen );
     atp_print_addr( " to", &ah->atph_reqpkt->atpbuf_addr );
     putchar( '\n' );
@@ -178,7 +178,7 @@ timeout :
     bprint( abuf->atpbuf_info.atpbuf_data, recvlen );
 #endif /* EBUG */
 
-    abuf->atpbuf_dlen = recvlen;
+    abuf->atpbuf_dlen = (size_t) recvlen;
     memcpy( &resp_hdr, abuf->atpbuf_info.atpbuf_data + 1,
 	    sizeof( struct atphdr ));
 
diff --git a/libatalk/atp/atp_sreq.c b/libatalk/atp/atp_sreq.c
index bbb6cc4e..200952bd 100644
--- a/libatalk/atp/atp_sreq.c
+++ b/libatalk/atp/atp_sreq.c
@@ -1,5 +1,5 @@
 /*
- * $Id: atp_sreq.c,v 1.4 2001-08-15 02:17:57 srittau Exp $
+ * $Id: atp_sreq.c,v 1.4.2.1 2002-02-08 00:03:27 srittau Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -95,7 +95,7 @@ atp_sreq( ATP ah, struct atp_block *atpb, int respcount, u_int8_t flags )
     /* send the initial request
     */
 #ifdef EBUG
-    printf( "\n<%d> atp_sreq: sending a %d byte packet ", getpid(),
+    printf( "\n<%d> atp_sreq: sending a %ld byte packet ", getpid(),
 	    req_buf->atpbuf_dlen );
     atp_print_addr( " to", atpb->atp_saddr );
     putchar( '\n' );
diff --git a/libatalk/dsi/dsi_stream.c b/libatalk/dsi/dsi_stream.c
index d2bc3370..8b79dae6 100644
--- a/libatalk/dsi/dsi_stream.c
+++ b/libatalk/dsi/dsi_stream.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_stream.c,v 1.4 2001-08-15 02:18:57 srittau Exp $
+ * $Id: dsi_stream.c,v 1.4.2.1 2002-02-08 00:03:29 srittau Exp $
  *
  * Copyright (c) 1998 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -72,13 +72,13 @@ size_t dsi_stream_read(DSI *dsi, void *data, const size_t length)
   
   stored = 0;
   while (stored < length) {
-    if ((len = read(dsi->socket, (u_int8_t *) data + stored, 
-		    length - stored)) == -1 && errno == EINTR)
+    len = read(dsi->socket, (u_int8_t *) data + stored, length - stored);
+    if (len == -1 && errno == EINTR)
       continue;
 
-    if (len > 0)
+    else if (len > 0)
       stored += len;
-    else {/* eof or error */
+    else { /* eof or error */
       syslog(LOG_ERR, "dsi_stream_read(%d): %s", len, strerror(errno));
       break;
     }