Warning fixes.

diff --git a/etc/afpd/file.c b/etc/afpd/file.c
index 39b61c1a92c081e789105271aecde74922f7aecc..86c4c6dc7d3f0c94165ff5677c53ea04b4c6c54a 100644 (file)
--- a/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@ -1,5 +1,5 @@
 /*
- * $Id: file.c,v 1.47 2002-08-16 00:42:56 didg Exp $
+ * $Id: file.c,v 1.48 2002-08-20 19:40:43 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -808,7 +808,6 @@ char        *src, *dst, *newname;
 const int         noadouble;
 struct adouble    *adp;
 {
-    struct ofork       *opened;
     char               adsrc[ MAXPATHLEN + 1];
     int                        len, rc;
 
@@ -1823,7 +1822,9 @@ int               ibuflen, *rbuflen;
 
     /* all this stuff is so that we can unwind a failed operation
      * properly. */
+#ifdef CNID_DB
 err_temp_to_dest:
+#endif
     /* rename dest to temp */
     renamefile(upath, temp, temp, vol_noadouble(vol), adsp);
     of_rename(vol, curdir, upath, curdir, temp);

diff --git a/etc/afpd/fork.c b/etc/afpd/fork.c
index 058b2dc924a8c90eea11d7dfcacaea2186cab164..a340157584d838d554279d9627a186564453b3d1 100644 (file)
--- a/etc/afpd/fork.c
+++ b/etc/afpd/fork.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fork.c,v 1.30 2002-06-17 18:23:03 didg Exp $
+ * $Id: fork.c,v 1.31 2002-08-20 19:40:45 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -66,15 +66,12 @@ const u_int16_t     attrbits;
     struct stat                lst, *lstp;
 #endif /* !USE_LASTDID */
     struct stat                st;
-    struct extmap      *em;
-    char                   *data, *nameoff = NULL, *upath;
-    int                            bit = 0;
-    u_int32_t       aint;
-    u_int16_t          ashort;
+    char               *upath;
+    u_int32_t          aint;
 
     struct adouble     *adp;
-    struct dir      *dir;
-    struct vol      *vol;
+    struct dir         *dir;
+    struct vol         *vol;
     
     if ( ad_hfileno( ofork->of_ad ) == -1 ) {
         adp = NULL;

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 3119f90b296a3d5fa5ac23eb4cc76b8abef79f13..20b03f473faf29f4d47ba0fba02324df3093430e 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.29 2002-08-20 05:36:08 jmarcus Exp $
+ * $Id: volume.c,v 1.30 2002-08-20 19:40:44 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -1402,7 +1402,7 @@ int               ibuflen, *rbuflen;
 }
 
 
-int wincheck(struct vol *vol, const char *path)
+int wincheck(const struct vol *vol, const char *path)
 {
     int len;
 

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index f63aa42d31bf954f36031824578ff69fc93e593f..f63cbd458cc6e15e16af736559db3cecc5f872d0 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.h,v 1.11 2002-03-24 17:45:29 jmarcus Exp $
+ * $Id: volume.h,v 1.12 2002-08-20 19:40:45 srittau Exp $
  *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -106,7 +106,7 @@ this is going away. */
 #define MSWINDOWS_BADCHARS ":\t\\/<>*?|\""
 #define MSWINDOWS_CODEPAGE "maccode.iso8859-1"
 
-int wincheck(struct vol *vol, const char *path);
+int wincheck(const struct vol *vol, const char *path);
 
 #define AFPVOLSIG_FLAT          0x0001 /* flat fs */
 #define AFPVOLSIG_FIX          0x0002 /* fixed ids */