* Hub signness fixes

* Fixed logging bits


svn: 917

src/cmds.c

@@ -72,7 +72,7 @@ static void tell_who(struct userrec *u, int idx, int chan)
   /* calculate max nicklen */
   nicklen = 0;
   for (i = 0; i < dcc_total; i++) {
-      if(strlen(dcc[i].nick) > nicklen)
+      if(strlen(dcc[i].nick) > (size_t) nicklen)
           nicklen = strlen(dcc[i].nick);
   }
   if(nicklen < 9) nicklen = 9;
@@ -1371,7 +1371,8 @@ static void cmd_date(struct userrec *u, int idx, char *par)
 static void cmd_chhandle(struct userrec *u, int idx, char *par)
 {
   char hand[HANDLEN + 1] = "", newhand[HANDLEN + 1] = "";
-  int i, atr = u ? u->flags : 0, atr2;
+  int atr = u ? u->flags : 0, atr2;
+  size_t i;
   struct userrec *u2 = NULL;
 
   strncpyz(hand, newsplit(&par), sizeof hand);

src/log.h

@@ -16,16 +16,16 @@
 #define LOG_RAW      BIT7   /* r   raw server stuff coming in       */
 #define LOG_FILES    BIT8   /* x   file transfer commands and stats */
 #define LOG_ERRORS   BIT9   /* e   misc errors                      */
-#define LOG_ERROR    BIT10  /* e   misc errors                      */
-#define LOG_GETIN    BIT11  /* g   op system. (Getin)                       */
-#define LOG_WARN     BIT12  /* u   warnings                 */
-#define LOG_WARNING  BIT13  /* u   warnings                 */
-#define LOG_SERV     BIT14   /* s   server information               */
-#define LOG_DEBUG    BIT15   /* d   debug                            */
-#define LOG_WALL     BIT16   /* w   wallops                          */
-#define LOG_SRVOUT   BIT17   /* v   server output                    */
-#define LOG_BOTNET   BIT18   /* t   botnet traffic                   */
-#define LOG_BOTSHARE BIT19   /* h   share traffic                    */
+#define LOG_ERROR    LOG_ERRORS
+#define LOG_GETIN    BIT10  /* g   op system. (Getin)                       */
+#define LOG_WARN     BIT11  /* u   warnings                 */
+#define LOG_WARNING  LOG_WARN
+#define LOG_SERV     BIT17   /* s   server information               */
+#define LOG_DEBUG    BIT18   /* d   debug                            */
+#define LOG_WALL     BIT19   /* w   wallops                          */
+#define LOG_SRVOUT   BIT20   /* v   server output                    */
+#define LOG_BOTNET   BIT21   /* t   botnet traffic                   */
+#define LOG_BOTSHARE BIT22   /* h   share traffic                    */
 #define LOG_ALL      0xfffffff   /* (dump to all logfiles)               */
 
 inline void logidx(int, char *, ...);

src/mod/channels.mod/channels.c

@@ -270,10 +270,11 @@ void got_kl(char *botnick, char *code, char *par)
 void rebalance_roles()
 {
   struct bot_addr *ba = NULL;
-  int r[5] = { 0, 0, 0, 0, 0 }, hNdx, lNdx, i;
+  int r[5] = { 0, 0, 0, 0, 0 };
+  unsigned int hNdx, lNdx, i;
   char tmp[10] = "";
 
-  for (i = 0; i < dcc_total; i++) {
+  for (i = 0; i < (unsigned) dcc_total; i++) {
     if (dcc[i].user && (dcc[i].user->flags & USER_BOT)) {
       ba = get_user(&USERENTRY_BOTADDR, dcc[i].user);
       if (ba && (ba->roleid > 0) && (ba->roleid < 5))
@@ -295,7 +296,7 @@ void rebalance_roles()
       hNdx = i;
   }
   while (r[hNdx] - r[lNdx] >= 2) {
-    for (i = 0; i < dcc_total; i++) {
+    for (i = 0; i < (unsigned) dcc_total; i++) {
       if (dcc[i].user && (dcc[i].user->flags & USER_BOT)) {
         ba = get_user(&USERENTRY_BOTADDR, dcc[i].user);
         if (ba && (ba->roleid == (hNdx + 1))) {

src/mod/share.mod/share.c

@@ -1806,8 +1806,6 @@ static void start_sending_users(int idx)
   struct userrec *u = NULL;
   char share_file[1024] = "", s1[64] = "";
   int i = 1;
-  struct chanuserrec *ch = NULL;
-  struct chanset_t *cst = NULL;
 
   egg_snprintf(share_file, sizeof share_file, "%s.share.%s.%li", tempdir, dcc[idx].nick, now);
   if (dcc[idx].u.bot->uff_flags & UFF_OVERRIDE) {