* Rename deaf_set -> in_deaf

src/mod/server.mod/server.c

@@ -99,7 +99,7 @@ static bool use_penalties = 0;
 static int use_fastdeq;
 size_t nick_len = 9;			/* Maximal nick length allowed on the network. */
 char deaf_char = 0;
-bool deaf_set = 0;
+bool in_deaf = 0;
 char callerid_char = 0;
 bool in_callerid = 0;
 
@@ -1022,13 +1022,13 @@ static void server_secondly()
           bool need_chatter = doflood(NULL) || (Auth::ht_host.size() && auth_chan && strlen(auth_prefix));
 
           // In +D but am +f, need to -D
-          if (deaf_set && (need_chatter || !use_deaf)) {
+          if (in_deaf && (need_chatter || !use_deaf)) {
             dprintf(DP_SERVER, "MODE %s -%c\n", botname, deaf_char);
-            deaf_set = 0;
-          } else if (!deaf_set && use_deaf && !need_chatter) {
+            in_deaf = 0;
+          } else if (!in_deaf && use_deaf && !need_chatter) {
             // Not +D but should be, probably had +f removed.
             dprintf(DP_SERVER, "MODE %s +%c\n", botname, deaf_char);
-            deaf_set = 1;
+            in_deaf = 1;
           }
         }
 

src/mod/server.mod/server.h

@@ -46,7 +46,7 @@ enum {
 
 extern bind_table_t	*BT_ctcp, *BT_ctcr, *BT_msgc;
 extern size_t		nick_len;
-extern bool		trigger_on_ignore, floodless, keepnick, deaf_set, in_callerid;
+extern bool		trigger_on_ignore, floodless, keepnick, in_deaf, in_callerid;
 extern int 		servidx, ctcp_mode, answer_ctcp, serv, curserv, default_alines;
 extern unsigned int     rolls;
 extern port_t		default_port, newserverport, curservport;

src/mod/server.mod/servmsg.c

@@ -310,9 +310,9 @@ got005(char *from, char *msg)
       use_354 = 1;
     else if (!strcasecmp(tmp, "DEAF")) {
       deaf_char = p ? p[0] : 'D';
-      if (use_deaf && !deaf_set) {
+      if (use_deaf && !in_deaf) {
         dprintf(DP_SERVER, "MODE %s +%c\n", botname, deaf_char);
-        deaf_set = 1;
+        in_deaf = 1;
       }
     } else if (!strcasecmp(tmp, "CALLERID")) {
       callerid_char = p ? p[0] : 'g';
@@ -1234,7 +1234,7 @@ static void disconnect_server(int idx, int dolost)
   use_penalties = 0;
   use_354 = 0;
   deaf_char = 0;
-  deaf_set = 0;
+  in_deaf = 0;
   callerid_char = 0;
   in_callerid = 0;
   use_exempts = 0;

src/set.c

@@ -288,7 +288,7 @@ sdprintf("var (mem): %s -> %s", var->name, datain ? datain : "(NULL)");
         if (which) {
           char mode_char = strcmp(var->name, "deaf") == 0 ? deaf_char : callerid_char;
           if (mode_char == deaf_char)
-            deaf_set = num;
+            in_deaf = num;
           else if (mode_char == callerid_char)
             in_callerid = num;
           dprintf(DP_SERVER, "MODE %s %c%c\n", botname, which, mode_char);