remove compiler warnings

[netatalk.git] / etc / afpd / fork.h

diff --git a/etc/afpd/fork.h b/etc/afpd/fork.h
index 785071987310be644cf58668c327c25ad7f23ef8..4263a7c71122f8358419ab6d47ab2eb3cbc23993 100644 (file)
--- a/etc/afpd/fork.h
+++ b/etc/afpd/fork.h
@@ -1,5 +1,5 @@
 /*
- * $Id: fork.h,v 1.9 2005-04-28 20:49:43 bfernhomberg Exp $
+ * $Id: fork.h,v 1.11 2008-12-03 18:35:44 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -22,16 +22,14 @@ struct file_key {
 };
 
 struct ofork {
+    struct file_key     key;
     struct adouble     *of_ad;
     struct vol          *of_vol;
     struct dir         *of_dir;
-    char               *of_name;
-    int                 of_namelen;
 
     u_int16_t           of_refnum;
     int                 of_flags;
 
-    struct file_key     key;
     struct ofork        **prevp, *next;
     struct ofork        *of_d_prev, *of_d_next;
 };
@@ -53,6 +51,7 @@ struct ofork {
 #define AFPFORK_ACCWR   (1<<5)
 #define AFPFORK_ACCMASK (AFPFORK_ACCRD | AFPFORK_ACCWR)
 
+#define of_name(a) (a)->of_ad->ad_m_name
 /* in ofork.c */
 extern struct ofork *of_alloc    __P((struct vol *, struct dir *,
                                                       char *, u_int16_t *, const int,