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

[srvx.git] / src / chanserv.h

diff --git a/src/chanserv.h b/src/chanserv.h
index c52e9c7c62a8c1bf76987dd21467bcb5a32cc704..a84a86c0aab8fcca545cf9a92a46900f88078f04 100644 (file)
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -56,40 +56,41 @@ enum charOption {
     NUM_CHAR_OPTIONS
 };
 
-#define CHANNEL_NODELETE       0x00000001 /* (1 << 0) */
-#define CHANNEL_SUSPENDED      0x00000002 /* (1 << 1) */
-#define CHANNEL_INFO_LINES     0x00000004 /* (1 << 2) - DEPRECATED */
-#define CHANNEL_VOICE_ALL      0x00000008 /* (1 << 3) - DEPRECATED */
+#define CHANNEL_NODELETE    0x00000001 /* (1 << 0) */
+#define CHANNEL_SUSPENDED   0x00000002 /* (1 << 1) */
+#define CHANNEL_INFO_LINES  0x00000004 /* (1 << 2) - DEPRECATED */
+#define CHANNEL_VOICE_ALL   0x00000008 /* (1 << 3) - DEPRECATED */
 /* No longer used. */                      /* (1 << 4) */
-#define CHANNEL_DYNAMIC_LIMIT  0x00000020 /* (1 << 5) */
-#define CHANNEL_TOPIC_SNARF    0x00000040 /* (1 << 6) - DEPRECATED */
+#define CHANNEL_DYNAMIC_LIMIT   0x00000020 /* (1 << 5) */
+#define CHANNEL_TOPIC_SNARF     0x00000040 /* (1 << 6) - DEPRECATED */
 #define CHANNEL_PEON_INVITE     0x00000080 /* (1 << 7) - DEPRECATED */
 #define CHANNEL_OFFCHANNEL      0x00000100 /* (1 << 8) */
+#define CHANNEL_UNREVIEWED      0x00000200 /* (1 << 9) */
 /* Flags with values over 0x20000000 or (1 << 29) will not work
  * because chanData.flags is a 30-bit field.
  */
 
-#define IsProtected(x)         ((x)->flags & CHANNEL_NODELETE)
-#define IsSuspended(x)         ((x)->flags & CHANNEL_SUSPENDED)
-#define IsOffChannel(x)         (((x)->flags & CHANNEL_OFFCHANNEL) && (off_channel > 1))
+#define IsProtected(x)  ((x)->flags & CHANNEL_NODELETE)
+#define IsSuspended(x)  ((x)->flags & CHANNEL_SUSPENDED)
+#define IsOffChannel(x) (((x)->flags & CHANNEL_OFFCHANNEL) && (off_channel > 1))
 
 struct chanData
 {
-    struct chanNode    *channel;
+    struct chanNode     *channel;
     struct mod_chanmode modes;
 
-    time_t             registered;
-    time_t             visited;
-    time_t             limitAdjusted;
-    time_t              ownerTransfer;
+    unsigned long       registered;
+    unsigned long       visited;
+    unsigned long       limitAdjusted;
+    unsigned long       ownerTransfer;
 
-    char               *topic;
-    char               *greeting;
-    char               *user_greeting;
-    char               *registrar;
-    char                *topic_mask;
+    char    *topic;
+    char    *greeting;
+    char    *user_greeting;
+    char    *registrar;
+    char    *topic_mask;
 
-    unsigned int       flags : 30;
+    unsigned int        flags : 30;
     unsigned int        may_opchan : 1;
     unsigned int        max;
     unsigned int        last_refresh;
@@ -98,12 +99,12 @@ struct chanData
     unsigned short      lvlOpts[NUM_LEVEL_OPTIONS];
     unsigned char       chOpts[NUM_CHAR_OPTIONS];
 
-    struct userData    *users;
-    struct banData     *bans;
+    struct userData     *users;
+    struct banData      *bans;
     struct dict         *notes;
-    struct suspended   *suspended;
-    struct chanData    *prev;
-    struct chanData    *next;
+    struct suspended    *suspended;
+    struct chanData     *prev;
+    struct chanData     *next;
 };
 
 #define USER_AUTO_OP            0x00000001
@@ -117,18 +118,18 @@ struct chanData
 
 struct userData
 {
-    struct handle_info *handle;
-    struct chanData    *channel;
+    struct handle_info  *handle;
+    struct chanData     *channel;
 
-    char               *info;
-    time_t             seen;
+    char                *info;
+    unsigned long       seen;
     unsigned short      access;
-    unsigned int       present : 1;
+    unsigned int        present : 1;
     unsigned int        flags : USER_FLAGS_SIZE;
 
     /* linked list of userDatas for a chanData */
-    struct userData    *prev;
-    struct userData    *next;
+    struct userData     *prev;
+    struct userData     *next;
     /* linked list of userDatas for a handle_info */
     struct userData     *u_prev;
     struct userData     *u_next;
@@ -136,26 +137,28 @@ struct userData
 
 struct banData
 {
-    char               mask[NICKLEN + USERLEN + HOSTLEN + 3];
-    char               owner[NICKLEN+1];
-    struct chanData     *channel;
+    char            mask[NICKLEN + USERLEN + HOSTLEN + 3];
+    char            owner[NICKLEN+1];
+    struct chanData *channel;
 
-    time_t             set;
-    time_t             triggered;
-    time_t              expires;
+    unsigned long   set;
+    unsigned long   triggered;
+    unsigned long   expires;
 
-    char               *reason;
+    char            *reason;
 
-    struct banData     *prev;
-    struct banData     *next;
+    struct banData  *prev;
+    struct banData  *next;
 };
 
 struct suspended
 {
-    struct chanData    *cData;
-    char               *suspender;
+    struct chanData     *cData;
+    char                *suspender;
     char                *reason;
-    time_t              issued, expires, revoked;
+    unsigned long       issued;
+    unsigned long       expires;
+    unsigned long       revoked;
     struct suspended    *previous;
 };
 
@@ -163,7 +166,8 @@ struct do_not_register
 {
     char   chan_name[CHANNELLEN+1];
     char   setter[NICKSERV_HANDLE_LEN+1];
-    time_t set;
+    unsigned long set;
+    unsigned long expires;
     char   reason[1];
 };