From: didg <didg>
Date: Sun, 30 Jan 2005 20:56:19 +0000 (+0000)
Subject: Olaf Hering at suse.de warning fixes.
X-Git-Tag: netatalk-2-0-3~34
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=7a0c17326b4d94bf331d935bddd8a8bdac7792c4;p=netatalk.git

Olaf Hering at suse.de warning fixes.
---

diff --git a/contrib/timelord/timelord.c b/contrib/timelord/timelord.c
index bbdff1c0..7a57cec8 100644
--- a/contrib/timelord/timelord.c
+++ b/contrib/timelord/timelord.c
@@ -1,5 +1,5 @@
 /*
- * $Id: timelord.c,v 1.7 2002-01-04 04:45:47 sibaz Exp $
+ * $Id: timelord.c,v 1.7.12.1 2005-01-30 20:56:19 didg Exp $
  *
  * Copyright (c) 1990,1992 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -25,6 +25,7 @@
 #include <sys/time.h>
 #include <sys/file.h>
 #include <sys/uio.h>
+#include <stdlib.h>
 
 #include <unistd.h>
 
diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 80a5d892..be4b74fc 100644
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.92.2.2.2.31.2.6 2004-12-09 16:10:54 didg Exp $
+ * $Id: file.c,v 1.92.2.2.2.31.2.7 2005-01-30 20:56:20 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -171,7 +171,7 @@ char *set_name(const struct vol *vol, char *data, cnid_t pid, char *name, cnid_t
 
 /* -------------------------- */
 u_int32_t get_id(struct vol *vol, struct adouble *adp,  const struct stat *st,
-             const cnid_t did, const char *upath, const int len) 
+             const cnid_t did, char *upath, const int len) 
 {
 u_int32_t aint = 0;
 
diff --git a/etc/afpd/file.h b/etc/afpd/file.h
index 157e7163..68df03e1 100644
--- a/etc/afpd/file.h
+++ b/etc/afpd/file.h
@@ -1,5 +1,5 @@
 /*
- * $Id: file.h,v 1.16.2.2.2.3.2.2 2004-12-07 03:23:49 didg Exp $
+ * $Id: file.h,v 1.16.2.2.2.3.2.3 2005-01-30 20:56:21 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -139,7 +139,7 @@ extern size_t mtoUTF8   __P((const struct vol *, const char *, size_t , char *,
 extern int  copy_path_name __P((const struct vol *, char *, char *i));
 
 extern u_int32_t get_id  __P((struct vol *, struct adouble *, const struct stat *,
-                                const cnid_t , const char *, const int ));
+                                const cnid_t , char *, const int ));
 
 /* FP functions */
 extern int      afp_exchangefiles __P((AFPObj *, char *, int, char *, int *));
diff --git a/etc/uams/uams_pgp.c b/etc/uams/uams_pgp.c
index cefd01bf..54f49d65 100644
--- a/etc/uams/uams_pgp.c
+++ b/etc/uams/uams_pgp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: uams_pgp.c,v 1.9.6.2 2003-10-30 00:21:47 bfernhomberg Exp $
+ * $Id: uams_pgp.c,v 1.9.6.2.2.1 2005-01-30 20:56:21 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
@@ -60,8 +60,6 @@ static int pgp_login(void *obj, struct passwd **uam_pwd,
 		     char *ibuf, int ibuflen,
 		     char *rbuf, int *rbuflen)
 {
-    BIGNUM *bn, *gbn, *pbn;
-    u_int16_t sessid;
     int len, i;
     char *name;
 
diff --git a/include/atalk/cnid.h b/include/atalk/cnid.h
index 3224875e..6943760b 100644
--- a/include/atalk/cnid.h
+++ b/include/atalk/cnid.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: cnid.h,v 1.9.6.6 2004-02-22 18:36:37 didg Exp $
+ * $Id: cnid.h,v 1.9.6.6.2.1 2005-01-30 20:56:21 didg Exp $
  *
  * Copyright (c) 2003 the Netatalk Team
  * Copyright (c) 2003 Rafal Lewczuk <rlewczuk@pronet.pl>
@@ -51,16 +51,16 @@ 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, 
-			const char *name, const int len, cnid_t hint);
+			char *name, const int 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, const char *name,
+	cnid_t (*cnid_get)(struct _cnid_db *cdb, const cnid_t did, char *name,
 			const int len);
 	cnid_t (*cnid_lookup)(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			const char *name, const int len);
+			char *name, const int len);
 	cnid_t (*cnid_nextid)(struct _cnid_db *cdb);
 	char *(*cnid_resolve)(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len);
 	int (*cnid_update)(struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, const char *name, const int len);	
+			const cnid_t did, char *name, const int len);	
 	void (*cnid_close)(struct _cnid_db *cdb);
 	int  (*cnid_getstamp)(struct _cnid_db *cdb, void *buffer, const int len);
 };
@@ -88,21 +88,21 @@ 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, 
-			const char *name, const int len, cnid_t hint);
+			char *name, const int 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, const char *name,const int len);
+cnid_t cnid_get   (struct _cnid_db *cdb, const cnid_t did, char *name,const int len);
 
 int    cnid_getstamp(struct _cnid_db *cdb, void *buffer, const int len);
 
 cnid_t cnid_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			const char *name, const int len);
+			char *name, const int len);
 
 char *cnid_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, u_int32_t len);
 
 int cnid_update   (struct _cnid_db *cdb, const cnid_t id, const struct stat *st, 
-			const cnid_t did, const char *name, const int len);	
+			const cnid_t did, char *name, const int len);	
 
 /* This function closes a CNID database and frees all resources assigned to it. */ 
 void cnid_close(struct _cnid_db *db);
@@ -111,7 +111,11 @@ void cnid_close(struct _cnid_db *db);
 
 /*
  * $Log: cnid.h,v $
- * Revision 1.9.6.6  2004-02-22 18:36:37  didg
+ * Revision 1.9.6.6.2.1  2005-01-30 20:56:21  didg
+ *
+ * Olaf Hering at suse.de warning fixes.
+ *
+ * Revision 1.9.6.6  2004/02/22 18:36:37  didg
  *
  * small clean up
  *
diff --git a/libatalk/cnid/cdb/cnid_cdb.h b/libatalk/cnid/cdb/cnid_cdb.h
index 47d7ea04..624003b3 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,
-			    const char *, const int, cnid_t));
+			    char *, const int, cnid_t));
 extern int cnid_cdb_getstamp __P((struct _cnid_db *, void *, const int ));
 
 /* cnid_get.c */
-extern cnid_t cnid_cdb_get __P((struct _cnid_db *, const cnid_t, const char *, const int)); 
+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_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       const char *, const int));
+			       char *, const int));
 
 /* cnid_update.c */
 extern int cnid_cdb_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, const char *, int));
+			    const cnid_t, char *, int));
 
 /* cnid_delete.c */
 extern int cnid_cdb_delete __P((struct _cnid_db *, const cnid_t));
diff --git a/libatalk/cnid/cdb/cnid_cdb_add.c b/libatalk/cnid/cdb/cnid_cdb_add.c
index 29a7ef17..d9bad55b 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.1.4.6 2004-06-30 01:27:15 didg Exp $
+ * $Id: cnid_cdb_add.c,v 1.1.4.6.2.1 2005-01-30 20:56:22 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -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, const char *name, const int len);
+                const cnid_t did, char *name, const int 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, const char *name, const int len,
+                const cnid_t did, char *name, const int len,
                 cnid_t hint)
 {
     CNID_private *db;
diff --git a/libatalk/cnid/cdb/cnid_cdb_get.c b/libatalk/cnid/cdb/cnid_cdb_get.c
index e73a1694..1b41dc27 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.1.4.2 2003-10-21 16:23:54 didg Exp $
+ * $Id: cnid_cdb_get.c,v 1.1.4.2.2.1 2005-01-30 20:56:22 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -10,7 +10,7 @@
 #include "cnid_cdb_private.h"
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_cdb_get(struct _cnid_db *cdb, const cnid_t did, const char *name,
+cnid_t cnid_cdb_get(struct _cnid_db *cdb, const cnid_t did, char *name,
                 const int len)
 {
     char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
diff --git a/libatalk/cnid/cdb/cnid_cdb_lookup.c b/libatalk/cnid/cdb/cnid_cdb_lookup.c
index 4009925a..a2377655 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.1.4.5 2004-02-07 19:46:09 didg Exp $
+ * $Id: cnid_cdb_lookup.c,v 1.1.4.5.2.1 2005-01-30 20:56:22 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,7 +15,7 @@
 /* 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,
-                   const char *name, const int len)
+                   char *name, const int len)
 {
     char *buf;
     CNID_private *db;
diff --git a/libatalk/cnid/cdb/cnid_cdb_update.c b/libatalk/cnid/cdb/cnid_cdb_update.c
index b0f5c12a..e162edaf 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.1.4.4 2003-10-21 16:23:54 didg Exp $
+ * $Id: cnid_cdb_update.c,v 1.1.4.4.2.1 2005-01-30 20:56:22 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -15,7 +15,7 @@
  * 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, const char *name, const int len
+                const cnid_t did, char *name, const int len
                 /*, const char *info, const int infolen*/)
 {
     char *buf;
diff --git a/libatalk/cnid/cnid.c b/libatalk/cnid/cnid.c
index b9579471..dc6bef78 100644
--- a/libatalk/cnid/cnid.c
+++ b/libatalk/cnid/cnid.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: cnid.c,v 1.1.4.11 2004-06-30 01:27:14 didg Exp $
+ * $Id: cnid.c,v 1.1.4.11.2.1 2005-01-30 20:56:22 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, 
-			const char *name, const int len, cnid_t hint)
+			char *name, const int 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, const char *name,const int len)
+cnid_t cnid_get(struct _cnid_db *cdb, const cnid_t did, char *name,const int len)
 {
 cnid_t ret;
 
@@ -252,7 +252,7 @@ time_t t;
 
 /* --------------- */
 cnid_t cnid_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did,
-			const char *name, const int len)
+			char *name, const int len)
 {
 cnid_t 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, const char *name, const int len)
+			const cnid_t did, char *name, const int len)
 {
 int ret;
 
diff --git a/libatalk/cnid/db3/cnid_db3.h b/libatalk/cnid/db3/cnid_db3.h
index 4e3b37df..dec9597e 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,
-			    const char *, const int, cnid_t));
+			    char *, const int, cnid_t));
 
 /* cnid_get.c */
-extern cnid_t cnid_db3_get __P((struct _cnid_db *, const cnid_t, const char *, const int)); 
+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_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       const char *, const int));
+			       char *, const int));
 
 /* cnid_update.c */
 extern int cnid_db3_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, const char *, int));
+			    const cnid_t, char *, int));
 
 /* 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 340c81bd..adf30f39 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.1.4.2 2003-10-21 16:23:54 didg Exp $
+ * $Id: cnid_db3_add.c,v 1.1.4.2.2.1 2005-01-30 20:56:22 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -203,7 +203,7 @@ cleanup_abort:
 
 /* ------------------------ */
 cnid_t cnid_db3_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 int 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 14e574d3..0efdfd00 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.1.4.2 2003-10-21 16:23:54 didg Exp $
+ * $Id: cnid_db3_get.c,v 1.1.4.2.2.1 2005-01-30 20:56:22 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +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, const char *name,
+cnid_t cnid_db3_get(struct _cnid_db *cdb, const cnid_t did, char *name,
                 const int len)
 {
     char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
diff --git a/libatalk/cnid/db3/cnid_db3_lookup.c b/libatalk/cnid/db3/cnid_db3_lookup.c
index 3d77d123..0d484f88 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.1.4.2 2003-10-21 16:23:54 didg Exp $
+ * $Id: cnid_db3_lookup.c,v 1.1.4.2.2.1 2005-01-30 20:56:22 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,7 +32,7 @@
 
 /* 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, const 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 int len)
 {
     char *buf;
     CNID_private *db;
diff --git a/libatalk/cnid/db3/cnid_db3_update.c b/libatalk/cnid/db3/cnid_db3_update.c
index 1a2251e3..1dd0eda7 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.1.4.2 2003-10-21 16:23:54 didg Exp $
+ * $Id: cnid_db3_update.c,v 1.1.4.2.2.1 2005-01-30 20:56:22 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, const char *name, const int len
+                const cnid_t did, char *name, const int 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 9ece0896..e89af69a 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.1.4.18 2004-04-24 18:13:27 didg Exp $
+ * $Id: cnid_dbd.c,v 1.1.4.18.2.1 2005-01-30 20:56:22 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -446,7 +446,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, const char *name, const int len,
+                const cnid_t did, char *name, const int len,
                 cnid_t hint)
 {
     CNID_private *db;
@@ -504,7 +504,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, const char *name,
+cnid_t cnid_dbd_get(struct _cnid_db *cdb, const cnid_t did, char *name,
                 const int len)
 {
     CNID_private *db;
@@ -650,7 +650,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,
-                   const char *name, const int len)
+                   char *name, const int len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
@@ -707,7 +707,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, const char *name, const int len)
+                const cnid_t did, char *name, const int len)
 {
     CNID_private *db;
     struct cnid_dbd_rqst rqst;
diff --git a/libatalk/cnid/dbd/cnid_dbd.h b/libatalk/cnid/dbd/cnid_dbd.h
index 2e77ef7b..489519f9 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.1.4.3 2004-01-09 21:05:50 lenneis Exp $
+ * $Id: cnid_dbd.h,v 1.1.4.3.2.1 2005-01-30 20:56:23 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -21,14 +21,14 @@ 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,
-			    const char *, const int, cnid_t));
-extern cnid_t cnid_dbd_get __P((struct _cnid_db *, const cnid_t, const char *, const int)); 
+			    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 )); 
 extern cnid_t cnid_dbd_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t,
-			       const char *, const int));
+			       char *, const int));
 extern int cnid_dbd_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-			    const cnid_t, const char *, int));
+			    const cnid_t, char *, int));
 extern int cnid_dbd_delete __P((struct _cnid_db *, const cnid_t));
 
 #endif /* include/atalk/cnid_dbd.h */
diff --git a/libatalk/cnid/hash/cnid_hash.h b/libatalk/cnid/hash/cnid_hash.h
index c67ecd35..f27ef1c2 100644
--- a/libatalk/cnid/hash/cnid_hash.h
+++ b/libatalk/cnid/hash/cnid_hash.h
@@ -47,16 +47,16 @@ extern void cnid_hash_close __P((struct _cnid_db *));
 
 /* cnid_add.c */
 extern cnid_t cnid_hash_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-                                 const char *, const int, cnid_t));
+                                 char *, const int, cnid_t));
 
 /* cnid_get.c */
-extern cnid_t cnid_hash_get __P((struct _cnid_db *, const cnid_t, const char *, const int));
+extern cnid_t cnid_hash_get __P((struct _cnid_db *, const cnid_t, char *, const int));
 extern char *cnid_hash_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t));
-extern cnid_t cnid_hash_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, const char *, const int));
+extern cnid_t cnid_hash_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
 
 /* cnid_update.c */
 extern int cnid_hash_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, const char *, int));
+                                 const cnid_t, char *, int));
 
 /* cnid_delete.c */
 extern int cnid_hash_delete __P((struct _cnid_db *, const cnid_t));
diff --git a/libatalk/cnid/hash/cnid_hash_add.c b/libatalk/cnid/hash/cnid_hash_add.c
index 304b599b..f6dd6c35 100644
--- a/libatalk/cnid/hash/cnid_hash_add.c
+++ b/libatalk/cnid/hash/cnid_hash_add.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_hash_add.c,v 1.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_hash_add.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -22,7 +22,7 @@
 
 /* ------------------------ */
 cnid_t cnid_hash_add(struct _cnid_db *cdb, const struct stat *st,
-                     const cnid_t did, const char *name, const int len, cnid_t hint)
+                     const cnid_t did, char *name, const int len, cnid_t hint)
 {
     struct stat lst;
     const struct stat *lstp;
diff --git a/libatalk/cnid/hash/cnid_hash_get.c b/libatalk/cnid/hash/cnid_hash_get.c
index 8117bcbf..e8378e88 100644
--- a/libatalk/cnid/hash/cnid_hash_get.c
+++ b/libatalk/cnid/hash/cnid_hash_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_hash_get.c,v 1.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_hash_get.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 #include "cnid_hash.h"
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_hash_get(struct _cnid_db *cdb, const cnid_t did, const char *name, const int len)
+cnid_t cnid_hash_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len)
 {
     return CNID_INVALID;
 }
diff --git a/libatalk/cnid/hash/cnid_hash_lookup.c b/libatalk/cnid/hash/cnid_hash_lookup.c
index 20ce8dbd..8b03dd83 100644
--- a/libatalk/cnid/hash/cnid_hash_lookup.c
+++ b/libatalk/cnid/hash/cnid_hash_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_hash_lookup.c,v 1.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_hash_lookup.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -10,7 +10,7 @@
 
 #include "cnid_hash.h"
 
-cnid_t cnid_hash_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, const char *name, const int len)
+cnid_t cnid_hash_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
 {
     return cnid_hash_add(cdb, st, did, name, len, 0  /*hint*/);
 }
diff --git a/libatalk/cnid/hash/cnid_hash_update.c b/libatalk/cnid/hash/cnid_hash_update.c
index a2dddd1a..d2487def 100644
--- a/libatalk/cnid/hash/cnid_hash_update.c
+++ b/libatalk/cnid/hash/cnid_hash_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_hash_update.c,v 1.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_hash_update.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -11,7 +11,7 @@
 #include "cnid_hash.h"
 
 int cnid_hash_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                     const cnid_t did, const char *name, const int len
+                     const cnid_t did, char *name, const int len
                      /*, const char *info, const int infolen */ )
 {
     return 0;
diff --git a/libatalk/cnid/last/cnid_last.c b/libatalk/cnid/last/cnid_last.c
index 39f79468..e0848701 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.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_last.c,v 1.1.4.1.2.1 2005-01-30 20:56:23 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, const char *name, const int len, cnid_t hint)
+                     const cnid_t did, char *name, const int len, cnid_t hint)
 {
 
     /* FIXME: it relies on fact, that this is never called twice for the same file/dir. */
@@ -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, const char *name, const int len)
+cnid_t cnid_last_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len)
 {
     /* 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,7 @@ cnid_t cnid_last_get(struct _cnid_db *cdb, const cnid_t did, const char *name, c
 
 
 /* */
-cnid_t cnid_last_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, const char *name, const int len)
+cnid_t cnid_last_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
 {
     /* FIXME: this function doesn't work in [last] scheme ! */
     /* Should be never called or CNID should be somewhat refactored again. */
@@ -174,7 +174,7 @@ char *cnid_last_resolve(struct _cnid_db *cdb, cnid_t * id, void *buffer, u_int32
 
 
 int cnid_last_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                     const cnid_t did, const char *name, const int len
+                     const cnid_t did, char *name, const int len
                      /*, const char *info, const int infolen */ )
 {
     return 0;
diff --git a/libatalk/cnid/last/cnid_last.h b/libatalk/cnid/last/cnid_last.h
index 499b1813..2a32527d 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,
-                                 const char *, const int, cnid_t));
-extern cnid_t cnid_last_get __P((struct _cnid_db *, const cnid_t, const char *, const int));
+                                 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, const char *, const int));
+extern cnid_t cnid_last_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
 extern int cnid_last_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, const char *, int));
+                                 const cnid_t, char *, int));
 extern int cnid_last_delete __P((struct _cnid_db *, const cnid_t));
 
 #endif /* include/atalk/cnid_last.h */
diff --git a/libatalk/cnid/mtab/cnid_mtab.c b/libatalk/cnid/mtab/cnid_mtab.c
index 517a9339..916cee1d 100644
--- a/libatalk/cnid/mtab/cnid_mtab.c
+++ b/libatalk/cnid/mtab/cnid_mtab.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_mtab.c,v 1.1.4.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_mtab.c,v 1.1.4.1.2.1 2005-01-30 20:56:23 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -31,7 +31,7 @@
 
 /* ------------------------ */
 cnid_t cnid_mtab_add(struct _cnid_db *cdb, const struct stat *st,
-                     const cnid_t did, const char *name, const int len, cnid_t hint)
+                     const cnid_t did, char *name, const int len, cnid_t hint)
 {
     struct stat lst;
     const struct stat *lstp;
@@ -59,13 +59,13 @@ int cnid_mtab_delete(struct _cnid_db *cdb, const cnid_t id)
 
 
 /* Return CNID for a given did/name. */
-cnid_t cnid_mtab_get(struct _cnid_db *cdb, const cnid_t did, const char *name, const int len)
+cnid_t cnid_mtab_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len)
 {
     return CNID_INVALID;
 }
 
 
-cnid_t cnid_mtab_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, const char *name, const int len)
+cnid_t cnid_mtab_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len)
 {
     return CNID_INVALID;
 }
@@ -128,7 +128,7 @@ char *cnid_mtab_resolve(struct _cnid_db *cdb, cnid_t * id, void *buffer, u_int32
 
 
 int cnid_mtab_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                     const cnid_t did, const char *name, const int len
+                     const cnid_t did, char *name, const int len
                      /*, const char *info, const int infolen */ )
 {
     return 0;
diff --git a/libatalk/cnid/mtab/cnid_mtab.h b/libatalk/cnid/mtab/cnid_mtab.h
index c2027dae..27d2a7b3 100644
--- a/libatalk/cnid/mtab/cnid_mtab.h
+++ b/libatalk/cnid/mtab/cnid_mtab.h
@@ -20,12 +20,12 @@ extern struct _cnid_module cnid_mtab_module;
 extern struct _cnid_db *cnid_mtab_open __P((const char *, mode_t));
 extern void cnid_mtab_close __P((struct _cnid_db *));
 extern cnid_t cnid_mtab_add __P((struct _cnid_db *, const struct stat *, const cnid_t,
-                                 const char *, const int, cnid_t));
-extern cnid_t cnid_mtab_get __P((struct _cnid_db *, const cnid_t, const char *, const int));
+                                 char *, const int, cnid_t));
+extern cnid_t cnid_mtab_get __P((struct _cnid_db *, const cnid_t, char *, const int));
 extern char *cnid_mtab_resolve __P((struct _cnid_db *, cnid_t *, void *, u_int32_t));
-extern cnid_t cnid_mtab_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, const char *, const int));
+extern cnid_t cnid_mtab_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
 extern int cnid_mtab_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, const char *, int));
+                                 const cnid_t, char *, int));
 extern int cnid_mtab_delete __P((struct _cnid_db *, const cnid_t));
 
 #endif /* include/atalk/cnid_mtab.h */
diff --git a/libatalk/cnid/tdb/cnid_tdb.h b/libatalk/cnid/tdb/cnid_tdb.h
index 14bfc2d9..fb12dc07 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,
-                                 const char *, const int, cnid_t));
+                                 char *, const int, cnid_t));
 
 /* cnid_get.c */
-extern cnid_t cnid_tdb_get __P((struct _cnid_db *, const cnid_t, const char *, const int));
+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, const char *, const int));
+extern cnid_t cnid_tdb_lookup __P((struct _cnid_db *, const struct stat *, const cnid_t, char *, const int));
 
 /* cnid_update.c */
 extern int cnid_tdb_update __P((struct _cnid_db *, const cnid_t, const struct stat *,
-                                 const cnid_t, const char *, int));
+                                 const cnid_t, char *, int));
 
 /* cnid_delete.c */
 extern int cnid_tdb_delete __P((struct _cnid_db *, const cnid_t));
diff --git a/libatalk/cnid/tdb/cnid_tdb_add.c b/libatalk/cnid/tdb/cnid_tdb_add.c
index 407424df..223fbc17 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.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_tdb_add.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 didg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -104,7 +104,7 @@ cleanup:
 
 /* ------------------------ */
 cnid_t cnid_tdb_add(struct _cnid_db *cdb, const struct stat *st,
-                     const cnid_t did, const char *name, const int len, cnid_t hint)
+                     const cnid_t did, char *name, const int 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 0e6a7ada..1d17f9a2 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.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_tdb_get.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 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, const char *name, const int len)
+cnid_t cnid_tdb_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int 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 92681386..48e4bb7a 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.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_tdb_lookup.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 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, const 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 int 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 a4e1d07c..12fc4ad3 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.1.2.1 2003-09-09 16:42:21 didg Exp $
+ * $Id: cnid_tdb_update.c,v 1.1.2.1.2.1 2005-01-30 20:56:23 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, const char *name, const int len
+                     const cnid_t did, char *name, const int len
                      /*, const char *info, const int infolen */ )
 {
     struct _cnid_tdb_private *db;
diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c
index 0822d43f..8f1a764f 100644
--- a/libatalk/util/logger.c
+++ b/libatalk/util/logger.c
@@ -83,6 +83,8 @@ void set_processname(char *processname);
 /* Log a Message */
 void make_log(enum loglevels loglevel, enum logtypes logtype, 
 	      char *message, ...);
+int get_syslog_equivalent(enum loglevels loglevel);
+
 #ifndef DISABLE_LOGGER
 make_log_func set_log_location(char *srcfilename, int srclinenumber);
 
@@ -132,8 +134,6 @@ void generate_message_details(char *message_details_buffer,
                               struct tag_log_file_data *log_struct,
                               enum loglevels loglevel, enum logtypes logtype);
 
-int get_syslog_equivalent(enum loglevels loglevel);
-
 static char *get_command_name(char *commandpath);
 
 /* =========================================================================