* Fixedbug in simple_vsnprintf() (forgot to break after parsing %D)

svn: 2009

src/botcmd.c

@@ -9,6 +9,7 @@
 #include "common.h"
 #include "botcmd.h"
 #include "main.h"
+#include "base64.h"
 #include "src/mod/share.mod/share.h"
 #include "src/mod/update.mod/update.h"
 #include "net.h"

src/botcmd.h

@@ -5,7 +5,6 @@ void bounce_simul(int, char *);
 void send_remote_simul(int, char *, char *, char *);
 void bot_share(int, char *);
 void bot_shareupdate(int, char *);
-int base64_to_int(char *);
 void init_botcmd(void);
 
 #endif /* !_BOTCMD_H */

src/botnet.c

@@ -117,15 +117,13 @@ void updatebot(int idx, char *who, char share, int vlocalhub, time_t vbuildts, c
 
 /* New botnet member
  */
-int addparty(char *bot, char *nick, int chan, char flag, int sock,
-	     char *from, int *idx)
+int addparty(char *bot, char *nick, int chan, char flag, int sock, char *from, int *idx)
 {
-  int i;
+  int i = 0;
 
   for (i = 0; i < parties; i++) {
     /* Just changing the channel of someone already on? */
-    if (!egg_strcasecmp(party[i].bot, bot) &&
-	(party[i].sock == sock)) {
+    if (!egg_strcasecmp(party[i].bot, bot) && (party[i].sock == sock)) {
       int oldchan = party[i].chan;
 
       party[i].chan = chan;

src/sprintf.c

@@ -62,7 +62,7 @@ size_t simple_vsnprintf(char *buf, size_t size, const char *format, va_list va)
   char *s = NULL;
   char *fp = (char *) format;
   size_t c = 0;
-  unsigned int i;
+  unsigned int i = 0;
 
   while (*fp && c < size - 1) {
     if (*fp == '%') {
@@ -79,6 +79,7 @@ size_t simple_vsnprintf(char *buf, size_t size, const char *format, va_list va)
       case 'D':
         i = va_arg(va, int);
         s = int_to_base64((unsigned int) i);
+        break;
       case 'u':
         i = va_arg(va, unsigned int);
         s = unsigned_int_to_base10(i);