Change ad_init to pass vol, add ad_init_old for stuff that doesn't have struct vol...

[netatalk.git] / libatalk / adouble / ad_lock.h

diff --git a/libatalk/adouble/ad_lock.h b/libatalk/adouble/ad_lock.h
index 7552f241ada095cf71ed327aeb24bb1bc06173d0..b08807ab2b7dace80fde77f19c75c3281e981e65 100644 (file)
--- a/libatalk/adouble/ad_lock.h
+++ b/libatalk/adouble/ad_lock.h
@@ -7,21 +7,22 @@
  * around. that way, we can honor locks created by the same process                                                                                                                                                                                                           
  * with the same file. */
 
-#define adf_lock_init(a) do { \
-        (a)->adf_lockmax = (a)->adf_lockcount = 0; \
-        (a)->adf_excl = 0;(a)->adf_lock = NULL; \
+#define adf_lock_init(a) do {   \
+        (a)->adf_lockmax = 0;   \
+        (a)->adf_lockcount = 0; \
+        (a)->adf_lock = NULL;   \
     } while (0)
 
-#define adf_lock_free(a) do { \
-        int i;\
-        if (!(a)->adf_lock) \
-            break; \
-        for (i = 0; i < (a)->adf_lockcount; i++) {\
-            adf_lock_t *lock = (a)->adf_lock + i;\
+#define adf_lock_free(a) do {                                 \
+        int i;                                                \
+        if (!(a)->adf_lock)                                   \
+            break;                                            \
+        for (i = 0; i < (a)->adf_lockcount; i++) {            \
+            adf_lock_t *lock = (a)->adf_lock + i;             \
             if (--(*lock->refcount) < 1)free(lock->refcount); \
-        }\
-        free((a)->adf_lock); \
-        adf_lock_init(a); \
+        }                                                     \
+        free((a)->adf_lock);                                  \
+        adf_lock_init(a);                                     \
     } while (0)
 
 #endif /* libatalk/adouble/ad_private.h */