* Initial values for serv/servidx should be -1

svn: 1448

src/adns.c

@@ -676,7 +676,7 @@ int egg_dns_cancel(int id, int issue_callback)
 	if (!q) return(-1);
 	if (prev) prev->next = q->next;
 	else query_head = q->next;
-sdprintf("Cancelling query: %s", q->query);
+	sdprintf("Cancelling query: %s", q->query);
 	if (issue_callback) q->callback(q->client_data, q->query, NULL);
 	free(q);
 	return(0);

src/mod/server.mod/server.c

@@ -31,8 +31,8 @@
 bool strict_servernames;
 bool checked_hostmask;	/* Used in request_op()/check_hostmask() cleared on connect */
 int ctcp_mode;
-int serv;		/* sock # of server currently */
-int servidx;		/* idx of server */
+int serv = -1;		/* sock # of server currently */
+int servidx = -1;		/* idx of server */
 char newserver[121] = "";	/* new server? */
 port_t newserverport;		/* new server port? */
 char newserverpass[121] = "";	/* new server password? */
@@ -1074,8 +1074,6 @@ void server_init()
    * Init of all the variables *must* be done in _start rather than
    * globally.
    */
-  serv = -1;
-  servidx = -1;
   botname[0] = 0;
   trying_server = 0;
   server_lag = 0;