* Move nick release code into a common function

src/mod/irc.mod/msgcmds.c

@@ -431,17 +431,7 @@ static int msg_release(char *nick, char *host, struct userrec *u, char *par)
 
   if (u_pass_match(u, pass) && !u_pass_match(u, "-")) {
     putlog(LOG_CMDS, "*", STR("(%s!%s) !%s! RELEASE"), nick, host, u->handle);
-    // Only do this if currently on a jupenick
-    if (jupenick[0] && match_my_nick(jupenick)) {
-      keepnick = 0;
-      release_time = now;
-
-      altnick_char = rolls = 0;
-      tried_nick = now;
-      dprintf(DP_MODE, "NICK %s\n", origbotname);
-      putlog(LOG_MISC, "*", "Releasing jupenick '%s' and switching back to nick '%s'", jupenick, origbotname);
-    } else
-      putlog(LOG_CMDS, "*", "Not releasing nickname. (Not currently on a jupenick)");
+    release_nick();
   } else {
     putlog(LOG_CMDS, "*", STR("(%s!%s) !%s! failed RELEASE"), nick, host, u ? u->handle : "*");
   }

src/mod/server.mod/server.h

@@ -60,6 +60,7 @@ extern rate_t		flood_msg, flood_ctcp, flood_callerid;
 
 int check_bind_ctcpr(char *, char *, struct userrec *, char *, char *, char *, bind_table_t *);
 void nicks_available(char* buf, char delim = 0, bool buf_contains_available = 1);
+void release_nick();
 
 #define check_bind_ctcp(a, b, c, d, e, f) check_bind_ctcpr(a, b, c, d, e, f, BT_ctcp)
 #define check_bind_ctcr(a, b, c, d, e, f) check_bind_ctcpr(a, b, c, d, e, f, BT_ctcr)

src/mod/server.mod/servmsg.c

@@ -912,6 +912,20 @@ void nicks_available(char* buf, char delim, bool buf_contains_available) {
   nick_available(is_jupe, is_orig);
 }
 
+void release_nick() {
+  // Only do this if currently on a jupenick
+  if (jupenick[0] && match_my_nick(jupenick)) {
+    keepnick = 0;
+    release_time = now;
+
+    altnick_char = rolls = 0;
+    tried_nick = now;
+    dprintf(DP_MODE, "NICK %s\n", origbotname);
+    putlog(LOG_MISC, "*", "Releasing jupenick '%s' and switching back to nick '%s'", jupenick, origbotname);
+  } else
+    putlog(LOG_CMDS, "*", "Not releasing nickname. (Not currently on a jupenick)");
+}
+
 /* This is a reply to MONITOR: Offline
  * RPL_MONOFFLINE
  * :<server> 731 <nick> :nick[,nick1]*