fix possible crash on user deletion

[srvx.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 694df8a3b3f1a3bc42d85c8c0fa2bc6db71075ea..67be61122581a625ca9b06515c28d9e18900b707 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -24,12 +24,6 @@
 #include "compat.h"
 #include "proto.h"
 
-#if !defined(HAVE_LOCALTIME_R) && !defined(__CYGWIN__)
-extern struct tm *localtime_r(const time_t *clock, struct tm *res);
-#elif defined(__CYGWIN__)
-# define localtime_r(clock, res) memcpy(res, localtime(clock), sizeof(struct tm));
-#endif
-
 #ifndef true
 #define true 1
 #endif
@@ -38,10 +32,10 @@ extern struct tm *localtime_r(const time_t *clock, struct tm *res);
 #define false 0
 #endif
 
-#define ArrayLength(x)         (sizeof(x)/sizeof(x[0]))
+#define ArrayLength(x)      (sizeof(x)/sizeof(x[0]))
 #define safestrncpy(dest, src, len) do { char *d = (dest); const char *s = (src); size_t l = strlen(s)+1;  if ((len) < l) l = (len); memmove(d, s, l); d[l-1] = 0; } while (0)
 
-#ifdef __GNUC__
+#if __GNUC__
 #define PRINTF_LIKE(M,N) __attribute__((format (printf, M, N)))
 #else
 #define PRINTF_LIKE(M,N)
@@ -56,6 +50,12 @@ extern struct tm *localtime_r(const time_t *clock, struct tm *res);
 #define UNUSED_ARG(ARG) ARG
 #endif
 
+#if defined(__GNUC__) && (__GNUC__ < 3)
+# define GCC_VARMACROS 1
+#elif !defined(S_SPLINT_S)
+# define C99_VARMACROS 1
+#endif
+
 #if defined(WITH_MALLOC_DMALLOC)
 # define DMALLOC_FUNC_CHECK 1
 # include <string.h>
@@ -119,9 +119,10 @@ extern void verify(const void *ptr);
 # define verify(ptr) (void)(ptr)
 #endif
 
-extern time_t now;
+extern unsigned long now;
 extern int quit_services;
 extern struct log_type *MAIN_LOG;
+extern const char git_version[];
 
 typedef union irc_in_addr {
     uint32_t in6_32[4];
@@ -217,11 +218,11 @@ int STRUCTNAME##_remove(struct STRUCTNAME *list, ITEMTYPE new_item) {\
     unsigned int n, found;\
     verify(list->list);\
     for (found=n=0; n<list->used; n++) {\
-       if (list->list[n] == new_item) {\
-           memmove(list->list+n, list->list+n+1, (list->used-n-1)*sizeof(list->list[n]));\
-           found = 1;\
-           list->used--;\
-       }\
+        if (list->list[n] == new_item) {\
+            memmove(list->list+n, list->list+n+1, (list->used-n-1)*sizeof(list->list[n]));\
+            found = 1;\
+            list->used--;\
+        }\
     }\
     return found;\
 }\
@@ -235,10 +236,10 @@ void STRUCTNAME##_clean(struct STRUCTNAME *list) {\
  * minutes, and 10 seconds" (27 characters).  Other languages will
  * vary, so there's plenty of leeway.
  */
-#define INTERVALLEN    50
+#define INTERVALLEN 50
 
 struct handle_info;
-char *intervalString(char *output, time_t interval, struct handle_info *hi);
+char *intervalString(char *output, unsigned long interval, struct handle_info *hi);
 int getipbyname(const char *name, unsigned long *ip);
 int set_policer_param(const char *param, void *data, void *extra);
 const char *strtab(unsigned int ii);
@@ -249,6 +250,7 @@ void tools_cleanup(void);
 int irccasecmp(const char *stra, const char *strb);
 int ircncasecmp(const char *stra, const char *strb, unsigned int len);
 const char *irccasestr(const char *haystack, const char *needle);
+char *ircstrlower(char *str);
 
 DECLARE_LIST(string_buffer, char);
 void string_buffer_append_string(struct string_buffer *buf, const char *tail);