* Formatting fixes

src/cmds.c

@@ -891,7 +891,7 @@ static void cmd_userlist(int idx, char *par)
   PRINT_USERS(0, USER_OP, USER_MASTER, "Ops");
   PRINT_USERS(0, 0, USER_OP, "Users");
 
-  dprintf(idx, "Total bots: %d\n", bt);
+  dprintf(idx, "Total bots : %d\n", bt);
   dprintf(idx, "Total users: %d\n", tt);
 
   return;
@@ -4382,7 +4382,9 @@ void gotremotereply (char *frombot, char *tohand, char *toidx, char *ln) {
     buf = (char *) my_calloc(1, siz);
 
     simple_snprintf(buf, siz, "(%s)", frombot);
-    dprintf(idx, "%-13s %s\n", buf, ln);
+    char format[10] = "";
+    simple_snprintf(format, sizeof(format), "%%-%ds %%s\n", HANDLEN + 2);
+    dprintf(idx, format, buf, ln);
     free(buf);
   }
 }

src/mod/channels.mod/channels.c

@@ -817,24 +817,24 @@ void channels_report(int idx, int details)
 	if (channel_active(chan)) {
 	  /* If it's a !chan, we want to display it's unique name too <cybah> */
 	  if (chan->dname[0]=='!') {
-	    dprintf(idx, "    %-10s: %2d member%s enforcing \"%s\" (%s), "
+	    dprintf(idx, "    %-20s: %2d member%s enforcing \"%s\" (%s), "
 	            "unique name %s\n", chan->dname, chan->channel.members,
 	            (chan->channel.members==1) ? "," : "s,", s2, s, chan->name);
 	  } else {
-	    dprintf(idx, "    %-10s: %2d member%s enforcing \"%s\" (%s)\n",
+	    dprintf(idx, "    %-20s: %2d member%s enforcing \"%s\" (%s)\n",
 	            chan->dname, chan->channel.members,
 	            chan->channel.members == 1 ? "," : "s,", s2, s);
 	  }
 	} else {
           if (!conf.bot->hub)
-            dprintf(idx, "    %-10s: (%s), enforcing \"%s\"  (%s)\n", chan->dname,
+            dprintf(idx, "    %-20s: (%s), enforcing \"%s\"  (%s)\n", chan->dname,
 		  channel_pending(chan) ? "pending" : "not on channel", s2, s);
           else
-            dprintf(idx, "    %-10s: (%s), enforcing \"%s\"  (%s)\n", chan->dname,
+            dprintf(idx, "    %-20s: (%s), enforcing \"%s\"  (%s)\n", chan->dname,
 		  "limbo", s2, s);
 	}
       } else {
-	dprintf(idx, "    %-10s: channel is set +inactive\n",
+	dprintf(idx, "    %-20s: channel is set +inactive\n",
 		chan->dname);
       }
       if (details) {

src/userrec.c

@@ -363,7 +363,7 @@ static void write_user(const struct userrec *u, bd::Stream& stream, int idx)
   bd::String buf;
 
   build_flags(s, &fr, NULL);
-  stream << buf.printf("%s%-10s - %-24s\n", u->bot ? "-" : "", u->handle, s);
+  stream << buf.printf("%s%s - %s\n", u->bot ? "-" : "", u->handle, s);
 
   struct chanset_t *cst = NULL;
 
@@ -377,7 +377,7 @@ static void write_user(const struct userrec *u, bd::Stream& stream, int idx)
       fr.match = FR_CHAN;
       fr.chan = ch->flags;
       build_flags(s, &fr, NULL);
-      stream << buf.printf("! %-20s %li %-10s %s\n", ch->channel, (long) ch->laston, s, ch->info ? ch->info : "");
+      stream << buf.printf("! %s %li %s %s\n", ch->channel, (long) ch->laston, s, ch->info ? ch->info : "");
     }
   }
   for (struct user_entry *ue = u->entries; ue; ue = ue->next) {