use enums, it's way better :)

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/dotlock.c b/dotlock.c
index 8d562c8..8f1f308 100644 (file)
--- a/dotlock.c
+++ b/dotlock.c
@@ -68,7 +68,9 @@ static int dotlock_unlink (const char *);
 static int dotlock_lock (const char *);
 
 
 static int dotlock_lock (const char *);
 
 

-#define check_flags(a) if (a & DL_FL_ACTIONS) usage (argv[0])
+#define check_flags(a)                              \
+    if (a & (DL_FL_TRY|DL_FL_UNLOCK|DL_FL_UNLINK))  \
+       usage(argv[0])

 
 int main (int argc, char **argv)
 {
 
 int main (int argc, char **argv)
 {

diff --git a/dotlock.h b/dotlock.h
index 16ecce3..1a41330 100644 (file)
--- a/dotlock.h
+++ b/dotlock.h
@@ -11,25 +11,21 @@
 #ifndef _DOTLOCK_H
 #define _DOTLOCK_H
 
 #ifndef _DOTLOCK_H
 #define _DOTLOCK_H
 

-/* exit values */
-
-#define DL_EX_OK       0
-#define DL_EX_ERROR    1
-#define DL_EX_EXIST    3
-#define DL_EX_NEED_PRIVS 4
-#define DL_EX_IMPOSSIBLE 5
-
-/* flags */
-
-#define DL_FL_TRY      (1 << 0)
-#define DL_FL_UNLOCK   (1 << 1)
-#define DL_FL_USEPRIV  (1 << 2)
-#define DL_FL_FORCE    (1 << 3)
-#define DL_FL_RETRY    (1 << 4)
-#define DL_FL_UNLINK   (1 << 5)
-
-#define DL_FL_ACTIONS (DL_FL_TRY|DL_FL_UNLOCK|DL_FL_UNLINK)
-
-int dotlock_invoke (const char *, int, int, int);
+enum dotlock_exits {
+    DL_EX_OK         = 0,
+    DL_EX_ERROR      = 1,
+    DL_EX_EXIST      = 3,
+    DL_EX_NEED_PRIVS = 4,
+    DL_EX_IMPOSSIBLE = 5,
+};
+
+enum dotlock_actions {
+    DL_FL_TRY     = 1 << 0,
+    DL_FL_UNLOCK  = 1 << 1,
+    DL_FL_USEPRIV = 1 << 2,
+    DL_FL_FORCE   = 1 << 3,
+    DL_FL_RETRY   = 1 << 4,
+    DL_FL_UNLINK  = 1 << 5,
+};

 
 #endif
 
 #endif