philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change the channel mode flags from const ints in names.c to #define macros in names.h.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@134 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-08-30 14:50:42 +00:00
parent 3f8952f20a
commit c89a718fa1
5 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/names.h
View File

@@ -26,6 +26,21 @@
#define GOTWHO 0x08 #define GOTWHO 0x08
#define GOTEXEMPT 0x10 #define GOTEXEMPT 0x10
/* Channel mode flags */
#define MODE_ANONYMOUS (1U << 0) /* av2.9 */
#define MODE_C (1U << 1) /* erf/TS4 */
#define MODE_INVITE (1U << 2) /* RFC */
#define MODE_KEY (1U << 3) /* RFC */
#define MODE_LIMIT (1U << 4) /* RFC */
#define MODE_MODERATED (1U << 5) /* RFC */
#define MODE_MSGS (1U << 6) /* RFC */
#define MODE_PRIVATE (1U << 7) /* RFC */
#define MODE_REGISTERED (1U << 8) /* Dalnet */
#define MODE_SECRET (1U << 9) /* RFC */
#define MODE_TOPIC (1U << 10) /* RFC */
#define MODE_Z (1U << 11) /* erf/TS4 */
#define MODE_RESTRICTED (1U << 12) /* Dalnet */
void add_to_join_list (char *, int, int); void add_to_join_list (char *, int, int);
void remove_from_join_list (char *, int); void remove_from_join_list (char *, int);
char *get_chan_from_join_list (int); char *get_chan_from_join_list (int);

1
source/commands.c
View File

@@ -3534,7 +3534,6 @@ char *str = NULL;
BUILT_IN_COMMAND(e_topic) BUILT_IN_COMMAND(e_topic)
{ {
extern int MODE_TOPIC;
char *arg = NULL; char *arg = NULL;
char *arg2; char *arg2;
ChannelList *chan; ChannelList *chan;

2
source/commands2.c
View File

@@ -100,8 +100,6 @@ extern char attach_ttyname[];
char *org_nick = NULL; char *org_nick = NULL;
static int delay_gain_nick (void *, char *); static int delay_gain_nick (void *, char *);
extern int MODE_TOPIC, MODE_MODERATED, MODE_ANONYMOUS, MODE_INVITE,
MODE_MSGS, MODE_SECRET, MODE_PRIVATE, MODE_KEY, MODE_LIMIT;
BUILT_IN_COMMAND(nwhois) BUILT_IN_COMMAND(nwhois)
{ {

17
source/names.c
View File

@@ -59,23 +59,6 @@ static void apply_channel_modes (char *, char *, ChannelList *);
static char mode_str[] = "aciklmnprstzR"; static char mode_str[] = "aciklmnprstzR";
char new_channel_format[BIG_BUFFER_SIZE]; char new_channel_format[BIG_BUFFER_SIZE];
const int MODE_ANONYMOUS = 1 << 0; /* av2.9 */
const int MODE_C = 1 << 1; /* erf/TS4 */
const int MODE_INVITE = 1 << 2; /* RFC */
const int MODE_KEY = 1 << 3; /* RFC */
const int MODE_LIMIT = 1 << 4; /* RFC */
const int MODE_MODERATED = 1 << 5; /* RFC */
const int MODE_MSGS = 1 << 6; /* RFC */
const int MODE_PRIVATE = 1 << 7; /* RFC */
const int MODE_REGISTERED = 1 << 8; /* Dalnet */
const int MODE_SECRET = 1 << 9; /* RFC */
const int MODE_TOPIC = 1 << 10; /* RFC */
const int MODE_Z = 1 << 11; /* erf/TS4 */
const int MODE_RESTRICTED = 1 << 12; /* Dalnet */
static struct modelist static struct modelist
{ {
char *chan; char *chan;

1
source/status.c
View File

@@ -1178,7 +1178,6 @@ static char my_buffer[IRCD_BUFFER_SIZE + 1];
if (window->current_channel/* && chan_is_connected(s, window->server)*/) if (window->current_channel/* && chan_is_connected(s, window->server)*/)
{ {
extern const int MODE_PRIVATE, MODE_SECRET;
int num; int num;
if (get_int_var(HIDE_PRIVATE_CHANNELS_VAR) && if (get_int_var(HIDE_PRIVATE_CHANNELS_VAR) &&
is_channel_mode(window->current_channel, is_channel_mode(window->current_channel,