From d8736f77764e18812d1c05769bd211b56539d1c1 Mon Sep 17 00:00:00 2001
From: didg <didg>
Date: Tue, 3 May 2005 14:55:10 +0000
Subject: [PATCH] remove gcc warning

---
 etc/afpd/status.c                        |  4 +--
 etc/cnid_dbd/dbd_lookup.c                |  4 +--
 etc/cnid_dbd/dbd_update.c                |  4 +--
 etc/cnid_dbd/pack.c                      |  8 ++---
 etc/cnid_dbd/pack.h                      |  4 +--
 etc/cnid_dbd/usockfd.c                   |  4 +--
 etc/uams/uams_randnum.c                  |  8 ++---
 include/atalk/adouble.h                  |  5 +--
 include/atalk/cnid.h                     | 37 ++++++++++++----------
 include/atalk/dsi.h                      |  7 +++--
 libatalk/adouble/ad_open.c               |  4 +--
 libatalk/cnid/cdb/cnid_cdb.h             | 14 ++++-----
 libatalk/cnid/cdb/cnid_cdb_add.c         | 16 +++++-----
 libatalk/cnid/cdb/cnid_cdb_get.c         |  4 +--
 libatalk/cnid/cdb/cnid_cdb_lookup.c      |  6 ++--
 libatalk/cnid/cdb/cnid_cdb_private.h     | 14 ++++-----
 libatalk/cnid/cdb/cnid_cdb_rebuild_add.c | 40 ++----------------------
 libatalk/cnid/cdb/cnid_cdb_resolve.c     |  4 +--
 libatalk/cnid/cdb/cnid_cdb_update.c      |  6 ++--
 libatalk/cnid/cnid.c                     | 16 +++++-----
 libatalk/cnid/db3/cnid_db3.h             | 10 +++---
 libatalk/cnid/db3/cnid_db3_add.c         |  5 ++-
 libatalk/cnid/db3/cnid_db3_get.c         |  5 ++-
 libatalk/cnid/db3/cnid_db3_lookup.c      |  6 ++--
 libatalk/cnid/db3/cnid_db3_open.c        | 16 ++++++----
 libatalk/cnid/db3/cnid_db3_private.h     | 10 +++---
 libatalk/cnid/db3/cnid_db3_resolve.c     |  4 +--
 libatalk/cnid/db3/cnid_db3_update.c      |  4 +--
 libatalk/cnid/dbd/cnid_dbd.c             | 17 +++++-----
 libatalk/cnid/dbd/cnid_dbd.h             | 16 +++++-----
 libatalk/cnid/last/cnid_last.c           | 20 ++++++------
 libatalk/cnid/last/cnid_last.h           | 10 +++---
 libatalk/cnid/tdb/cnid_tdb.h             | 12 +++----
 libatalk/cnid/tdb/cnid_tdb_add.c         |  4 +--
 libatalk/cnid/tdb/cnid_tdb_get.c         |  4 +--
 libatalk/cnid/tdb/cnid_tdb_lookup.c      |  4 +--
 libatalk/cnid/tdb/cnid_tdb_update.c      |  4 +--
 libatalk/dsi/dsi_init.c                  |  4 +--
 38 files changed, 167 insertions(+), 197 deletions(-)

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index e7cf092b..92642c8b 100644
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.16 2005-04-28 20:49:44 bfernhomberg Exp $
+ * $Id: status.c,v 1.17 2005-05-03 14:55:10 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;
-    u_int8_t *status = NULL;
+    char *status = NULL;
     size_t statuslen;
     int c, sigoff;
 
diff --git a/etc/cnid_dbd/dbd_lookup.c b/etc/cnid_dbd/dbd_lookup.c
index 7ae9c1fe..d5073357 100644
--- a/etc/cnid_dbd/dbd_lookup.c
+++ b/etc/cnid_dbd/dbd_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_lookup.c,v 1.2 2005-04-28 20:49:48 bfernhomberg Exp $
+ * $Id: dbd_lookup.c,v 1.3 2005-05-03 14:55:11 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -29,7 +29,7 @@
 
 int dbd_lookup(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
 {
-    char *buf;
+    unsigned char *buf;
     DBT key, devdata, diddata;
     char dev[CNID_DEV_LEN];
     char ino[CNID_INO_LEN];
diff --git a/etc/cnid_dbd/dbd_update.c b/etc/cnid_dbd/dbd_update.c
index 816c1f66..184feaab 100644
--- a/etc/cnid_dbd/dbd_update.c
+++ b/etc/cnid_dbd/dbd_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_update.c,v 1.2 2005-04-28 20:49:48 bfernhomberg Exp $
+ * $Id: dbd_update.c,v 1.3 2005-05-03 14:55:11 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -36,7 +36,7 @@ int dbd_update(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
 {
     DBT key,pkey, data;
     int rc;
-    char *buf;                            
+    unsigned char *buf;                            
     int notfound = 0;
     char getbuf[CNID_HEADER_LEN + MAXPATHLEN +1];
 #ifdef DEBUG
diff --git a/etc/cnid_dbd/pack.c b/etc/cnid_dbd/pack.c
index 13b7e736..b1fd85ae 100644
--- a/etc/cnid_dbd/pack.c
+++ b/etc/cnid_dbd/pack.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.c,v 1.2 2005-04-28 20:49:48 bfernhomberg Exp $
+ * $Id: pack.c,v 1.3 2005-05-03 14:55:11 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -89,10 +89,10 @@ DBT *skey;
    differ from make_cnid_data in that we never return NULL, rqst->name cannot
    ever cause start[] to overflow because name length is checked in libatalk. */
 
-char *pack_cnid_data(struct cnid_dbd_rqst *rqst)
+unsigned char *pack_cnid_data(struct cnid_dbd_rqst *rqst)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start +CNID_LEN;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start +CNID_LEN;
     u_int32_t i;
 
     pack_devino(buf, rqst->dev, rqst->ino);
diff --git a/etc/cnid_dbd/pack.h b/etc/cnid_dbd/pack.h
index 90add9dc..c7f255b5 100644
--- a/etc/cnid_dbd/pack.h
+++ b/etc/cnid_dbd/pack.h
@@ -1,5 +1,5 @@
 /*
- * $Id: pack.h,v 1.2 2005-04-28 20:49:49 bfernhomberg Exp $
+ * $Id: pack.h,v 1.3 2005-05-03 14:55:11 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -38,7 +38,7 @@
 #define CNID_DBD_HEADER_LEN          (CNID_DBD_DEVINO_LEN + CNID_DBD_DID_LEN)
 #endif
 
-extern char      *pack_cnid_data  __P((struct cnid_dbd_rqst *));
+extern unsigned char *pack_cnid_data  __P((struct cnid_dbd_rqst *));
 
 #ifdef DEBUG
 extern char      *stringify_devino  __P((dev_t dev, ino_t ino));
diff --git a/etc/cnid_dbd/usockfd.c b/etc/cnid_dbd/usockfd.c
index 8fba6054..37de33b4 100644
--- a/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: usockfd.c,v 1.2 2005-04-28 20:49:49 bfernhomberg Exp $
+ * $Id: usockfd.c,v 1.3 2005-05-03 14:55:11 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -141,7 +141,7 @@ int tsockfd_create(char *host, u_int16_t ipport, int backlog)
 int usockfd_check(int sockfd, unsigned long ndelay)
 {
     int fd;
-    int size;
+    socklen_t size;
     fd_set readfds;
     struct timeval tv;
     int ret;
diff --git a/etc/uams/uams_randnum.c b/etc/uams/uams_randnum.c
index 7d8d78b6..3edd5a18 100644
--- a/etc/uams/uams_randnum.c
+++ b/etc/uams/uams_randnum.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: uams_randnum.c,v 1.16 2005-04-28 20:49:50 bfernhomberg Exp $
+ * $Id: uams_randnum.c,v 1.17 2005-05-03 14:55:11 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -73,7 +73,7 @@ static u_int8_t         randbuf[8];
 /* handle ~/.passwd. courtesy of shirsch@ibm.net. */
 static  __inline__ int home_passwd(const struct passwd *pwd, 
 				   const char *path, const int pathlen _U_, 
-				   char *passwd, const int len,
+				   unsigned char *passwd, const int len,
 				   const int set)
 {
   struct stat st;
@@ -145,7 +145,7 @@ home_passwd_fail:
 #define unhex(x)  (isdigit(x) ? (x) - '0' : toupper(x) + 10 - 'A')
 static int afppasswd(const struct passwd *pwd, 
 		     const char *path, const int pathlen, 
-		     char *passwd, int len, 
+		     unsigned char *passwd, int len, 
 		     const int set)
 {
   u_int8_t key[DES_KEY_SZ*2];
@@ -264,7 +264,7 @@ afppasswd_done:
  * depending upon whether or not the password is in ~/.passwd
  * or in a global location */
 static int randpass(const struct passwd *pwd, const char *file,
-		    char *passwd, const int len, const int set) 
+		    unsigned char *passwd, const int len, const int set) 
 {
   int i;
   uid_t uid = geteuid();
diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index 94cda955..8e00a318 100644
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.24 2005-04-28 20:49:51 bfernhomberg Exp $
+ * $Id: adouble.h,v 1.25 2005-05-03 14:55:12 didg Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -247,7 +247,8 @@ struct adouble {
     char		ad_filler[ 16 ];
     struct ad_entry	ad_eid[ ADEID_MAX ];
     struct ad_fd	ad_df, ad_hf;
-    int                 ad_flags, ad_inited;
+    int                 ad_flags;
+    unsigned int        ad_inited;
     int                 ad_options;
     int                 ad_refcount; /* used in afpd/ofork.c */
     off_t               ad_rlen;     /* ressource fork len with AFP 3.0
diff --git a/include/atalk/cnid.h b/include/atalk/cnid.h
index 4aad7e0d..7aa03766 100644
--- a/include/atalk/cnid.h
+++ b/include/atalk/cnid.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: cnid.h,v 1.10 2005-04-28 20:49:51 bfernhomberg Exp $
+ * $Id: cnid.h,v 1.11 2005-05-03 14:55:12 didg Exp $
  *
  * Copyright (c) 2003 the Netatalk Team
  * Copyright (c) 2003 Rafal Lewczuk <rlewczuk@pronet.pl>
@@ -51,20 +51,19 @@ struct _cnid_db {
 	void *_private;              /* back-end speficic data */
 
 	cnid_t (*cnid_add)(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, 
-			char *name, const int len, cnid_t hint);
+			char *name, const size_t, cnid_t hint);
 	int (*cnid_delete)(struct _cnid_db *cdb, cnid_t id);
-	cnid_t (*cnid_get)(struct _cnid_db *cdb, const cnid_t did, char *name,
-			const int len);
+	cnid_t (*cnid_get)(struct _cnid_db *cdb, const cnid_t did, char *name, const  size_t);
 	cnid_t (*cnid_lookup)(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			char *name, const int len);
+			char *name, const size_t);
 	cnid_t (*cnid_nextid)(struct _cnid_db *cdb);
-	char *(*cnid_resolve)(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len);
+	char *(*cnid_resolve)(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len);
 	int (*cnid_update)(struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, char *name, const int len);	
+			const cnid_t did, char *name, const size_t len);	
 	void (*cnid_close)(struct _cnid_db *cdb);
-	int  (*cnid_getstamp)(struct _cnid_db *cdb, void *buffer, const int len);
+	int  (*cnid_getstamp)(struct _cnid_db *cdb, void *buffer, const size_t len);
         cnid_t (*cnid_rebuild_add)(struct _cnid_db *, const struct stat *, const cnid_t,
-                        const char *, const int, cnid_t);
+                        char *, const size_t, cnid_t);
 };
 typedef struct _cnid_db cnid_db;
 
@@ -90,24 +89,24 @@ void cnid_register(struct _cnid_module *module);
 struct _cnid_db *cnid_open(const char *volpath, mode_t mask, char *type, int flags);
 
 cnid_t cnid_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, 
-			char *name, const int len, cnid_t hint);
+			char *name, const size_t len, cnid_t hint);
 
 int    cnid_delete(struct _cnid_db *cdb, cnid_t id);
 
-cnid_t cnid_get   (struct _cnid_db *cdb, const cnid_t did, char *name,const int len);
+cnid_t cnid_get   (struct _cnid_db *cdb, const cnid_t did, char *name,const size_t len);
 
-int    cnid_getstamp(struct _cnid_db *cdb, void *buffer, const int len);
+int    cnid_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len);
 
 cnid_t cnid_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			char *name, const int len);
+			char *name, const size_t len);
 
-char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len);
+char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len);
 
 int cnid_update   (struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, char *name, const int len);
+			const cnid_t did, char *name, const size_t len);
 
 cnid_t cnid_rebuild_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-                        const char *name, const int len, cnid_t hint);
+                        char *name, const size_t len, cnid_t hint);
 
 
 /* This function closes a CNID database and frees all resources assigned to it. */ 
@@ -117,7 +116,11 @@ void cnid_close(struct _cnid_db *db);
 
 /*
  * $Log: cnid.h,v $
- * Revision 1.10  2005-04-28 20:49:51  bfernhomberg
+ * Revision 1.11  2005-05-03 14:55:12  didg
+ *
+ * remove gcc warning
+ *
+ * Revision 1.10  2005/04/28 20:49:51  bfernhomberg
  *
  * - merge branch-netatalk-afp-3x-dev, HEAD was tagged before
  *
diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index 2c4566d5..13609048 100644
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -64,8 +64,9 @@ typedef struct DSI {
   
   u_int32_t attn_quantum, datasize, server_quantum;
   u_int16_t serverID, clientID;
-  u_int8_t *status, commands[DSI_CMDSIZ], data[DSI_DATASIZ];
-  int statuslen;
+  char      *status;
+  u_int8_t  commands[DSI_CMDSIZ], data[DSI_DATASIZ];
+  size_t statuslen;
   size_t datalen, cmdlen;
   size_t read_count, write_count;
   int asleep; /* client won't reply AFP 0x7a ? */
@@ -142,7 +143,7 @@ extern DSI *dsi_init __P((const dsi_proto /*protocol*/,
 			  const char * /*host*/, const char * /*address*/,
 			  const int /*port*/, const int /*proxy*/,
 			  const u_int32_t /* server quantum */));
-extern void dsi_setstatus __P((DSI *, u_int8_t *, const int));
+extern void dsi_setstatus __P((DSI *, char *, const size_t));
 
 /* in dsi_getsess.c */
 extern DSI *dsi_getsession __P((DSI *, server_child *, const int));
diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c
index 6c00aafd..903ce78a 100644
--- a/libatalk/adouble/ad_open.c
+++ b/libatalk/adouble/ad_open.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_open.c,v 1.32 2005-04-28 20:49:52 bfernhomberg Exp $
+ * $Id: ad_open.c,v 1.33 2005-05-03 14:55:12 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -938,7 +938,7 @@ int ret = 0;
 #ifdef EMULATE_SUIDDIR
 uid_t id;
 
-    if (default_uid != -1) {  
+    if (default_uid != (uid_t)-1) {  
         /* we are root (admin) */
         id = (default_uid)?default_uid:stbuf->st_uid;
 	ret = chown( path, id, stbuf->st_gid );
diff --git a/libatalk/cnid/cdb/cnid_cdb.h b/libatalk/cnid/cdb/cnid_cdb.h
index 1646ed24..e1fc8a58 100644
--- a/libatalk/cnid/cdb/cnid_cdb.h
+++ b/libatalk/cnid/cdb/cnid_cdb.h
@@ -23,18 +23,18 @@ extern void cnid_cdb_close __P((struct _cnid_db *));
 
 /* cnid_add.c */
 extern cnid_t cnid_cdb_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			    char *, const int, cnid_t));
-extern int cnid_cdb_getstamp __P((struct _cnid_db *, void *, const int ));
+			    char *, const size_t, cnid_t));
+extern int cnid_cdb_getstamp __P((struct _cnid_db *, void *, const size_t ));
 
 /* cnid_get.c */
-extern cnid_t cnid_cdb_get __P((struct _cnid_db *, const cnid_t, char *, const int)); 
-extern char *cnid_cdb_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t )); 
+extern cnid_t cnid_cdb_get __P((struct _cnid_db *, const cnid_t, char *, const size_t)); 
+extern char *cnid_cdb_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t )); 
 extern cnid_t cnid_cdb_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       char *, const int));
+			       char *, const size_t));
 
 /* cnid_update.c */
 extern int cnid_cdb_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, char *, int));
+			    const cnid_t, char *, size_t));
 
 /* cnid_delete.c */
 extern int cnid_cdb_delete __P((struct _cnid_db *, const cnid_t));
@@ -46,7 +46,7 @@ extern int cnid_cdb_lock   __P((void *));
 extern int cnid_cdb_unlock __P((void *));
 
 extern cnid_t cnid_cdb_rebuild_add __P((struct _cnid_db *, const struct stat *,
-                const cnid_t, const char *, const int, cnid_t));
+                const cnid_t, char *, const size_t, cnid_t));
 
 
 #endif /* include/atalk/cnid_cdb.h */
diff --git a/libatalk/cnid/cdb/cnid_cdb_add.c b/libatalk/cnid/cdb/cnid_cdb_add.c
index e5e28ab4..3f1461f9 100644
--- a/libatalk/cnid/cdb/cnid_cdb_add.c
+++ b/libatalk/cnid/cdb/cnid_cdb_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_add.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_cdb_add.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -40,11 +40,11 @@ static void make_devino_data(unsigned char *buf, dev_t dev, ino_t ino)
     buf[CNID_DEV_LEN + CNID_INO_LEN - 8] = ino;    
 }
 
-char *make_cnid_data(const struct stat *st,const cnid_t did,
-                     const char *name, const int len)
+unsigned char *make_cnid_data(const struct stat *st,const cnid_t did,
+                     const char *name, const size_t len)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start  +CNID_LEN;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start  +CNID_LEN;
     u_int32_t i;
 
     if (len > MAXPATHLEN)
@@ -70,7 +70,7 @@ char *make_cnid_data(const struct stat *st,const cnid_t did,
 #endif
 
 extern int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len);
+                const cnid_t did, char *name, const size_t len);
 
 /* --------------- */
 int db_stamp(void *buffer, size_t size)
@@ -169,7 +169,7 @@ cleanup:
 
 /* ------------------------ */
 cnid_t cnid_cdb_add(struct _cnid_db *cdb, const struct stat *st,
-                const cnid_t did, char *name, const int len,
+                const cnid_t did, char *name, const size_t len,
                 cnid_t hint)
 {
     CNID_private *db;
@@ -246,7 +246,7 @@ cnid_t cnid_cdb_add(struct _cnid_db *cdb, const struct stat *st,
 
 /* cnid_cbd_getstamp */
 /*-----------------------*/
-int cnid_cdb_getstamp(struct _cnid_db *cdb, void *buffer, const int len)
+int cnid_cdb_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len)
 {
     DBT key, data;
     int rc;
diff --git a/libatalk/cnid/cdb/cnid_cdb_get.c b/libatalk/cnid/cdb/cnid_cdb_get.c
index 76cec48b..2f609577 100644
--- a/libatalk/cnid/cdb/cnid_cdb_get.c
+++ b/libatalk/cnid/cdb/cnid_cdb_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_get.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_cdb_get.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 
 /* Return CNID for a given did/name. */
 cnid_t cnid_cdb_get(struct _cnid_db *cdb, const cnid_t did, char *name,
-                const int len)
+                const size_t len)
 {
     char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
     CNID_private *db;
diff --git a/libatalk/cnid/cdb/cnid_cdb_lookup.c b/libatalk/cnid/cdb/cnid_cdb_lookup.c
index a8d49f02..0eebb9f9 100644
--- a/libatalk/cnid/cdb/cnid_cdb_lookup.c
+++ b/libatalk/cnid/cdb/cnid_cdb_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_lookup.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_cdb_lookup.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,9 +15,9 @@
 /* This returns the CNID corresponding to a particular file.  It will
  * also fix up the various databases if there's a problem. */
 cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-                   char *name, const int len)
+                   char *name, const size_t len)
 {
-    char *buf;
+    unsigned char *buf;
     CNID_private *db;
     DBT key, devdata, diddata;
     char dev[CNID_DEV_LEN];
diff --git a/libatalk/cnid/cdb/cnid_cdb_private.h b/libatalk/cnid/cdb/cnid_cdb_private.h
index d3491229..7453173e 100644
--- a/libatalk/cnid/cdb/cnid_cdb_private.h
+++ b/libatalk/cnid/cdb/cnid_cdb_private.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_private.h,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_cdb_private.h,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifndef LIBATALK_CDB_PRIVATE_H
@@ -195,12 +195,12 @@ static void make_devino_data(unsigned char *buf, dev_t dev, ino_t ino)
     buf[CNID_DEV_LEN + CNID_INO_LEN - 8] = ino;    
 }
 
-static __inline__ char *make_cnid_data(const struct stat *st,
+static __inline__ unsigned char *make_cnid_data(const struct stat *st,
                                        const cnid_t did,
-                                       const char *name, const int len)
+                                       const char *name, const size_t len)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start  +CNID_LEN;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start  +CNID_LEN;
     u_int32_t i;
 
     if (len > MAXPATHLEN)
@@ -224,8 +224,8 @@ static __inline__ char *make_cnid_data(const struct stat *st,
     return start;
 }
 #else
-extern char *make_cnid_data __P((const struct stat *,const cnid_t ,
-                                       const char *, const int ));
+extern unsigned char *make_cnid_data __P((const struct stat *,const cnid_t ,
+                                       const char *, const size_t ));
 #endif
 
 #endif /* atalk/cnid/cnid_private.h */
diff --git a/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c b/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c
index 7ea872e9..f8ac3405 100644
--- a/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c
+++ b/libatalk/cnid/cdb/cnid_cdb_rebuild_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_rebuild_add.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_cdb_rebuild_add.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  *
  * All Rights Reserved. See COPYRIGHT.
  *
@@ -17,42 +17,6 @@
 
 #include "cnid_cdb.h"
 
-#ifdef ATACC
-/* FIXME: Enhance for 8 byte dev/inode */
-char *make_cnid_data(const struct stat *st,const cnid_t did,
-                     const char *name, const int len)
-{
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start  +CNID_LEN;
-    u_int32_t i;
-
-    if (len > MAXPATHLEN)
-        return NULL;
-
-    memcpy(buf, &st->st_dev, sizeof(st->st_dev));
-    buf += sizeof(st->st_dev);
-
-    i = htonl(st->st_ino);
-    memcpy(buf , &st->st_ino, sizeof(st->st_ino));
-    buf += sizeof(st->st_ino);
-
-    i = S_ISDIR(st->st_mode)?1:0;
-    i = htonl(i);
-    memcpy(buf, &i, sizeof(i));
-    buf += sizeof(i);
-    
-    /* did is already in network byte order */
-    memcpy(buf, &did, sizeof(did));
-    buf += sizeof(did);
-
-    memcpy(buf, name, len);
-    *(buf + len) = '\0';
-
-    return start;
-}    
-#endif
-
-
 /* ----------------------------- */
 static cnid_t set_max_cnid(CNID_private *db, cnid_t hint)
 {
@@ -111,7 +75,7 @@ cleanup:
 
 /* ------------------------ */
 cnid_t cnid_cdb_rebuild_add(struct _cnid_db *cdb, const struct stat *st,
-                const cnid_t did, const char *name, const int len, 
+                const cnid_t did, char *name, const size_t len, 
 		cnid_t hint)
 {
     CNID_private *db;
diff --git a/libatalk/cnid/cdb/cnid_cdb_resolve.c b/libatalk/cnid/cdb/cnid_cdb_resolve.c
index 3441f3b6..b865bf62 100644
--- a/libatalk/cnid/cdb/cnid_cdb_resolve.c
+++ b/libatalk/cnid/cdb/cnid_cdb_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_resolve.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_cdb_resolve.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -10,7 +10,7 @@
 #include "cnid_cdb_private.h"
 
 /* Return the did/name pair corresponding to a CNID. */
-char *cnid_cdb_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len) {
+char *cnid_cdb_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len) {
     CNID_private *db;
     DBT key, data;
     int rc;
diff --git a/libatalk/cnid/cdb/cnid_cdb_update.c b/libatalk/cnid/cdb/cnid_cdb_update.c
index 80e08b73..9f4e9c2f 100644
--- a/libatalk/cnid/cdb/cnid_cdb_update.c
+++ b/libatalk/cnid/cdb/cnid_cdb_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_cdb_update.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_cdb_update.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,10 +15,10 @@
  * handle the did/name data, there are a bunch of functions to get
  * and set the various fields. */
 int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len
+                const cnid_t did, char *name, const size_t len
                 /*, const char *info, const int infolen*/)
 {
-    char *buf;
+    unsigned char *buf;
     CNID_private *db;
     DBT key, pkey, data;
     int rc;
diff --git a/libatalk/cnid/cnid.c b/libatalk/cnid/cnid.c
index 4e5f088d..ead06ac5 100644
--- a/libatalk/cnid/cnid.c
+++ b/libatalk/cnid/cnid.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: cnid.c,v 1.2 2005-04-28 20:49:57 bfernhomberg Exp $
+ * $Id: cnid.c,v 1.3 2005-05-03 14:55:12 didg Exp $
  *
  * Copyright (c) 2003 the Netatalk Team
  * Copyright (c) 2003 Rafal Lewczuk <rlewczuk@pronet.pl>
@@ -196,7 +196,7 @@ u_int32_t flags;
 
 /* --------------- */
 cnid_t cnid_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, 
-			char *name, const int len, cnid_t hint)
+			char *name, const size_t len, cnid_t hint)
 {
 cnid_t ret;
 
@@ -219,7 +219,7 @@ int ret;
 
 
 /* --------------- */
-cnid_t cnid_get(struct _cnid_db *cdb, const cnid_t did, char *name,const int len)
+cnid_t cnid_get(struct _cnid_db *cdb, const cnid_t did, char *name,const size_t len)
 {
 cnid_t ret;
 
@@ -230,7 +230,7 @@ cnid_t ret;
 }
 
 /* --------------- */
-int cnid_getstamp(struct _cnid_db *cdb,  void *buffer, const int len)
+int cnid_getstamp(struct _cnid_db *cdb,  void *buffer, const size_t len)
 {
 cnid_t ret;
 time_t t;
@@ -252,7 +252,7 @@ time_t t;
 
 /* --------------- */
 cnid_t cnid_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			char *name, const int len)
+			char *name, const size_t len)
 {
 cnid_t ret;
 
@@ -263,7 +263,7 @@ cnid_t ret;
 }
 
 /* --------------- */
-char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len)
+char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len)
 {
 char *ret;
 
@@ -275,7 +275,7 @@ char *ret;
 
 /* --------------- */
 int cnid_update   (struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, char *name, const int len)
+			const cnid_t did, char *name, const size_t len)
 {
 int ret;
 
@@ -287,7 +287,7 @@ int ret;
 			
 /* --------------- */
 cnid_t cnid_rebuild_add(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-                       const char *name, const int len, cnid_t hint)
+                       char *name, const size_t len, cnid_t hint)
 {
 cnid_t ret;
 
diff --git a/libatalk/cnid/db3/cnid_db3.h b/libatalk/cnid/db3/cnid_db3.h
index dec9597e..9986544c 100644
--- a/libatalk/cnid/db3/cnid_db3.h
+++ b/libatalk/cnid/db3/cnid_db3.h
@@ -60,17 +60,17 @@ extern void cnid_db3_close __P((struct _cnid_db *));
 
 /* cnid_add.c */
 extern cnid_t cnid_db3_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			    char *, const int, cnid_t));
+			    char *, const size_t, cnid_t));
 
 /* cnid_get.c */
-extern cnid_t cnid_db3_get __P((struct _cnid_db *, const cnid_t, char *, const int)); 
-extern char *cnid_db3_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t )); 
+extern cnid_t cnid_db3_get __P((struct _cnid_db *, const cnid_t, char *, const size_t)); 
+extern char *cnid_db3_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t )); 
 extern cnid_t cnid_db3_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       char *, const int));
+			       char *, const size_t));
 
 /* cnid_update.c */
 extern int cnid_db3_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, char *, int));
+			    const cnid_t, char *, size_t));
 
 /* cnid_delete.c */
 extern int cnid_db3_delete __P((struct _cnid_db *, const cnid_t));
diff --git a/libatalk/cnid/db3/cnid_db3_add.c b/libatalk/cnid/db3/cnid_db3_add.c
index 3879138b..f699a74e 100644
--- a/libatalk/cnid/db3/cnid_db3_add.c
+++ b/libatalk/cnid/db3/cnid_db3_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_add.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_db3_add.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -118,7 +118,6 @@ static cnid_t get_cnid(CNID_private *db)
     DBT rootinfo_key, rootinfo_data;
     DB_TXN *tid;
     int rc;
-    int flag;
     cnid_t hint,id;
 
     memset(&rootinfo_key, 0, sizeof(rootinfo_key));
@@ -203,7 +202,7 @@ cleanup_abort:
 
 /* ------------------------ */
 cnid_t cnid_db3_add(struct _cnid_db *cdb, const struct stat *st,
-                const cnid_t did, char *name, const int len,
+                const cnid_t did, char *name, const size_t len,
                 cnid_t hint)
 {
     CNID_private *db;
diff --git a/libatalk/cnid/db3/cnid_db3_get.c b/libatalk/cnid/db3/cnid_db3_get.c
index 6657ecf7..eabd4ada 100644
--- a/libatalk/cnid/db3/cnid_db3_get.c
+++ b/libatalk/cnid/db3/cnid_db3_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_get.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_db3_get.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,8 +27,7 @@
 #include "cnid_db3_private.h"
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_db3_get(struct _cnid_db *cdb, const cnid_t did, char *name,
-                const int len)
+cnid_t cnid_db3_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len)
 {
     char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
     CNID_private *db;
diff --git a/libatalk/cnid/db3/cnid_db3_lookup.c b/libatalk/cnid/db3/cnid_db3_lookup.c
index cd4d78de..803a03af 100644
--- a/libatalk/cnid/db3/cnid_db3_lookup.c
+++ b/libatalk/cnid/db3/cnid_db3_lookup.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_db3_lookup.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_db3_lookup.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,9 +32,9 @@
 
 /* This returns the CNID corresponding to a particular file.  It will
  * also fix up the various databases if there's a problem. */
-cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
+cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const size_t len)
 {
-    char *buf;
+    unsigned char *buf;
     CNID_private *db;
     DBT key, devdata, diddata;
     int devino = 1, didname = 1;
diff --git a/libatalk/cnid/db3/cnid_db3_open.c b/libatalk/cnid/db3/cnid_db3_open.c
index 824df3b1..aa9557fd 100644
--- a/libatalk/cnid/db3/cnid_db3_open.c
+++ b/libatalk/cnid/db3/cnid_db3_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_db3_open.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $
+ * $Id: cnid_db3_open.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -115,6 +115,7 @@ DB_INIT_LOG | DB_INIT_TXN)
 #define MAXITER     0xFFFF      /* maximum number of simultaneously open CNID
                                  * databases. */
 
+#if 0
 /* -----------------------
  * bandaid for LanTest performance pb. for now not used, cf. ifdef 0 below
 */
@@ -128,6 +129,7 @@ static int my_yield(void)
     ret = select(0, NULL, NULL, NULL, &t);
     return 0;
 }
+#endif
 
 /* --------------- */
 static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode)
@@ -139,7 +141,10 @@ static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t fla
 #endif
 }
 
-/* --------------- */
+#if 0
+/* --------------- 
+ * XXX not used
+*/
 
 /* the first compare that's always done. */
 static __inline__ int compare_did(const DBT * a, const DBT * b)
@@ -154,7 +159,7 @@ static __inline__ int compare_did(const DBT * a, const DBT * b)
 /* sort did's and then names. this is for unix paths.
  * i.e., did/unixname lookups. */
 #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
-static int compare_unix(DB * db, const DBT * a, const DBT * b)
+static int compare_unix(DB * db _U_, const DBT * a, const DBT * b)
 #else /* DB_VERSION_MINOR < 1 */
 static int compare_unix(const DBT * a, const DBT * b)
 #endif                          /* DB_VERSION_MINOR */
@@ -180,7 +185,7 @@ static int compare_unix(const DBT * a, const DBT * b)
  * unicode table to work. also, we can't use strdiacasecmp as that
  * returns a match if a < b. */
 #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
-static int compare_mac(DB * db, const DBT * a, const DBT * b)
+static int compare_mac(DB * db _U_, const DBT * a, const DBT * b)
 #else /* DB_VERSION_MINOR < 1 */
 static int compare_mac(const DBT * a, const DBT * b)
 #endif                          /* DB_VERSION_MINOR */
@@ -201,7 +206,6 @@ static int compare_mac(const DBT * a, const DBT * b)
     return a->size - b->size;   /* sort by length */
 }
 
-
 /* for unicode names -- right now it's the same as compare_mac. */
 #if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
 static int compare_unicode(DB * db, const DBT * a, const DBT * b)
@@ -215,6 +219,7 @@ static int compare_unicode(const DBT * a, const DBT * b)
     return compare_mac(a, b);
 #endif /* DB_VERSION_MINOR */
 }
+#endif
 
 static struct _cnid_db *cnid_db3_new(const char *volpath)
 {
@@ -497,7 +502,6 @@ struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask)
 
   fail_adouble:
 
-  fail_db:
     free(db);
 
   fail_cdb:
diff --git a/libatalk/cnid/db3/cnid_db3_private.h b/libatalk/cnid/db3/cnid_db3_private.h
index f39b9ac4..9a454599 100644
--- a/libatalk/cnid/db3/cnid_db3_private.h
+++ b/libatalk/cnid/db3/cnid_db3_private.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_private.h,v 1.2 2005-04-28 20:50:00 bfernhomberg Exp $
+ * $Id: cnid_db3_private.h,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifndef LIBATALK_CNID_PRIVATE_H
@@ -106,12 +106,12 @@ typedef struct CNID_private {
 #endif /* __inline__ */
 
 /* construct db_cnid data. NOTE: this is not re-entrant.  */
-static __inline__ char *make_cnid_data(const struct stat *st,
+static __inline__ unsigned char *make_cnid_data(const struct stat *st,
                                        const cnid_t did,
-                                       const char *name, const int len)
+                                       const char *name, const size_t len)
 {
-    static char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
-    char *buf = start;
+    static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1];
+    unsigned char *buf = start;
     u_int32_t i;
 
     if (len > MAXPATHLEN)
diff --git a/libatalk/cnid/db3/cnid_db3_resolve.c b/libatalk/cnid/db3/cnid_db3_resolve.c
index 987a8f49..fdc12ac8 100644
--- a/libatalk/cnid/db3/cnid_db3_resolve.c
+++ b/libatalk/cnid/db3/cnid_db3_resolve.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_resolve.c,v 1.2 2005-04-28 20:50:00 bfernhomberg Exp $
+ * $Id: cnid_db3_resolve.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@
 #include "cnid_db3_private.h"
 
 /* Return the did/name pair corresponding to a CNID. */
-char *cnid_db3_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len) {
+char *cnid_db3_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len) {
     CNID_private *db;
     DBT key, data;
     int rc;
diff --git a/libatalk/cnid/db3/cnid_db3_update.c b/libatalk/cnid/db3/cnid_db3_update.c
index eb7dc2dc..7294971b 100644
--- a/libatalk/cnid/db3/cnid_db3_update.c
+++ b/libatalk/cnid/db3/cnid_db3_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_db3_update.c,v 1.2 2005-04-28 20:50:00 bfernhomberg Exp $
+ * $Id: cnid_db3_update.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@
  * handle the did/name data, there are a bunch of functions to get
  * and set the various fields. */
 int cnid_db3_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len
+                const cnid_t did, char *name, const size_t len
                 /*, const char *info, const int infolen*/)
 {
     CNID_private *db;
diff --git a/libatalk/cnid/dbd/cnid_dbd.c b/libatalk/cnid/dbd/cnid_dbd.c
index 07a601e2..64676bc3 100644
--- a/libatalk/cnid/dbd/cnid_dbd.c
+++ b/libatalk/cnid/dbd/cnid_dbd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_dbd.c,v 1.2 2005-04-28 20:50:00 bfernhomberg Exp $
+ * $Id: cnid_dbd.c,v 1.3 2005-05-03 14:55:13 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -467,7 +467,7 @@ void cnid_dbd_close(struct _cnid_db *cdb)
 
 /* ---------------------- */
 cnid_t cnid_dbd_add(struct _cnid_db *cdb, const struct stat *st,
-                const cnid_t did, char *name, const int len,
+                const cnid_t did, char *name, const size_t len,
                 cnid_t hint _U_)
 {
     CNID_private *db;
@@ -526,8 +526,7 @@ cnid_t cnid_dbd_add(struct _cnid_db *cdb, const struct stat *st,
 }
 
 /* ---------------------- */
-cnid_t cnid_dbd_get(struct _cnid_db *cdb, const cnid_t did, char *name,
-                const int len)
+cnid_t cnid_dbd_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -578,7 +577,7 @@ cnid_t cnid_dbd_get(struct _cnid_db *cdb, const cnid_t did, char *name,
 }
 
 /* ---------------------- */
-char *cnid_dbd_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len)
+char *cnid_dbd_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -653,7 +652,7 @@ static int dbd_getstamp(CNID_private *db, void *buffer, const size_t len)
 }
 
 /* ---------------------- */
-int cnid_dbd_getstamp(struct _cnid_db *cdb, void *buffer, const int len)
+int cnid_dbd_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len)
 {
     CNID_private *db;
     int ret;
@@ -673,7 +672,7 @@ int cnid_dbd_getstamp(struct _cnid_db *cdb, void *buffer, const int len)
 
 /* ---------------------- */
 cnid_t cnid_dbd_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-                   char *name, const int len)
+                   char *name, const size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -731,7 +730,7 @@ cnid_t cnid_dbd_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t
 
 /* ---------------------- */
 int cnid_dbd_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const int len)
+                const cnid_t did, char *name, const size_t len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -782,7 +781,7 @@ int cnid_dbd_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st
 
 /* ---------------------- */
 cnid_t cnid_dbd_rebuild_add(struct _cnid_db *cdb, const struct stat *st, 
-			    const cnid_t did, const char *name, const int len, 
+			    const cnid_t did, char *name, const size_t len, 
 			    cnid_t hint)
 {
     CNID_private *db;
diff --git a/libatalk/cnid/dbd/cnid_dbd.h b/libatalk/cnid/dbd/cnid_dbd.h
index 098fafed..e32f1edd 100644
--- a/libatalk/cnid/dbd/cnid_dbd.h
+++ b/libatalk/cnid/dbd/cnid_dbd.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_dbd.h,v 1.2 2005-04-28 20:50:01 bfernhomberg Exp $
+ * $Id: cnid_dbd.h,v 1.3 2005-05-03 14:55:14 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -21,17 +21,17 @@ extern struct _cnid_module cnid_dbd_module;
 extern struct _cnid_db *cnid_dbd_open __P((const char *, mode_t));
 extern void cnid_dbd_close __P((struct _cnid_db *));
 extern cnid_t cnid_dbd_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			    char *, const int, cnid_t));
-extern cnid_t cnid_dbd_get __P((struct _cnid_db *, const cnid_t, char *, const int)); 
-extern char *cnid_dbd_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t )); 
-extern int cnid_dbd_getstamp __P((struct _cnid_db *, void *, const int )); 
+			    char *, const size_t, cnid_t));
+extern cnid_t cnid_dbd_get __P((struct _cnid_db *, const cnid_t, char *, const size_t)); 
+extern char *cnid_dbd_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t )); 
+extern int cnid_dbd_getstamp __P((struct _cnid_db *, void *, const size_t )); 
 extern cnid_t cnid_dbd_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       char *, const int));
+			       char *, const size_t));
 extern int cnid_dbd_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, char *, int));
+			    const cnid_t, char *, size_t));
 extern int cnid_dbd_delete __P((struct _cnid_db *, const cnid_t));
 extern cnid_t cnid_dbd_rebuild_add __P((struct _cnid_db *, const struct stat *,
-                const cnid_t, const char *, const int, cnid_t));
+                const cnid_t, char *, const size_t, cnid_t));
 
 /* FIXME: These functions could be static in cnid_dbd.c */
 
diff --git a/libatalk/cnid/last/cnid_last.c b/libatalk/cnid/last/cnid_last.c
index 98fb0cfc..6f0f68ea 100644
--- a/libatalk/cnid/last/cnid_last.c
+++ b/libatalk/cnid/last/cnid_last.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_last.c,v 1.2 2005-04-28 20:50:01 bfernhomberg Exp $
+ * $Id: cnid_last.c,v 1.3 2005-05-03 14:55:14 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -23,7 +23,7 @@
 
 /* ------------------------ */
 cnid_t cnid_last_add(struct _cnid_db *cdb, const struct stat *st,
-                     const cnid_t did, char *name, const int len, cnid_t hint)
+                     const cnid_t did _U_, char *name _U_, const size_t len _U_, cnid_t hint _U_)
 {
 
     /* FIXME: it relies on fact, that this is never called twice for the same file/dir. */
@@ -80,7 +80,7 @@ void cnid_last_close(struct _cnid_db *cdb)
 
 
 
-int cnid_last_delete(struct _cnid_db *cdb, const cnid_t id)
+int cnid_last_delete(struct _cnid_db *cdb _U_, const cnid_t id _U_)
 {
     return CNID_INVALID;
 }
@@ -88,7 +88,7 @@ int cnid_last_delete(struct _cnid_db *cdb, const cnid_t id)
 
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_last_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len)
+cnid_t cnid_last_get(struct _cnid_db *cdb _U_, const cnid_t did _U_, char *name _U_, const size_t len _U_)
 {
     /* FIXME: it relies on fact, that this is never called twice for the same file/dir. */
     /* Propably we should look through DID tree. */
@@ -98,7 +98,8 @@ cnid_t cnid_last_get(struct _cnid_db *cdb, const cnid_t did, char *name, const i
 
 
 /* */
-cnid_t cnid_last_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
+cnid_t cnid_last_lookup(struct _cnid_db *cdb _U_, const struct stat *st _U_, const cnid_t did _U_, 
+    char *name _U_, const size_t len _U_)
 {
     /* FIXME: this function doesn't work in [last] scheme ! */
     /* Should be never called or CNID should be somewhat refactored again. */
@@ -143,7 +144,7 @@ static struct _cnid_db *cnid_last_new(const char *volpath)
     return cdb;
 }
 
-struct _cnid_db *cnid_last_open(const char *dir, mode_t mask)
+struct _cnid_db *cnid_last_open(const char *dir, mode_t mask _U_)
 {
     struct _cnid_db *cdb;
 
@@ -167,16 +168,15 @@ struct _cnid_module cnid_last_module = {
 };
 
 /* Return the did/name pair corresponding to a CNID. */
-char *cnid_last_resolve(struct _cnid_db *cdb, cnid_t * id, void *buffer, u_int32_t len)
+char *cnid_last_resolve(struct _cnid_db *cdb _U_, cnid_t * id _U_, void *buffer _U_, size_t len _U_)
 {
     /* FIXME: frankly, it does not work. As get, add and other functions. */
     return NULL;
 }
 
 
-int cnid_last_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                     const cnid_t did, char *name, const int len
-                     /*, const char *info, const int infolen */ )
+int cnid_last_update(struct _cnid_db *cdb _U_, const cnid_t id _U_, const struct stat *st _U_,
+                     const cnid_t did  _U_, char *name  _U_, const size_t len _U_)
 {
     return 0;
 }
diff --git a/libatalk/cnid/last/cnid_last.h b/libatalk/cnid/last/cnid_last.h
index 2a32527d..33f561e1 100644
--- a/libatalk/cnid/last/cnid_last.h
+++ b/libatalk/cnid/last/cnid_last.h
@@ -23,12 +23,12 @@ extern struct _cnid_module cnid_last_module;
 extern struct _cnid_db *cnid_last_open __P((const char *, mode_t));
 extern void cnid_last_close __P((struct _cnid_db *));
 extern cnid_t cnid_last_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-                                 char *, const int, cnid_t));
-extern cnid_t cnid_last_get __P((struct _cnid_db *, const cnid_t, char *, const int));
-extern char *cnid_last_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t));
-extern cnid_t cnid_last_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
+                                 char *, const size_t, cnid_t));
+extern cnid_t cnid_last_get __P((struct _cnid_db *, const cnid_t, char *, const size_t));
+extern char *cnid_last_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t));
+extern cnid_t cnid_last_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const size_t));
 extern int cnid_last_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, char *, int));
+                                 const cnid_t, char *, size_t));
 extern int cnid_last_delete __P((struct _cnid_db *, const cnid_t));
 
 #endif /* include/atalk/cnid_last.h */
diff --git a/libatalk/cnid/tdb/cnid_tdb.h b/libatalk/cnid/tdb/cnid_tdb.h
index fb12dc07..29bed977 100644
--- a/libatalk/cnid/tdb/cnid_tdb.h
+++ b/libatalk/cnid/tdb/cnid_tdb.h
@@ -70,16 +70,16 @@ extern void cnid_tdb_close __P((struct _cnid_db *));
 
 /* cnid_add.c */
 extern cnid_t cnid_tdb_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-                                 char *, const int, cnid_t));
+                                 char *, const size_t, cnid_t));
 
 /* cnid_get.c */
-extern cnid_t cnid_tdb_get __P((struct _cnid_db *, const cnid_t, char *, const int));
-extern char *cnid_tdb_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t));
-extern cnid_t cnid_tdb_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
+extern cnid_t cnid_tdb_get __P((struct _cnid_db *, const cnid_t, char *, const size_t));
+extern char *cnid_tdb_resolve __P((struct _cnid_db *, cnid_t *, void *, size_t));
+extern cnid_t cnid_tdb_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const size_t));
 
 /* cnid_update.c */
 extern int cnid_tdb_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, char *, int));
+                                 const cnid_t, char *, size_t));
 
 /* cnid_delete.c */
 extern int cnid_tdb_delete __P((struct _cnid_db *, const cnid_t));
@@ -90,7 +90,7 @@ extern cnid_t cnid_tdb_nextid __P((struct _cnid_db *));
 /* construct db_cnid data. NOTE: this is not re-entrant.  */
 static __inline__ char *make_tdb_data(const struct stat *st,
                                        const cnid_t did,
-                                       const char *name, const int len)
+                                       const char *name, const size_t len)
 {
     static char start[TDB_HEADER_LEN + MAXPATHLEN + 1];
     char *buf = start;
diff --git a/libatalk/cnid/tdb/cnid_tdb_add.c b/libatalk/cnid/tdb/cnid_tdb_add.c
index d54a88de..fe5d3628 100644
--- a/libatalk/cnid/tdb/cnid_tdb_add.c
+++ b/libatalk/cnid/tdb/cnid_tdb_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_add.c,v 1.2 2005-04-28 20:50:02 bfernhomberg Exp $
+ * $Id: cnid_tdb_add.c,v 1.3 2005-05-03 14:55:15 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -103,7 +103,7 @@ cleanup:
 
 /* ------------------------ */
 cnid_t cnid_tdb_add(struct _cnid_db *cdb, const struct stat *st,
-                     const cnid_t did, char *name, const int len, cnid_t hint)
+                     const cnid_t did, char *name, const size_t len, cnid_t hint)
 {
     const struct stat *lstp;
     cnid_t id;
diff --git a/libatalk/cnid/tdb/cnid_tdb_get.c b/libatalk/cnid/tdb/cnid_tdb_get.c
index 4dce62de..7e31151d 100644
--- a/libatalk/cnid/tdb/cnid_tdb_get.c
+++ b/libatalk/cnid/tdb/cnid_tdb_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_get.c,v 1.2 2005-04-28 20:50:02 bfernhomberg Exp $
+ * $Id: cnid_tdb_get.c,v 1.3 2005-05-03 14:55:15 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 #include "cnid_tdb.h"
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_tdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len)
+cnid_t cnid_tdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len)
 {
     char start[TDB_DID_LEN + MAXPATHLEN + 1], *buf;
     struct _cnid_tdb_private *db;
diff --git a/libatalk/cnid/tdb/cnid_tdb_lookup.c b/libatalk/cnid/tdb/cnid_tdb_lookup.c
index 6072ce37..e110d6d2 100644
--- a/libatalk/cnid/tdb/cnid_tdb_lookup.c
+++ b/libatalk/cnid/tdb/cnid_tdb_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_lookup.c,v 1.2 2005-04-28 20:50:02 bfernhomberg Exp $
+ * $Id: cnid_tdb_lookup.c,v 1.3 2005-05-03 14:55:15 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 #include "cnid_tdb.h"
 #include <atalk/logger.h>
 
-cnid_t cnid_tdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
+cnid_t cnid_tdb_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const size_t len)
 {
     char *buf;
     struct _cnid_tdb_private *db;
diff --git a/libatalk/cnid/tdb/cnid_tdb_update.c b/libatalk/cnid/tdb/cnid_tdb_update.c
index b3abc14e..19a3d222 100644
--- a/libatalk/cnid/tdb/cnid_tdb_update.c
+++ b/libatalk/cnid/tdb/cnid_tdb_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_tdb_update.c,v 1.2 2005-04-28 20:50:02 bfernhomberg Exp $
+ * $Id: cnid_tdb_update.c,v 1.3 2005-05-03 14:55:15 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -12,7 +12,7 @@
 #include <atalk/logger.h>
 
 int cnid_tdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                     const cnid_t did, char *name, const int len
+                     const cnid_t did, char *name, const size_t len
                      /*, const char *info, const int infolen */ )
 {
     struct _cnid_tdb_private *db;
diff --git a/libatalk/dsi/dsi_init.c b/libatalk/dsi/dsi_init.c
index 4d0e3026..309a28c5 100644
--- a/libatalk/dsi/dsi_init.c
+++ b/libatalk/dsi/dsi_init.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_init.c,v 1.4 2005-04-28 20:50:02 bfernhomberg Exp $
+ * $Id: dsi_init.c,v 1.5 2005-05-03 14:55:15 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -55,7 +55,7 @@ DSI *dsi_init(const dsi_proto protocol, const char *program,
     return dsi;
 }
 
-void dsi_setstatus(DSI *dsi, u_int8_t *status, const int slen)
+void dsi_setstatus(DSI *dsi, char *status, const size_t slen)
 {
     dsi->status = status;
     dsi->statuslen = slen;
-- 
2.39.2