second patch from Olaf Hering; gcc 64 warnings.

diff --git a/bin/getzones/getzones.c b/bin/getzones/getzones.c
index 1c21498cadeb791743fd9153a91355bb4a6d6094..cd43f0fa99940046e2bae98a9de610827483af77 100644 (file)
--- a/bin/getzones/getzones.c
+++ b/bin/getzones/getzones.c
@@ -1,5 +1,5 @@
 /*
- * $Id: getzones.c,v 1.6.14.1 2004-06-09 01:07:17 bfernhomberg Exp $
+ * $Id: getzones.c,v 1.6.14.1.2.1 2005-01-31 19:50:34 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -166,7 +166,7 @@ void print_zones( short n, char *buf )
             }
         }
 
-       printf( "%.*s\n", zone_len, zone );
+       printf( "%.*s\n", (int)zone_len, zone );
 
        free(zone);
     }

diff --git a/bin/nbp/nbplkup.c b/bin/nbp/nbplkup.c
index 5fbde51a46f0cdf51fae28dd01c853915dc92af2..00d0d0fe5ec2c824efe1ad7d96233db880eac2a8 100644 (file)
--- a/bin/nbp/nbplkup.c
+++ b/bin/nbp/nbplkup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbplkup.c,v 1.4.14.2 2004-06-15 00:44:02 bfernhomberg Exp $
+ * $Id: nbplkup.c,v 1.4.14.2.2.1 2005-01-31 19:50:35 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -176,7 +176,7 @@ int main( ac, av )
         }
 
        printf( "%31.*s:%-34.*s %u.%u:%u\n",
-               obj_len, obj,
+               (int)obj_len, obj,
                nn[ i ].nn_typelen, nn[ i ].nn_type,
                ntohs( nn[ i ].nn_sat.sat_addr.s_net ),
                nn[ i ].nn_sat.sat_addr.s_node,

diff --git a/etc/afpd/desktop.h b/etc/afpd/desktop.h
index d753e588ace55f57ca2d6e696e5708f479ada266..8fe75b7302c3bb6bc24eb0c34394bb55608955f1 100644 (file)
--- a/etc/afpd/desktop.h
+++ b/etc/afpd/desktop.h
@@ -1,5 +1,5 @@
 /*
- * $Id: desktop.h,v 1.3.6.3 2004-03-11 02:01:59 didg Exp $
+ * $Id: desktop.h,v 1.3.6.3.2.1 2005-01-31 19:50:35 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -48,7 +48,6 @@ typedef unsigned char CreatorType[4];
 extern char    *dtfile __P((const struct vol *, u_char [], char *));
 extern char    *mtoupath __P((const struct vol *, char *, cnid_t, int utf8));
 extern char    *utompath __P((const struct vol *, char *, cnid_t, int utf8));
-extern u_char  ucreator[];
 
 /* FP functions */
 extern int     afp_opendt __P((AFPObj *, char *, int, char *, int *));

diff --git a/etc/afpd/mangle.c b/etc/afpd/mangle.c
index 93264ea3186ddb7583026f358458179e16d80783..eb8cf78eb93d5558a57b4167d484d55cb0e61d41 100644 (file)
--- a/etc/afpd/mangle.c
+++ b/etc/afpd/mangle.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: mangle.c,v 1.16.2.1.2.12 2004-09-02 20:48:52 didg Exp $ 
+ * $Id: mangle.c,v 1.16.2.1.2.12.2.1 2005-01-31 19:50:37 didg Exp $ 
  *
  * Copyright (c) 2002. Joe Marcus Clarke (marcus@marcuscom.com)
  * All Rights Reserved.  See COPYRIGHT.
@@ -205,8 +205,8 @@ demangle_osx(const struct vol *vol, char *mfilename, cnid_t did, cnid_t *fileid)
 /* -------------------------------------------------------
  * find the start of a utf8 character
  */
-static char *
-utf8_mangle_validate(char *path, size_t len)
+static unsigned char *
+utf8_mangle_validate(unsigned char *path, size_t len)
 {
     unsigned char *p = path + len;
     int           dec = 0;
@@ -230,12 +230,12 @@ utf8_mangle_validate(char *path, size_t len)
    id         file/folder ID or 0
    
 */
-char *
-mangle(const struct vol *vol, char *filename, size_t filenamelen, char *uname, cnid_t id, int flags) {
-    char *ext = NULL;
-    char *m = NULL;
-    static char mfilename[MAXPATHLEN + 1];
-    char mangle_suffix[MANGLE_LENGTH + 1];
+unsigned char *
+mangle(const struct vol *vol, unsigned char *filename, size_t filenamelen, unsigned char *uname, cnid_t id, int flags) {
+    unsigned char *ext = NULL;
+    unsigned char *m = NULL;
+    static unsigned char mfilename[MAXPATHLEN + 1];
+    unsigned char mangle_suffix[MANGLE_LENGTH + 1];
     size_t ext_len = 0;
     size_t maxlen;
     int k;

diff --git a/etc/afpd/mangle.h b/etc/afpd/mangle.h
index 5981b05da4e9971cd5cc9ee39864e6874062e74e..0b658b8e3af71b2d33a64983940dcc2df59e87b6 100644 (file)
--- a/etc/afpd/mangle.h
+++ b/etc/afpd/mangle.h
@@ -1,5 +1,5 @@
 /*
- * $Id: mangle.h,v 1.4.2.1.2.3 2004-06-20 15:30:04 bfernhomberg Exp $
+ * $Id: mangle.h,v 1.4.2.1.2.3.2.1 2005-01-31 19:50:37 didg Exp $
  *
  */
 
@@ -24,7 +24,7 @@
 #define MANGLE_LENGTH  9 /* #ffffffff This really can't be changed. */
 #define MAX_LENGTH MACFILELEN 
 
-extern char *mangle __P((const struct vol *, char *, size_t, char *, cnid_t, int));
+extern unsigned char *mangle __P((const struct vol *, unsigned char *, size_t, unsigned char *, cnid_t, int));
 extern char *demangle __P((const struct vol *, char *, cnid_t did));
 extern char *demangle_osx __P((const struct vol *, char *, cnid_t did, cnid_t *fileid));
 

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 582e489a4f579df7d1374fab5fb7a76ff2832afd..093da937dcb56869edd1f37d6c3e67d67e41c6c0 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.13.6.11 2004-09-18 23:20:19 bfernhomberg Exp $
+ * $Id: status.c,v 1.13.6.11.2.1 2005-01-31 19:50:38 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -481,7 +481,7 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig,
 {
     ASP asp;
     DSI *dsi;
-    char *status = NULL;
+    u_int8_t *status = NULL;
     int statuslen, c, sigoff;
 
     if (!(aspconfig || dsiconfig) || !options)

diff --git a/etc/atalkd/config.c b/etc/atalkd/config.c
index f43200cffac9644ea572869f399e206ec5fadb45..37afeea455031dad2cc656b9e97b7ef8b10c4e0c 100644 (file)
--- a/etc/atalkd/config.c
+++ b/etc/atalkd/config.c
@@ -1,5 +1,5 @@
 /*
- * $Id: config.c,v 1.13.6.5.2.1 2005-01-31 17:01:01 didg Exp $
+ * $Id: config.c,v 1.13.6.5.2.2 2005-01-31 19:50:40 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -276,7 +276,7 @@ int writeconf( cf )
                     }
                     len = ((struct ziptab *)l->l_data)->zt_len;
                 } 
-               fprintf( newconf, " -zone \"%.*s\"", len, zonename);
+               fprintf( newconf, " -zone \"%.*s\"", (int)len, zonename);
                 free(zonename);
            }
            fprintf( newconf, "\n" );

diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index b91a437a32eee0c1f418390b5a1c27df422f74c1..c560b95c601a2f1533c4befa9a9c150eb87ec802 100644 (file)
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -129,7 +129,7 @@ typedef struct DSI {
 
 /* server and client quanta */
 #define DSI_DEFQUANT        2           /* default attention quantum size */
-#define DSI_SERVQUANT_MAX   0xffffffffL /* server quantum */
+#define DSI_SERVQUANT_MAX   0xffffffff  /* server quantum */
 #define DSI_SERVQUANT_MIN   32000       /* minimum server quantum */
 #define DSI_SERVQUANT_DEF   0x0004A2E0L /* default server quantum */
 

diff --git a/libatalk/dsi/dsi_stream.c b/libatalk/dsi/dsi_stream.c
index c105b9d92e5ea23ebf1aa1f33affcea9534d5820..cbfdb2fbcf6fe40860987d105f9b3e6f407a987b 100644 (file)
--- a/libatalk/dsi/dsi_stream.c
+++ b/libatalk/dsi/dsi_stream.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_stream.c,v 1.11.6.5 2004-05-04 14:26:14 didg Exp $
+ * $Id: dsi_stream.c,v 1.11.6.5.2.1 2005-01-31 19:50:53 didg Exp $
  *
  * Copyright (c) 1998 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -51,7 +51,7 @@
 /* ------------------------- 
  * we don't use a circular buffer.
 */
-const void dsi_buffer(DSI *dsi)
+void dsi_buffer(DSI *dsi)
 {
     fd_set readfds, writefds;
     int    len;

diff --git a/libatalk/util/getiface.c b/libatalk/util/getiface.c
index 01f552a830bcf5be287d7c1fdd5126715500033b..33947de7d8c9ced86d9e0762efedb02a8939e67d 100644 (file)
--- a/libatalk/util/getiface.c
+++ b/libatalk/util/getiface.c
@@ -119,7 +119,7 @@ static int getifaces(const int sockfd, char ***list)
  */
 char **getifacelist()
 {
-  char **list;
+  char **list = NULL; /* FIXME */
   int  i, fd;
 
   if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0)