Merge from branch-2-1

[netatalk.git] / include / atalk / util.h

diff --git a/include/atalk/util.h b/include/atalk/util.h
index 3e1885c57a3de632af1fbc43f872a7e9c5bb1a24..3f10132121a62f7ca79f734477f191e9032b739f 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.18.2.1 2010-02-11 13:06:55 franklahm Exp $
+ * $Id: util.h,v 1.21 2010/02/28 22:29:16 didg Exp $
  */
 
 /*!
@@ -28,13 +28,19 @@
 #define EXITERR_CONF 2  /* error in config files/cmd line parameters */
 #define EXITERR_SYS  3  /* local system error */
 
+/* Print a SBT and exit */
+#define AFP_PANIC(why) \
+    do {                                            \
+        netatalk_panic(why);                        \
+        abort();                                    \
+    } while(0);
+
 /* LOG assert errors */
 #ifndef NDEBUG
 #define AFP_ASSERT(b) \
     do {                                                                \
         if (!(b)) {                                                     \
-            LOG(log_error, logtype_default, "PANIC, assert failed: %s", #b); \
-            abort();                                                    \
+            AFP_PANIC(#b);                                              \
         } \
     } while(0);
 #else
@@ -56,9 +62,9 @@ extern int atalk_aton     (char *, struct at_addr *);
 extern void bprint        (char *, int);
 extern int strdiacasecmp  (const char *, const char *);
 extern int strndiacasecmp (const char *, const char *, size_t);
-extern pid_t server_lock  (char * /*program*/, char * /*file*/, 
-                              int /*debug*/);
+extern pid_t server_lock  (char * /*program*/, char * /*file*/, int /*debug*/);
 extern void fault_setup          (void (*fn)(void *));
+extern void netatalk_panic(const char *why);
 #define server_unlock(x)  (unlink(x))
 
 /* strlcpy and strlcat are used by pam modules */
@@ -133,5 +139,6 @@ extern int compare_ip(const struct sockaddr *sa1, const struct sockaddr *sa2);
  *****************************************************************/
 
 extern const char *getcwdpath(void);
+extern int lchdir(const char *dir);
 
 #endif  /* _ATALK_UTIL_H */