Warning fixes.

diff --git a/etc/afpd/desktop.c b/etc/afpd/desktop.c
index c6a3e9173b078adf126ecdfb53d82426fdd5a63e..2cd1ae896d8934bbafc9dee44721393e907b9af6 100644 (file)
--- a/etc/afpd/desktop.c
+++ b/etc/afpd/desktop.c
@@ -1,5 +1,5 @@
 /*
- * $Id: desktop.c,v 1.29 2003-06-05 09:17:10 didg Exp $
+ * $Id: desktop.c,v 1.30 2003-06-09 14:42:38 srittau Exp $
  *
  * See COPYRIGHT.
  *
@@ -619,7 +619,9 @@ char *dtfile(const struct vol *vol, u_char creator[], char *ext )
 */
 static char  upath[ MAXPATHLEN + 1];
 static char  mpath[ MAXPATHLEN + 1];
+#ifdef AFP3x
 static char  ucs2[ MAXPATHLEN + 1];
+#endif
 
 static char *old_mtoupath(const struct vol *vol, char *mpath)
 {
@@ -750,6 +752,7 @@ static char *old_utompath(const struct vol *vol, char *upath)
 }
 
 /* --------------- */
+#ifdef AFP3x
 extern unsigned int do_precomposition(unsigned int base, unsigned int comb);
 
 static char comp[MAXPATHLEN +1];
@@ -837,14 +840,18 @@ unsigned int result;
      }
      return comp;
 }
+#endif
 
 /* --------------------------- */
 char *mtoupath(const struct vol *vol, char *mpath, int utf8)
 {
-    char       *m, *u, *r;
-    int                 i = 0;
+    int                i = 0;
+    char       *m, *u;
+#ifdef AFP3x
+    char       *r;
     size_t       inplen;
     size_t       outlen;
+#endif
         
     if ( *mpath == '\0' ) {
         return( "." );
@@ -920,11 +927,14 @@ char *mtoupath(const struct vol *vol, char *mpath, int utf8)
 /* --------------- */
 char *utompath(const struct vol *vol, char *upath, int utf8)
 {
-    char        *m, *u, *r;
     int          h;
     int          mangleflag = 0;
+    char       *m, *u;
+#ifdef AFP3x
+    char       *r;
     size_t       inplen;
     size_t       outlen;
+#endif
 
     if (!vol_utf8(vol))
        return old_utompath(vol, upath);

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 0cdeed19efbfc6b06ab33839b9b1f983d0eff3fb..58f32d6ac002813b1e38b383ee562e51e4ad7d16 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.94 2003-06-05 09:17:11 didg Exp $
+ * $Id: file.c,v 1.95 2003-06-09 14:42:39 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -264,6 +264,7 @@ int getmetadata(struct vol *vol,
     u_int32_t           utf8 = 0;
     struct stat         *st;
     struct maccess     ma;
+
 #ifdef DEBUG
     LOG(log_info, logtype_afpd, "begin getmetadata:");
 #endif /* DEBUG */

diff --git a/etc/afpd/status.c b/etc/afpd/status.c
index 8ad2240b39630fa8ad7a2d6576f86001f27154fd..d831c91ecef6c6974f0d383cd9b7bad3b903e700 100644 (file)
--- a/etc/afpd/status.c
+++ b/etc/afpd/status.c
@@ -1,5 +1,5 @@
 /*
- * $Id: status.c,v 1.14 2003-06-09 14:25:51 srittau Exp $
+ * $Id: status.c,v 1.15 2003-06-09 14:42:40 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -131,7 +131,7 @@ static u_int16_t status_signature(char *data, int *servoffset, DSI *dsi,
                                   const struct afp_options *options)
 {
     char                 *status;
-    char                *usersign, *ifaddr;
+    char                *usersign;
     int                  i;
     u_int16_t            offset, sigoff;
     long                 hostid;
@@ -342,9 +342,9 @@ static int status_utf8servername(char *data, int *nameoffset,
                                 const DSI *dsi,
                                 const struct afp_options *options)
 {
-    u_int16_t namelen, len;
     char *begin = data;
     u_int16_t offset;
+
     memcpy(&offset, data + *nameoffset, sizeof(offset));
     offset = ntohs(offset);
     data += offset;