* Changed private() to privchan() and channel_private() to channel_privchan() for c++ compatability

svn: 1312

src/chan.h

@@ -274,7 +274,7 @@ struct chanset_t *findchan_by_dname(const char *name);
 #define channel_manop(chan) (chan->status & CHAN_MANOP)
 #define channel_voice(chan) (chan->status & CHAN_VOICE)
 #define channel_fastop(chan) (chan->status & CHAN_FASTOP)
-#define channel_private(chan) (chan->status & CHAN_PRIVATE)
+#define channel_privchan(chan) (chan->status & CHAN_PRIVATE)
 #define channel_autoop(chan) (chan->status & CHAN_AUTOOP)
 /* Chanflag template
  *#define channel_temp(chan) (chan->status & CHAN_PRIVATE)

src/cmds.c

@@ -1246,7 +1246,7 @@ static void cmd_console(int idx, char *par)
 
     get_user_flagrec(dcc[idx].user, &fr, nick);
 
-    if (strcmp(nick, "*") && private(fr, findchan_by_dname(nick), PRIV_OP)) {
+    if (strcmp(nick, "*") && privchan(fr, findchan_by_dname(nick), PRIV_OP)) {
       dprintf(idx, "Invalid console channel: %s.\n", nick);
       return;
     }
@@ -2493,7 +2493,7 @@ static void cmd_chattr(int idx, char *par)
       free(tmpchg);
     return;
   }
-    if (chan && private(user, chan, PRIV_OP)) {
+    if (chan && privchan(user, chan, PRIV_OP)) {
       dprintf(idx, "You do not have access to change flags for %s\n", chan->dname);
       if (tmpchg)
         free(tmpchg);

src/flags.c

@@ -395,9 +395,9 @@ get_user_flagrec(struct userrec *u, struct flag_record *fr, const char *chname)
  * restricted by +private for the channel
  */
 int
-private(struct flag_record fr, struct chanset_t *chan, int type)
+privchan(struct flag_record fr, struct chanset_t *chan, int type)
 {
-  if (!chan || !channel_private(chan) || glob_bot(fr) || glob_owner(fr))
+  if (!chan || !channel_privchan(chan) || glob_bot(fr) || glob_owner(fr))
     return 0;                   /* user is implicitly not restricted by +private, they may however be lacking other flags */
 
   if (type == PRIV_OP) {
@@ -414,7 +414,7 @@ private(struct flag_record fr, struct chanset_t *chan, int type)
 int
 chk_op(struct flag_record fr, struct chanset_t *chan)
 {
-  if (!chan || (!private(fr, chan, PRIV_OP) && !chk_deop(fr))) {
+  if (!chan || (!privchan(fr, chan, PRIV_OP) && !chk_deop(fr))) {
     if (chan_op(fr) || (glob_op(fr) && !chan_deop(fr)))
       return 1;
   }
@@ -426,7 +426,7 @@ chk_autoop(struct flag_record fr, struct chanset_t *chan)
 {
   if (glob_bot(fr))
     return 0;
-  if (!chan || (!channel_take(chan) && !private(fr, chan, PRIV_OP) && chk_op(fr, chan) && !chk_deop(fr))) {
+  if (!chan || (!channel_take(chan) && !privchan(fr, chan, PRIV_OP) && chk_op(fr, chan) && !chk_deop(fr))) {
     if (channel_autoop(chan) || chan_autoop(fr) || glob_autoop(fr))
       return 1;
   }
@@ -445,7 +445,7 @@ chk_deop(struct flag_record fr)
 int
 chk_voice(struct flag_record fr, struct chanset_t *chan)
 {
-  if (!chan || (!private(fr, chan, PRIV_VOICE) && !chk_devoice(fr))) {
+  if (!chan || (!privchan(fr, chan, PRIV_VOICE) && !chk_devoice(fr))) {
     if (chan_voice(fr) || (glob_voice(fr) && !chan_quiet(fr)))
       return 1;
   }

src/flags.h

@@ -8,7 +8,7 @@
 
 #include "chan.h"
 
-/* For private() checking */
+/* For privchan() checking */
 #define PRIV_OP 1
 #define PRIV_VOICE 2
 
@@ -135,7 +135,7 @@ int flagrec_ok(struct flag_record *, struct flag_record *);
 flag_t sanity_check(flag_t, int);
 flag_t chan_sanity_check(flag_t);
 char geticon(int);
-int private(struct flag_record, struct chanset_t *, int);
+int privchan(struct flag_record, struct chanset_t *, int);
 int chk_op(struct flag_record, struct chanset_t *);
 int chk_autoop(struct flag_record, struct chanset_t *);
 int chk_deop(struct flag_record);

src/misc.c

@@ -495,7 +495,7 @@ void show_channels(int idx, char *handle)
           first = 1;
         }
         dprintf(idx, format, opped ? '@' : ' ', chan->dname, !shouldjoin(chan) ? "(inactive) " : "", 
-           channel_private(chan) ? "(private)  " : "", !channel_manop(chan) ? "(no manop) " : "", 
+           channel_privchan(chan) ? "(private)  " : "", !channel_manop(chan) ? "(no manop) " : "", 
            channel_bitch(chan) ? "(bitch)    " : "", channel_closed(chan) ?  "(closed)" : "");
     }
   }

src/mod/channels.mod/channels.c

@@ -772,7 +772,7 @@ void channels_report(int idx, int details)
   for (chan = chanset; chan; chan = chan->next) {
     if (idx != DP_STDOUT)
       get_user_flagrec(dcc[idx].user, &fr, chan->dname);
-    if (!private(fr, chan, PRIV_OP) && ((idx == DP_STDOUT) || glob_master(fr) || chan_master(fr))) {
+    if (!privchan(fr, chan, PRIV_OP) && ((idx == DP_STDOUT) || glob_master(fr) || chan_master(fr))) {
 
       s[0] = 0;
 
@@ -866,7 +866,7 @@ void channels_report(int idx, int details)
 */
         if (channel_fastop(chan))
           i += my_strcpy(s + i, "fastop ");
-        if (channel_private(chan))
+        if (channel_privchan(chan))
           i += my_strcpy(s + i, "private ");
 
 	dprintf(idx, "      Options: %s\n", s);

src/mod/channels.mod/cmdschan.c

@@ -33,7 +33,7 @@ static void cmd_pls_mask(const char type, int idx, char *par)
     get_user_flagrec(dcc[idx].user, &user, chname);
     chan = findchan_by_dname(chname);
     /* *shrug* ??? (guppy:10Feb1999) */
-    if (!chan || (chan && private(user, chan, PRIV_OP))) {
+    if (!chan || (chan && privchan(user, chan, PRIV_OP))) {
       dprintf(idx, "No such channel.\n");
       return;
     } else if (!chk_op(user, chan)) {
@@ -193,7 +193,7 @@ static void cmd_mns_mask(char type, int idx, char *par)
       chname = dcc[idx].u.chat->con_chan;
     get_user_flagrec(dcc[idx].user, &user, chname);
 
-    if (strchr(CHANMETA, chname[0]) && private(user, findchan_by_dname(chname), PRIV_OP)) {
+    if (strchr(CHANMETA, chname[0]) && privchan(user, findchan_by_dname(chname), PRIV_OP)) {
       dprintf(idx, "No such channel.\n");
       return;
     }
@@ -660,7 +660,7 @@ static void cmd_stick_yn(int idx, char *par, int yn)
       return;
     }
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
-    if (private(user, chan, PRIV_OP)) {
+    if (privchan(user, chan, PRIV_OP)) {
       dprintf(idx, "No such channel.\n");
       return;
     }
@@ -702,7 +702,7 @@ static void cmd_stick_yn(int idx, char *par, int yn)
       return;
     }
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
-    if (private(user, chan, PRIV_OP)) {
+    if (privchan(user, chan, PRIV_OP)) {
       dprintf(idx, "No such channel.\n");
       return;
     }
@@ -745,7 +745,7 @@ static void cmd_stick_yn(int idx, char *par, int yn)
     return;
   }
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     dprintf(idx, "No such channel.\n");
     return;
   }
@@ -807,7 +807,7 @@ static void cmd_pls_chrec(int idx, char *par)
   }
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
   get_user_flagrec(u1, &victim, chan->dname);
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     dprintf(idx, "No such channel.\n");
     return;
   }
@@ -858,7 +858,7 @@ static void cmd_mns_chrec(int idx, char *par)
     chn = newsplit(&par);
   get_user_flagrec(dcc[idx].user, &user, chn);
   get_user_flagrec(u1, &victim, chn);
-  if (private(user, findchan_by_dname(chn), PRIV_OP)) {
+  if (privchan(user, findchan_by_dname(chn), PRIV_OP)) {
     dprintf(idx, "No such channel.\n");
     return;
   }
@@ -1227,7 +1227,7 @@ static void cmd_chaninfo(int idx, char *par)
     SHOW_FLAG("manop",		channel_manop(chan));
     SHOW_FLAG("nodesynch",	channel_nodesynch(chan));
     SHOW_FLAG("nomop",		channel_nomop(chan));
-    SHOW_FLAG("private",	channel_private(chan));
+    SHOW_FLAG("private",	channel_privchan(chan));
     SHOW_FLAG("protectops",	channel_protectops(chan));
     SHOW_FLAG("revenge",	channel_revenge(chan));
     SHOW_FLAG("revengebot",	channel_revengebot(chan));

src/mod/channels.mod/userchan.c

@@ -533,7 +533,7 @@ static void tell_bans(int idx, int show_inact, char *match)
       !(chan = chanset))
     chan = NULL;
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     dprintf(idx, "%s.\n", CHAN_NOSUCH);
     return;
   }
@@ -632,7 +632,7 @@ static void tell_exempts(int idx, int show_inact, char *match)
     chan = NULL;
 
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     dprintf(idx, "%s.\n", CHAN_NOSUCH);
     return;
   }
@@ -731,7 +731,7 @@ static void tell_invites(int idx, int show_inact, char *match)
     chan = NULL;
 
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     dprintf(idx, "%s.\n", CHAN_NOSUCH);
     return;
   }
@@ -1057,7 +1057,7 @@ exempt-time %d invite-time %d ",
 	PLSMNS(channel_protectops(chan)),
 	PLSMNS(channel_revenge(chan)),
 	PLSMNS(channel_revengebot(chan)),
-	PLSMNS(channel_private(chan)),
+	PLSMNS(channel_privchan(chan)),
 	PLSMNS(channel_cycle(chan)),
         inactive,
 	PLSMNS(channel_dynamicexempts(chan)),

src/mod/irc.mod/chan.c

@@ -155,8 +155,8 @@ void priority_do(struct chanset_t * chan, int opsonly, int action)
           get_user_flagrec(m->user, &fr, chan->dname);
 
         if (((glob_deop(fr) && !chan_op(fr)) || chan_deop(fr)) || /* +d */
-           ((!channel_private(chan) && !chan_op(fr) && !glob_op(fr)) || /* simply no +o flag. */
-           (channel_private(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) { /* private? */
+           ((!channel_privchan(chan) && !chan_op(fr) && !glob_op(fr)) || /* simply no +o flag. */
+           (channel_privchan(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) { /* private? */
           targets++;
         }
     }
@@ -181,8 +181,8 @@ void priority_do(struct chanset_t * chan, int opsonly, int action)
         get_user_flagrec(m->user, &fr, chan->dname);
  
       if (((glob_deop(fr) && !chan_op(fr)) || chan_deop(fr)) ||
-          ((!channel_private(chan) && !chan_op(fr) && !glob_op(fr)) ||
-           (channel_private(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) {
+          ((!channel_privchan(chan) && !chan_op(fr) && !glob_op(fr)) ||
+           (channel_privchan(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) {
 
         if (tpos >= ft) {
           if ((action == PRIO_DEOP) && !chan_sentdeop(m)) {
@@ -224,8 +224,8 @@ void priority_do(struct chanset_t * chan, int opsonly, int action)
         get_user_flagrec(m->user, &fr, chan->dname);
 
       if (((glob_deop(fr) && !chan_op(fr)) || chan_deop(fr)) ||
-          ((!channel_private(chan) && !chan_op(fr) && !glob_op(fr)) || 
-           (channel_private(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) {
+          ((!channel_privchan(chan) && !chan_op(fr) && !glob_op(fr)) || 
+           (channel_privchan(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) {
 
         if (tpos >= ft) {
           if ((action == PRIO_DEOP) && !chan_sentdeop(m)) {
@@ -272,8 +272,8 @@ static int target_priority(struct chanset_t * chan, memberlist *target, int opso
         get_user_flagrec(m->user, &fr, chan->dname);
 
       if (((glob_deop(fr) && !chan_op(fr)) || chan_deop(fr)) ||
-         ((!channel_private(chan) && !chan_op(fr) && !glob_op(fr)) || 
-         (channel_private(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) { 
+         ((!channel_privchan(chan) && !chan_op(fr) && !glob_op(fr)) || 
+         (channel_privchan(chan) && !glob_bot(fr) && !glob_owner(fr) && !chan_op(fr)))) { 
         targets++;
       }
     }

src/mod/irc.mod/cmdsirc.c

@@ -33,7 +33,7 @@ static struct chanset_t *get_channel(int idx, char *chname)
 static int has_op(int idx, struct chanset_t *chan)
 {
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     dprintf(idx, "No such channel.\n");
     return 0;
   }
@@ -211,7 +211,7 @@ static void cmd_kickban(int idx, char *par)
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
-    if (private(user, chan, PRIV_OP)) {
+    if (privchan(user, chan, PRIV_OP)) {
       if (all) goto next;
       dprintf(idx, "No such channel.\n");
       return;
@@ -323,7 +323,7 @@ static void cmd_voice(int idx, char *par)
     }
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
-    if (private(user, chan, PRIV_VOICE)) {
+    if (privchan(user, chan, PRIV_VOICE)) {
       if (all) goto next;
       dprintf(idx, "No such channel.\n");
       return;
@@ -391,7 +391,7 @@ static void cmd_devoice(int idx, char *par)
   }
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
-  if (private(user, chan, PRIV_VOICE)) {
+  if (privchan(user, chan, PRIV_VOICE)) {
     if (all) goto next;
     dprintf(idx, "No such channel.\n");
     return;
@@ -461,7 +461,7 @@ static void cmd_op(int idx, char *par)
     return;
   }
 
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     if (!all)
       dprintf(idx, "No such channel.\n");
     goto next;
@@ -808,7 +808,7 @@ static void cmd_deop(int idx, char *par)
       dprintf(idx, "Usage: deop <nick> [channel|*]\n");
       return;
     }
-    if (private(user, chan, PRIV_OP)) {
+    if (privchan(user, chan, PRIV_OP)) {
       if (all) goto next;
       dprintf(idx, "No such channel.\n");
     }
@@ -906,7 +906,7 @@ static void cmd_kick(int idx, char *par)
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
-    if (private(user, chan, PRIV_OP)) {
+    if (privchan(user, chan, PRIV_OP)) {
       if (all) goto next;
       dprintf(idx, "No such channel.\n");
       return;
@@ -976,7 +976,7 @@ static void cmd_getkey(int idx, char *par)
 
   get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
-  if (private(user, chan, PRIV_OP)) {
+  if (privchan(user, chan, PRIV_OP)) {
     dprintf(idx, "No such channel.\n");
     return;
   }
@@ -1029,7 +1029,7 @@ static void cmd_mop(int idx, char *par)
     memberlist *m = NULL;
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
-    if (private(user, chan, PRIV_OP)) {
+    if (privchan(user, chan, PRIV_OP)) {
       if (all) goto next;
       dprintf(idx, "No such channel.\n");
       return;
@@ -1096,7 +1096,7 @@ static void cmd_find(int idx, char *par)
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
 
-    if (!private(user, chan, PRIV_OP)) {
+    if (!privchan(user, chan, PRIV_OP)) {
 
       for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
         char tmp[256] = "";
@@ -1181,7 +1181,7 @@ static void cmd_invite(int idx, char *par)
   while (chan) {
 
     get_user_flagrec(dcc[idx].user, &user, chan->dname);
-    if (private(user, chan, PRIV_OP)) {
+    if (privchan(user, chan, PRIV_OP)) {
       if (all) goto next;
       dprintf(idx, "No such channel.\n");
     }
@@ -1643,7 +1643,7 @@ static void cmd_reset(int idx, char *par)
 
     if (chan)
       get_user_flagrec(dcc[idx].user, &user, chan->dname);
-    if (!chan || private(user, chan, PRIV_OP)) {
+    if (!chan || privchan(user, chan, PRIV_OP)) {
       dprintf(idx, "%s\n", IRC_NOMONITOR);
     } else {
       get_user_flagrec(dcc[idx].user, &user, par);

src/mod/irc.mod/irc.c

@@ -1221,7 +1221,7 @@ check_expired_chanstuff(struct chanset_t *chan)
 
             get_user_flagrec(m->user, &fr2, chan->dname);
             if (!glob_bot(fr2)) {
-              if (!(m->flags & EVOICE) && !private(fr2, chan, PRIV_VOICE) &&
+              if (!(m->flags & EVOICE) && !privchan(fr2, chan, PRIV_VOICE) &&
                   ((channel_voice(chan) && !chk_devoice(fr2)) ||
                    (!channel_voice(chan) && chk_voice(fr2, chan)))) {
                 add_mode(chan, '+', 'v', m->nick);
@@ -1321,7 +1321,7 @@ irc_report(int idx, int details)
     if (idx != DP_STDOUT)
       get_user_flagrec(dcc[idx].user, &fr, chan->dname);
 
-    if (!private(fr, chan, PRIV_OP) && (idx == DP_STDOUT || glob_master(fr) || chan_master(fr))) {
+    if (!privchan(fr, chan, PRIV_OP) && (idx == DP_STDOUT || glob_master(fr) || chan_master(fr))) {
       p = NULL;
       if (shouldjoin(chan)) {
         if (chan->status & CHAN_JUPED)

src/users.c

@@ -482,7 +482,7 @@ tell_user(int idx, struct userrec *u)
     fr.match = FR_CHAN | FR_GLOBAL;
     chan = findchan_by_dname(ch->channel);
     get_user_flagrec(dcc[idx].user, &fr, ch->channel);
-    if (!channel_private(chan) || (channel_private(chan) && (chan_op(fr) || glob_owner(fr)))) {
+    if (!channel_privchan(chan) || (channel_private(chan) && (chan_op(fr) || glob_owner(fr)))) {
       if (glob_op(fr) || chan_op(fr)) {
         if (ch->laston == 0L)
   	  strcpy(s1, "never");