Convert time-related variables to consistently use "unsigned long".

[srvx.git] / src / common.h

diff --git a/src/common.h b/src/common.h
index 6e0d5c120b35a487bee707672f28b69ffdc5c2eb..09bc4d1af8bd23ea589bfe1ebdd82fc2078b7ba6 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -38,7 +38,7 @@ 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__
@@ -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];
@@ -170,7 +171,9 @@ int split_line(char *line, int irc_colon, int argv_size, char *argv[]);
 #define match_ircglobs !mmatch
 int mmatch(const char *glob, const char *newglob);
 int match_ircglob(const char *text, const char *glob);
-int user_matches_glob(struct userNode *user, const char *glob, int include_nick);
+#define MATCH_USENICK 1
+#define MATCH_VISIBLE 2
+int user_matches_glob(struct userNode *user, const char *glob, int flags);
 
 int is_ircmask(const char *text);
 int is_gline(const char *text);
@@ -215,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;\
 }\
@@ -233,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);