Don't implement ad_hf_mode in header file, but always use the function in

ad_open.c.

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index d8904ba4e24b274d0e5e129c1e7c946ed41e2d7c..62eafdf6f69e71a70b079f6263d343847c239b7d 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -1,5 +1,5 @@
 /*
- * $Id: adouble.h,v 1.22 2003-06-06 20:43:14 srittau Exp $
+ * $Id: adouble.h,v 1.23 2003-06-06 20:46:39 srittau Exp $
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -356,30 +356,7 @@ extern int ad_refresh __P((struct adouble *));
 
 /* extend header to RW if R or W (W if R for locking),
  */ 
-#ifndef ATACC
-static __inline__ mode_t ad_hf_mode (mode_t mode)
-{
-    /* fnctl lock need write access */
-    if ((mode & S_IRUSR))
-        mode |= S_IWUSR;
-    if ((mode & S_IRGRP))
-        mode |= S_IWGRP;
-    if ((mode & S_IROTH))
-        mode |= S_IWOTH;
-
-    /* if write mode set add read mode */
-    if ((mode & S_IWUSR))
-        mode |= S_IRUSR;
-    if ((mode & S_IWGRP))
-        mode |= S_IRGRP;
-    if ((mode & S_IWOTH))
-        mode |= S_IROTH;
-
-    return mode;
-}
-#else
 extern mode_t ad_hf_mode __P((mode_t ));
-#endif
 
 /* ad_read.c/ad_write.c */
 extern ssize_t ad_read __P((struct adouble *, const u_int32_t, 

diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c
index 64f9ea3d4c106e2eb39f453b4eac8a21b60c8e84..dc29f72b566214f5cf25bf18e8d5ba9922ac5a62 100644 (file)
--- a/libatalk/adouble/ad_open.c
+++ b/libatalk/adouble/ad_open.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_open.c,v 1.30 2003-04-10 22:58:42 didg Exp $
+ * $Id: ad_open.c,v 1.31 2003-06-06 20:46:38 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -286,7 +286,6 @@ bail_err:
 }
 #endif /* AD_VERSION == AD_VERSION2 */
 
-#ifdef ATACC
 mode_t ad_hf_mode (mode_t mode)
 {
     /* fnctl lock need write access */
@@ -307,8 +306,6 @@ mode_t ad_hf_mode (mode_t mode)
     return mode;
 }
 
-#endif
-
 /* ------------------------------------- 
   read in the entries 
 */