[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Sat May 16 08:16:17 CST 2009


Committer  : cvs
CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2009-05-16 14:16:17 UTC

Modified files:
     doc/Changes1.6 src/botcmd.c src/chanprog.c src/dns.c src/net.c
     src/patch.h src/tcl.c src/tclmisc.c src/userent.c
     src/mod/blowfish.mod/blowfish.c src/mod/channels.mod/userchan.c
     src/mod/compress.mod/compress.c src/mod/filesys.mod/dbcompat.c
     src/mod/filesys.mod/filedb3.h src/mod/filesys.mod/files.c
     src/mod/filesys.mod/filesys.c src/mod/filesys.mod/tclfiles.c
     src/mod/irc.mod/tclirc.c src/mod/notes.mod/notes.c
     src/mod/server.mod/server.c

Log message:

Fixed a number of compiler warnings due to recent versions of GCC.
Fixes Bugzilla Bug # 450 "some warning during compile"

Patch by: pseudo

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.25 eggdrop1.6/doc/Changes1.6:1.26
--- eggdrop1.6/doc/Changes1.6:1.25	Sat May 16 07:16:55 2009
+++ eggdrop1.6/doc/Changes1.6	Sat May 16 08:16:06 2009
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.25 2009/05/16 13:16:55 tothwolf Exp $
+$Id: Changes1.6,v 1.26 2009/05/16 14:16:06 tothwolf Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,10 @@
 
 1.6.20 (CVS):
 
+  - Fixed a number of compiler warnings due to recent versions of GCC.
+    Fixes Bugzilla Bug # 450 "some warning during compile"
+    Patch by: pseudo
+
   - Fixed potential buffer overflow in readuserfile() that can occur on a
     leaf bot when a hub attempts to share ban/invite/exempt masks for a
     large number of channels that the leaf does not monitor.
Index: eggdrop1.6/src/botcmd.c
diff -u eggdrop1.6/src/botcmd.c:1.47 eggdrop1.6/src/botcmd.c:1.48
--- eggdrop1.6/src/botcmd.c:1.47	Sat Feb 16 15:41:03 2008
+++ eggdrop1.6/src/botcmd.c	Sat May 16 08:16:06 2009
@@ -3,7 +3,7 @@
  *   commands that comes across the botnet
  *   userfile transfer and update commands from sharebots
  *
- * $Id: botcmd.c,v 1.47 2008/02/16 21:41:03 guppy Exp $
+ * $Id: botcmd.c,v 1.48 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -99,7 +99,7 @@
  */
 static void bot_chan2(int idx, char *msg)
 {
-  char *from, *p;
+  char *from, *p, *s;
   int i, chan;
 
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
@@ -113,15 +113,13 @@
 #endif
     chan = base64_to_int(p);
   /* Strip annoying control chars */
-  for (p = from; *p;) {
-    if ((*p < 32) || (*p == 127))
-      strcpy(p, p + 1);
-    else
-      p++;
-  }
+  for (p = s = from; *s; s++)
+    if ((*s > 31) && (*s != 127))
+      *p++ = *s;
+  *p = 0;
   p = strchr(from, '@');
   if (p) {
-    sprintf(TBUF, "<%s> %s", from, msg);
+    snprintf(TBUF, sizeof(TBUF), "<%s> %s", from, msg);
     *p = 0;
     if (!partyidle(p + 1, from)) {
       *p = '@';
@@ -178,7 +176,7 @@
  */
 static void bot_actchan(int idx, char *par)
 {
-  char *from, *p;
+  char *from, *p, *s;
   int i, chan;
 
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
@@ -210,12 +208,10 @@
   else
 #endif
     chan = base64_to_int(p);
-  for (p = from; *p;) {
-    if ((*p < 32) || (*p == 127))
-      strcpy(p, p + 1);
-    else
-      p++;
-  }
+  for (p = s = from; *s; s++)
+    if ((*s > 31) && (*s != 127))
+      *p++ = *s;
+  *p = 0;
   chanout_but(-1, chan, "* %s %s\n", from, par);
   botnet_send_act(idx, from, NULL, chan, par);
   check_tcl_act(from, chan, par);
Index: eggdrop1.6/src/chanprog.c
diff -u eggdrop1.6/src/chanprog.c:1.61 eggdrop1.6/src/chanprog.c:1.62
--- eggdrop1.6/src/chanprog.c:1.61	Sat Feb 16 15:41:03 2008
+++ eggdrop1.6/src/chanprog.c	Sat May 16 08:16:06 2009
@@ -7,7 +7,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.61 2008/02/16 21:41:03 guppy Exp $
+ * $Id: chanprog.c,v 1.62 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -668,7 +668,7 @@
 {
   register char *ptr = NULL, *s = NULL, *n = NULL;
 
-  if (!owner || !name)
+  if (!name)
     return 0;
 
   ptr = owner - 1;
Index: eggdrop1.6/src/dns.c
diff -u eggdrop1.6/src/dns.c:1.35 eggdrop1.6/src/dns.c:1.36
--- eggdrop1.6/src/dns.c:1.35	Sat Feb 16 15:41:03 2008
+++ eggdrop1.6/src/dns.c	Sat May 16 08:16:06 2009
@@ -4,7 +4,7 @@
  *   provides the code used by the bot if the DNS module is not loaded
  *   DNS Tcl commands
  *
- * $Id: dns.c,v 1.35 2008/02/16 21:41:03 guppy Exp $
+ * $Id: dns.c,v 1.36 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Written by Fabian Knittel <fknittel at gmx.de>
@@ -64,7 +64,7 @@
 
 static void display_dcc_dnswait(int idx, char *buf)
 {
-  sprintf(buf, "dns   waited %lis", now - dcc[idx].timeval);
+  sprintf(buf, "dns   waited %lis", (long) now - dcc[idx].timeval);
 }
 
 static int expmem_dcc_dnswait(void *x)
Index: eggdrop1.6/src/mod/blowfish.mod/blowfish.c
diff -u eggdrop1.6/src/mod/blowfish.mod/blowfish.c:1.34 eggdrop1.6/src/mod/blowfish.mod/blowfish.c:1.35
--- eggdrop1.6/src/mod/blowfish.mod/blowfish.c:1.34	Sat Feb 16 15:41:06 2008
+++ eggdrop1.6/src/mod/blowfish.mod/blowfish.c	Sat May 16 08:16:06 2009
@@ -2,7 +2,7 @@
  * blowfish.c -- part of blowfish.mod
  *   encryption and decryption of passwords
  *
- * $Id: blowfish.c,v 1.34 2008/02/16 21:41:06 guppy Exp $
+ * $Id: blowfish.c,v 1.35 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -216,7 +216,7 @@
   bf_P = box[bx].P;
   bf_S = box[bx].S;
   box[bx].keybytes = keybytes;
-  strncpy(box[bx].key, key, keybytes);
+  strncpy(box[bx].key, (char *) key, keybytes);
   box[bx].key[keybytes] = 0;
   box[bx].lastuse = now;
   /* Robey: Reset blowfish boxes to initial state
@@ -319,14 +319,14 @@
   strcpy(s, str);
   if ((!key) || (!key[0]))
     return s;
-  p = s;
+  p = (unsigned char *) s;
   dest = nmalloc((strlen(str) + 9) * 2);
   while (*p)
     p++;
   for (i = 0; i < 8; i++)
     *p++ = 0;
   blowfish_init((unsigned char *) key, strlen(key));
-  p = s;
+  p = (unsigned char *) s;
   d = dest;
   while (*p) {
     left = ((*p++) << 24);
Index: eggdrop1.6/src/mod/channels.mod/userchan.c
diff -u eggdrop1.6/src/mod/channels.mod/userchan.c:1.50 eggdrop1.6/src/mod/channels.mod/userchan.c:1.51
--- eggdrop1.6/src/mod/channels.mod/userchan.c:1.50	Sat Feb 16 15:41:07 2008
+++ eggdrop1.6/src/mod/channels.mod/userchan.c	Sat May 16 08:16:06 2009
@@ -1,7 +1,7 @@
 /*
  * userchan.c -- part of channels.mod
  *
- * $Id: userchan.c,v 1.50 2008/02/16 21:41:07 guppy Exp $
+ * $Id: userchan.c,v 1.51 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1077,7 +1077,7 @@
         fprintf(f, "- %s:%s%lu%s:+%lu:%lu:%s:%s\n", mask,
                 (b->flags & MASKREC_PERM) ? "+" : "", expire,
                 (b->flags & MASKREC_STICKY) ? "*" : "", added,
-                b->lastactive, b->user ? b->user : botnetnick,
+                (long) b->lastactive, b->user ? b->user : botnetnick,
                 b->desc ? b->desc : "requested") == EOF) {
       if (mask)
         nfree(mask);
@@ -1104,7 +1104,7 @@
               fprintf(f, "- %s:%s%lu%s:+%lu:%lu:%s:%s\n", mask,
                       (b->flags & MASKREC_PERM) ? "+" : "", expire,
                       (b->flags & MASKREC_STICKY) ? "*" : "", added,
-                      b->lastactive, b->user ? b->user : botnetnick,
+                      (long) b->lastactive, b->user ? b->user : botnetnick,
                       b->desc ? b->desc : "requested") == EOF) {
             if (mask)
               nfree(mask);
@@ -1137,7 +1137,7 @@
         fprintf(f, "%s %s:%s%lu%s:+%lu:%lu:%s:%s\n", "%", mask,
                 (e->flags & MASKREC_PERM) ? "+" : "", expire,
                 (e->flags & MASKREC_STICKY) ? "*" : "", added,
-                e->lastactive, e->user ? e->user : botnetnick,
+                (long) e->lastactive, e->user ? e->user : botnetnick,
                 e->desc ? e->desc : "requested") == EOF) {
       if (mask)
         nfree(mask);
@@ -1164,7 +1164,7 @@
               fprintf(f, "%s %s:%s%lu%s:+%lu:%lu:%s:%s\n", "%", mask,
                       (e->flags & MASKREC_PERM) ? "+" : "", expire,
                       (e->flags & MASKREC_STICKY) ? "*" : "", added,
-                      e->lastactive, e->user ? e->user : botnetnick,
+                      (long) e->lastactive, e->user ? e->user : botnetnick,
                       e->desc ? e->desc : "requested") == EOF) {
             if (mask)
               nfree(mask);
@@ -1197,7 +1197,7 @@
         fprintf(f, "@ %s:%s%lu%s:+%lu:%lu:%s:%s\n", mask,
                 (ir->flags & MASKREC_PERM) ? "+" : "", expire,
                 (ir->flags & MASKREC_STICKY) ? "*" : "", added,
-                ir->lastactive, ir->user ? ir->user : botnetnick,
+                (long) ir->lastactive, ir->user ? ir->user : botnetnick,
                 ir->desc ? ir->desc : "requested") == EOF) {
       if (mask)
         nfree(mask);
@@ -1224,7 +1224,7 @@
               fprintf(f, "@ %s:%s%lu%s:+%lu:%lu:%s:%s\n", mask,
                       (ir->flags & MASKREC_PERM) ? "+" : "", expire,
                       (ir->flags & MASKREC_STICKY) ? "*" : "", added,
-                      ir->lastactive, ir->user ? ir->user : botnetnick,
+                      (long) ir->lastactive, ir->user ? ir->user : botnetnick,
                       ir->desc ? ir->desc : "requested") == EOF) {
             if (mask)
               nfree(mask);
Index: eggdrop1.6/src/mod/compress.mod/compress.c
diff -u eggdrop1.6/src/mod/compress.mod/compress.c:1.28 eggdrop1.6/src/mod/compress.mod/compress.c:1.29
--- eggdrop1.6/src/mod/compress.mod/compress.c:1.28	Sat Feb 16 15:41:07 2008
+++ eggdrop1.6/src/mod/compress.mod/compress.c	Sat May 16 08:16:07 2009
@@ -6,7 +6,7 @@
  * Written by Fabian Knittel <fknittel at gmx.de>. Based on zlib examples
  * by Jean-loup Gailly and Miguel Albrecht.
  *
- * $Id: compress.c,v 1.28 2008/02/16 21:41:07 guppy Exp $
+ * $Id: compress.c,v 1.29 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 2000 - 2008 Eggheads Development Team
@@ -368,9 +368,9 @@
  */
 
 static tcl_ints my_tcl_ints[] = {
-  {"share-compressed", &share_compressed},
-  {"compress-level",     &compress_level},
-  {NULL,                            NULL}
+  {"share-compressed", (int *)&share_compressed},
+  {"compress-level",     (int *)&compress_level},
+  {NULL,                                   NULL}
 };
 
 static int compress_expmem(void)
Index: eggdrop1.6/src/mod/filesys.mod/dbcompat.c
diff -u eggdrop1.6/src/mod/filesys.mod/dbcompat.c:1.21 eggdrop1.6/src/mod/filesys.mod/dbcompat.c:1.22
--- eggdrop1.6/src/mod/filesys.mod/dbcompat.c:1.21	Sat Feb 16 15:41:08 2008
+++ eggdrop1.6/src/mod/filesys.mod/dbcompat.c	Sat May 16 08:16:07 2009
@@ -4,7 +4,7 @@
  *
  * Written for filedb3 by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: dbcompat.c,v 1.21 2008/02/16 21:41:08 guppy Exp $
+ * $Id: dbcompat.c,v 1.22 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -119,7 +119,7 @@
                 break_down_flags(nick + 1, &fr, NULL);
                 build_flags(x, &fr, NULL);
                 /* We only want valid flags */
-                malloc_strcpy(fdbe->flags_req, x);
+                malloc_strcpy_nocheck(fdbe->flags_req, x);
               }
             }
             fdbe->size = st.st_size;
@@ -165,7 +165,7 @@
         if (fdb1.uploader[0])
           malloc_strcpy(fdbe->uploader, fdb1.uploader);
         if (fdb1.flags_req[0])
-          malloc_strcpy(fdbe->flags_req, fdb1.flags_req);
+          malloc_strcpy(fdbe->flags_req, (char *) fdb1.flags_req);
         fdbe->uploaded = fdb1.uploaded;
         fdbe->size = fdb1.size;
         fdbe->gots = fdb1.gots;
Index: eggdrop1.6/src/mod/filesys.mod/filedb3.h
diff -u eggdrop1.6/src/mod/filesys.mod/filedb3.h:1.22 eggdrop1.6/src/mod/filesys.mod/filedb3.h:1.23
--- eggdrop1.6/src/mod/filesys.mod/filedb3.h:1.22	Sat Feb 16 15:41:08 2008
+++ eggdrop1.6/src/mod/filesys.mod/filedb3.h	Sat May 16 08:16:07 2009
@@ -4,7 +4,7 @@
  *
  * Written by Fabian Knittel <fknittel at gmx.de>
  *
- * $Id: filedb3.h,v 1.22 2008/02/16 21:41:08 guppy Exp $
+ * $Id: filedb3.h,v 1.23 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1999 - 2008 Eggheads Development Team
@@ -99,6 +99,12 @@
     my_free(target);                                                    \
 } while (0)
 
+#define malloc_strcpy_nocheck(target, entry)                            \
+do {                                                                    \
+  (target) = nrealloc((target), strlen(entry) + 1);                     \
+  strcpy((target), (entry));                                            \
+} while (0)
+
 /* Macro to calculate the total length of dynamic data. */
 #define filedb_tot_dynspace(fdh) ((fdh).filename_len + (fdh).desc_len + \
         (fdh).chan_len + (fdh).uploader_len + (fdh).flags_req_len + \
Index: eggdrop1.6/src/mod/filesys.mod/files.c
diff -u eggdrop1.6/src/mod/filesys.mod/files.c:1.53 eggdrop1.6/src/mod/filesys.mod/files.c:1.54
--- eggdrop1.6/src/mod/filesys.mod/files.c:1.53	Sat Feb 16 15:41:08 2008
+++ eggdrop1.6/src/mod/filesys.mod/files.c	Sat May 16 08:16:07 2009
@@ -2,7 +2,7 @@
  * files.c - part of filesys.mod
  *   handles all file system commands
  *
- * $Id: files.c,v 1.53 2008/02/16 21:41:08 guppy Exp $
+ * $Id: files.c,v 1.54 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1014,7 +1014,7 @@
 
       break_down_flags(flags, &fr, NULL);
       build_flags(buffer, &fr, NULL);
-      malloc_strcpy(fdbe->flags_req, buffer);
+      malloc_strcpy_nocheck(fdbe->flags_req, buffer);
       dprintf(idx, FILES_CHGACCESS, name, buffer);
     } else if (!chan[0]) {
       my_free(fdbe->flags_req);
Index: eggdrop1.6/src/mod/filesys.mod/filesys.c
diff -u eggdrop1.6/src/mod/filesys.mod/filesys.c:1.74 eggdrop1.6/src/mod/filesys.mod/filesys.c:1.75
--- eggdrop1.6/src/mod/filesys.mod/filesys.c:1.74	Sat Feb 16 15:41:09 2008
+++ eggdrop1.6/src/mod/filesys.mod/filesys.c	Sat May 16 08:16:07 2009
@@ -2,7 +2,7 @@
  * filesys.c -- part of filesys.mod
  *   main file of the filesys eggdrop module
  *
- * $Id: filesys.c,v 1.74 2008/02/16 21:41:09 guppy Exp $
+ * $Id: filesys.c,v 1.75 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -464,7 +464,7 @@
   if (at_limit(nick)) {
     char xxx[1024];
 
-    sprintf(xxx, "%d*%s%s", strlen(dccdir), dccdir, dir);
+    sprintf(xxx, "%d*%s%s", (int) strlen(dccdir), dccdir, dir);
     queue_file(xxx, fn, dcc[idx].nick, nick);
     dprintf(idx, "Queued: %s to %s\n", fn, nick);
     my_free(s);
Index: eggdrop1.6/src/mod/filesys.mod/tclfiles.c
diff -u eggdrop1.6/src/mod/filesys.mod/tclfiles.c:1.28 eggdrop1.6/src/mod/filesys.mod/tclfiles.c:1.29
--- eggdrop1.6/src/mod/filesys.mod/tclfiles.c:1.28	Sat Feb 16 15:41:09 2008
+++ eggdrop1.6/src/mod/filesys.mod/tclfiles.c	Sat May 16 08:16:07 2009
@@ -2,7 +2,7 @@
  * tclfiles.c -- part of filesys.mod
  *   Tcl stubs for file system commands moved here to support modules
  *
- * $Id: tclfiles.c,v 1.28 2008/02/16 21:41:09 guppy Exp $
+ * $Id: tclfiles.c,v 1.29 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -237,7 +237,7 @@
 
     break_down_flags(argv[2], &fr, NULL);
     build_flags(f, &fr, NULL);
-    malloc_strcpy(fdbe->flags_req, f);
+    malloc_strcpy_nocheck(fdbe->flags_req, f);
   } else
     my_free(fdbe->flags_req);
   if (argc == 4)
@@ -350,7 +350,7 @@
 
     break_down_flags(argv[2], &fr, NULL);
     build_flags(f, &fr, NULL);
-    malloc_strcpy(fdbe->flags_req, f);
+    malloc_strcpy_nocheck(fdbe->flags_req, f);
   } else if (fdbe->flags_req) {
     my_free(fdbe->flags_req);
   }
Index: eggdrop1.6/src/mod/irc.mod/tclirc.c
diff -u eggdrop1.6/src/mod/irc.mod/tclirc.c:1.54 eggdrop1.6/src/mod/irc.mod/tclirc.c:1.55
--- eggdrop1.6/src/mod/irc.mod/tclirc.c:1.54	Thu May  7 16:01:42 2009
+++ eggdrop1.6/src/mod/irc.mod/tclirc.c	Sat May 16 08:16:07 2009
@@ -1,7 +1,7 @@
 /*
  * tclirc.c -- part of irc.mod
  *
- * $Id: tclirc.c,v 1.54 2009/05/07 22:01:42 tothwolf Exp $
+ * $Id: tclirc.c,v 1.55 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -627,7 +627,7 @@
     Tcl_AppendResult(irp, argv[1], " is not on ", argv[2], NULL);
     return TCL_ERROR;
   }
-  sprintf(s, "%lu", m->joined);
+  sprintf(s, "%lu", (unsigned long) m->joined);
   Tcl_AppendResult(irp, s, NULL);
   return TCL_OK;
 }
Index: eggdrop1.6/src/mod/notes.mod/notes.c
diff -u eggdrop1.6/src/mod/notes.mod/notes.c:1.57 eggdrop1.6/src/mod/notes.mod/notes.c:1.58
--- eggdrop1.6/src/mod/notes.mod/notes.c:1.57	Sat Feb 16 15:41:09 2008
+++ eggdrop1.6/src/mod/notes.mod/notes.c	Sat May 16 08:16:07 2009
@@ -5,7 +5,7 @@
  *   note cmds
  *   note ignores
  *
- * $Id: notes.c,v 1.57 2008/02/16 21:41:09 guppy Exp $
+ * $Id: notes.c,v 1.58 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -313,7 +313,8 @@
           else if (argv[1][0] == '@')
             from = p + 1;
         }
-        fprintf(f, "%s %s %li %s%s\n", to, from, now, l ? work : "", blah);
+        fprintf(f, "%s %s %li %s%s\n", to, from, (long) now,
+                l ? work : "", blah);
         fclose(f);
         if (idx >= 0)
           dprintf(idx, "%s.\n", NOTES_STORED_MESSAGE);
@@ -813,7 +814,7 @@
       return 1;
     }
     chmod(notefile, userfile_perm); /* Use userfile permissions. */
-    fprintf(f, "%s %s %li %s\n", to, u->handle, now, par);
+    fprintf(f, "%s %s %li %s\n", to, u->handle, (long) now, par);
     fclose(f);
     dprintf(DP_HELP, "NOTICE %s :%s\n", nick, NOTES_DELIVERED);
     return 1;
Index: eggdrop1.6/src/mod/server.mod/server.c
diff -u eggdrop1.6/src/mod/server.mod/server.c:1.128 eggdrop1.6/src/mod/server.mod/server.c:1.129
--- eggdrop1.6/src/mod/server.mod/server.c:1.128	Sat Feb 16 15:41:10 2008
+++ eggdrop1.6/src/mod/server.mod/server.c	Sat May 16 08:16:07 2009
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.128 2008/02/16 21:41:10 guppy Exp $
+ * $Id: server.c,v 1.129 2009/05/16 14:16:07 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -943,7 +943,7 @@
 
 /* Add a new server to the server_list.
  */
-static void add_server(char *ss)
+static void add_server(const char *ss)
 {
   struct server_list *x, *z;
   char *p, *q;
Index: eggdrop1.6/src/net.c
diff -u eggdrop1.6/src/net.c:1.80 eggdrop1.6/src/net.c:1.81
--- eggdrop1.6/src/net.c:1.80	Sat Feb 16 15:41:04 2008
+++ eggdrop1.6/src/net.c	Sat May 16 08:16:06 2009
@@ -2,7 +2,7 @@
  * net.c -- handles:
  *   all raw network i/o
  *
- * $Id: net.c,v 1.80 2008/02/16 21:41:04 guppy Exp $
+ * $Id: net.c,v 1.81 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * This is hereby released into the public domain.
@@ -1080,7 +1080,8 @@
       if (socklist[i].flags & SOCK_NONSOCK)
         strcat(s, " (file)");
       if (socklist[i].inbuf != NULL)
-        sprintf(&s[strlen(s)], " (inbuf: %04X)", strlen(socklist[i].inbuf));
+        sprintf(&s[strlen(s)], " (inbuf: %04X)",
+                (unsigned int) strlen(socklist[i].inbuf));
       if (socklist[i].outbuf != NULL)
         sprintf(&s[strlen(s)], " (outbuf: %06lX)", socklist[i].outbuflen);
       strcat(s, ",");
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1203 eggdrop1.6/src/patch.h:1.1204
--- eggdrop1.6/src/patch.h:1.1203	Sat May 16 07:16:55 2009
+++ eggdrop1.6/src/patch.h	Sat May 16 08:16:06 2009
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1203 2009/05/16 13:16:55 tothwolf Exp $
+ * $Id: patch.h,v 1.1204 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1242479709");            /* current unixtime */
+patch("1242483323");            /* current unixtime */
 /*
  *
  *
  */
-patch("ignchans");
+patch("lesswarnings");
 /*
  *
  *
Index: eggdrop1.6/src/tcl.c
diff -u eggdrop1.6/src/tcl.c:1.88 eggdrop1.6/src/tcl.c:1.89
--- eggdrop1.6/src/tcl.c:1.88	Sat Feb 16 15:41:04 2008
+++ eggdrop1.6/src/tcl.c	Sat May 16 08:16:06 2009
@@ -4,7 +4,7 @@
  *   Tcl initialization
  *   getting and setting Tcl/eggdrop variables
  *
- * $Id: tcl.c,v 1.88 2008/02/16 21:41:04 guppy Exp $
+ * $Id: tcl.c,v 1.89 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -728,7 +728,7 @@
 int readtclprog(char *fname)
 {
   int code;
-  char *result;
+  EGG_CONST char *result;
 #ifdef USE_TCL_ENCODING
   Tcl_DString dstr;
 #endif
Index: eggdrop1.6/src/tclmisc.c
diff -u eggdrop1.6/src/tclmisc.c:1.61 eggdrop1.6/src/tclmisc.c:1.62
--- eggdrop1.6/src/tclmisc.c:1.61	Fri Jul 11 06:48:59 2008
+++ eggdrop1.6/src/tclmisc.c	Sat May 16 08:16:06 2009
@@ -2,7 +2,7 @@
  * tclmisc.c -- handles:
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.61 2008/07/11 12:48:59 tothwolf Exp $
+ * $Id: tclmisc.c,v 1.62 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -378,7 +378,7 @@
 
   BADARGS(1, 1, "");
 
-  egg_snprintf(s, sizeof s, "%li", now2);
+  egg_snprintf(s, sizeof s, "%li", (long) now2);
   Tcl_AppendResult(irp, s, NULL);
   return TCL_OK;
 }
Index: eggdrop1.6/src/userent.c
diff -u eggdrop1.6/src/userent.c:1.36 eggdrop1.6/src/userent.c:1.37
--- eggdrop1.6/src/userent.c:1.36	Sat Feb 16 15:41:05 2008
+++ eggdrop1.6/src/userent.c	Sat May 16 08:16:06 2009
@@ -1,8 +1,8 @@
 /*
  * userent.c -- handles:
- *   user-entry handling, new stylem more versatile.
+ *   user-entry handling, new style more versatile.
  *
- * $Id: userent.c,v 1.36 2008/02/16 21:41:05 guppy Exp $
+ * $Id: userent.c,v 1.37 2009/05/16 14:16:06 tothwolf Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -684,7 +684,7 @@
     shareout(NULL, "c XTRA %s %s %s\n", u->handle, new->key,
              new->data ? new->data : "");
   if ((old && old != new) || !new->data || !new->data[0]) {
-    list_delete((struct list_type **) (&e->u.extra), (struct list_type *) old);
+    list_delete(&e->u.list, (struct list_type *) old);
     nfree(old->key);
     nfree(old->data);
     nfree(old);
----------------------- End of diff -----------------------



More information about the Changes mailing list