Rework channel mode handling

[solanum.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index a9c0752995bbd800eb80a170f7b4007865c4d3eb..21cefa7c4310f2797a371f116c1fd7b7979b5ad0 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -122,13 +122,23 @@ struct ChModeChange
 };
 
 typedef void (*ChannelModeFunc)(struct Client *source_p, struct Channel *chptr,
-               int alevel, int parc, int *parn,
-               const char **parv, int *errors, int dir, char c, long mode_type);
+               int alevel, const char *arg, int *errors, int dir, char c, long mode_type);
+
+enum chm_flags
+{
+       CHM_CAN_QUERY  = 1 << 0,
+       CHM_OPS_QUERY  = 1 << 1,
+       CHM_ARG_SET    = 1 << 2,
+       CHM_ARG_DEL    = 1 << 3,
+       CHM_ARGS       = CHM_ARG_SET | CHM_ARG_DEL,
+       CHM_QUERYABLE  = CHM_ARGS | CHM_CAN_QUERY,
+};
 
 struct ChannelMode
 {
        ChannelModeFunc set_func;
        long mode_type;
+       enum chm_flags flags;
 };
 
 typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
@@ -200,6 +210,30 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define EXTBAN_NOMATCH  0  /* valid mask, no match */
 #define EXTBAN_MATCH    1  /* matches */
 
+int iter_comm_channels_step(rb_dlink_node *pos1, rb_dlink_node *pos2,
+               struct membership **ms1, struct membership **ms2,
+               struct Channel **chptr);
+
+
+/* Iterate two sorted linked lists of channels, with heads headN, in lockstep.
+   At each iteration, chptr will be a channel in at least one of the lists,
+   and each msN will be non-null iff the channel is in its corresponding list.
+
+   head1 and head2 must be linked list heads.
+   pos1, pos2, ms1, ms2 must be names of modifiable variables, and should not
+   be modified during iteration. It is safe to break or continue at any point
+   without any special cleanup.
+
+   rb_dlink_node_t *pos1, *pos2, *head1, *head2;
+   struct membership *ms1, *ms2;
+   struct Channel *chptr;
+*/
+#define ITER_COMM_CHANNELS(pos1, pos2, head1, head2, ms1, ms2, chptr) \
+               for ((pos1) = (head1), (pos2) = (head2); \
+                       iter_comm_channels_step((pos1), (pos2), &(ms1), &(ms2), &(chptr)); \
+                       (ms1) && ((pos1) = (pos1)->next), (ms2) && ((pos2) = (pos2)->next))
+
+
 extern rb_dlink_list global_channel_list;
 void init_channels(void);