- merge branch-netatalk-afp-3x-dev, HEAD was tagged before

[netatalk.git] / etc / papd / session.c

diff --git a/etc/papd/session.c b/etc/papd/session.c
index 62b21a8e893390824ade86ee3d32e3db0241bccf..6e1cfd783a15538f70387ccea3cdb0f0c4fd1fa7 100644 (file)
--- a/etc/papd/session.c
+++ b/etc/papd/session.c
@@ -1,5 +1,5 @@
 /*
- * $Id: session.c,v 1.14 2002-09-29 23:29:14 sibaz Exp $
+ * $Id: session.c,v 1.15 2005-04-28 20:49:49 bfernhomberg Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -74,7 +74,7 @@ int session( atp, sat )
     char               cbuf[ 578 ];
     int                        i, cc, timeout = 0, readpending = 0;
     u_int16_t          seq = 0, rseq = 1, netseq;
-    u_char             readport;
+    u_char             readport; /* uninitialized, OK 310105 */
 
     infile.pf_state = PF_BOT;
     infile.pf_bufsize = 0;
@@ -243,7 +243,7 @@ int session( atp, sat )
 
            for ( i = 0; i < atpb.atp_rresiovcnt; i++ ) {
                append( &infile,
-                       niov[ i ].iov_base + 4, niov[ i ].iov_len - 4 );
+                       (char *)niov[ i ].iov_base + 4, niov[ i ].iov_len - 4 );
                if (( infile.pf_state & PF_EOF ) == 0 &&
                        ((char *)niov[ 0 ].iov_base)[ 2 ] ) {
                    infile.pf_state |= PF_EOF;
@@ -304,7 +304,7 @@ int session( atp, sat )
                }
 
                niov[ i ].iov_len = 4 + cc;
-               memcpy( niov[ i ].iov_base + 4, outfile.pf_data, cc );
+               memcpy( (char *)niov[ i ].iov_base + 4, outfile.pf_data, cc );
                CONSUME( &outfile, cc );
                if ( outfile.pf_datalen == 0 ) {
                    i++;