From trunk: changed DEFMASK to be an octal.

[netatalk.git] / libatalk / adouble / ad_open.c

diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c
index 22fc4415b835bb0f62015888f3a68bbae8fd8ca8..0ce26ecd4a85e0a6b8976a35779bc3f2d66bb544 100644 (file)
--- a/libatalk/adouble/ad_open.c
+++ b/libatalk/adouble/ad_open.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ad_open.c,v 1.8 2001-06-29 14:14:46 rufustfirefly Exp $
+ * $Id: ad_open.c,v 1.10.2.1 2002-03-12 16:12:03 srittau Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -155,7 +155,7 @@ static const struct entry entry_order[] = {
   {ADEID_RFORK, ADEDOFF_RFORK_V1, ADEDLEN_INIT},
   {0, 0, 0}
 };
-#else if AD_VERSION == AD_VERSION2
+#else /* AD_VERSION == AD_VERSION2 */
 static const struct entry entry_order[] = {
   {ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT},
   {ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT},
@@ -461,7 +461,7 @@ static __inline__ int ad_header_read(struct adouble *ad)
     /* fix up broken dates */
     if (ad->ad_version == AD_VERSION1) {
       struct stat st;
-      int32_t aint;
+      u_int32_t aint;
       
       if (fstat(ad->ad_hf.adf_fd, &st) < 0) {
        return 1; /* fail silently */
@@ -528,7 +528,7 @@ ad_path( path, adflags )
  * and that value is returned.
  */
 
-#define DEFMASK 7700   /* be conservative */
+#define DEFMASK 07700  /* be conservative */
 
 int
 ad_mode( path, mode )