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

cvs at eggheads.org cvs at eggheads.org
Sun Feb 7 11:21:24 CST 2010


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2010-02-07 17:21:24 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     doc/Changes1.6 src/modules.c src/patch.h src/tcluser.c
     src/userent.c src/users.c src/users.h src/mod/module.h
     src/mod/channels.mod/tclchan.c src/mod/server.mod/server.c
     src/mod/share.mod/share.c

Log message:

Renamed list_delete/list_append/list_contains functions to egg_list_* due to request to avoid conflicts with MySQL headers.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.62 eggdrop1.6/doc/Changes1.6:1.63
--- eggdrop1.6/doc/Changes1.6:1.62	Sat Feb  6 03:20:12 2010
+++ eggdrop1.6/doc/Changes1.6	Sun Feb  7 11:21:14 2010
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.62 2010/02/06 09:20:12 pseudo Exp $
+$Id: Changes1.6,v 1.63 2010/02/07 17:21:14 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,10 @@
 
 1.6.20 (CVS):
 
+  - Renamed list_delete/list_append/list_contains functions to egg_list_* due
+    to request to avoid conflicts with MySQL headers.
+    Found by: BarkerJr / Patch by: pseudo
+
   - Updated module versions and dependencies for the console, channels, irc
     and server modules.
     Patch by: pseudo
Index: eggdrop1.6/src/mod/channels.mod/tclchan.c
diff -u eggdrop1.6/src/mod/channels.mod/tclchan.c:1.102 eggdrop1.6/src/mod/channels.mod/tclchan.c:1.103
--- eggdrop1.6/src/mod/channels.mod/tclchan.c:1.102	Sun Jan  3 07:27:41 2010
+++ eggdrop1.6/src/mod/channels.mod/tclchan.c	Sun Feb  7 11:21:14 2010
@@ -1,7 +1,7 @@
 /*
  * tclchan.c -- part of channels.mod
  *
- * $Id: tclchan.c,v 1.102 2010/01/03 13:27:41 pseudo Exp $
+ * $Id: tclchan.c,v 1.103 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1946,7 +1946,7 @@
 
     /* Initialize chan->channel info */
     init_channel(chan, 0);
-    list_append((struct list_type **) &chanset, (struct list_type *) chan);
+    egg_list_append((struct list_type **) &chanset, (struct list_type *) chan);
     /* Channel name is stored in xtra field for sharebot stuff */
     join = 1;
   }
Index: eggdrop1.6/src/mod/module.h
diff -u eggdrop1.6/src/mod/module.h:1.91 eggdrop1.6/src/mod/module.h:1.92
--- eggdrop1.6/src/mod/module.h:1.91	Thu Jan  7 07:48:31 2010
+++ eggdrop1.6/src/mod/module.h	Sun Feb  7 11:21:14 2010
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.91 2010/01/07 13:48:31 pseudo Exp $
+ * $Id: module.h,v 1.92 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -188,9 +188,9 @@
 #define chanout_but ((void(*)())global[71])
 /* 72 - 75 */
 #define check_validity ((int (*) (char *,Function))global[72])
-#define list_delete ((int (*)( struct list_type **, struct list_type *))global[73])
-#define list_append ((int (*) ( struct list_type **, struct list_type *))global[74])
-#define list_contains ((int (*) (struct list_type *, struct list_type *))global[75])
+#define egg_list_delete ((int (*)( struct list_type **, struct list_type *))global[73])
+#define egg_list_append ((int (*) ( struct list_type **, struct list_type *))global[74])
+#define egg_list_contains ((int (*) (struct list_type *, struct list_type *))global[75])
 /* 76 - 79 */
 #define answer ((int (*) (int,char *,unsigned long *,unsigned short *,int))global[76])
 #define getmyip ((IP (*) (void))global[77])
Index: eggdrop1.6/src/mod/server.mod/server.c
diff -u eggdrop1.6/src/mod/server.mod/server.c:1.135 eggdrop1.6/src/mod/server.mod/server.c:1.136
--- eggdrop1.6/src/mod/server.mod/server.c:1.135	Sat Feb  6 03:20:12 2010
+++ eggdrop1.6/src/mod/server.mod/server.c	Sun Feb  7 11:21:14 2010
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.135 2010/02/06 09:20:12 pseudo Exp $
+ * $Id: server.c,v 1.136 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1052,7 +1052,8 @@
       strcpy(x->pass, pass);
     } else
       x->pass = NULL;
-    list_append((struct list_type **) (&serverlist), (struct list_type *) x);
+    egg_list_append((struct list_type **) (&serverlist),
+                    (struct list_type *) x);
     *ptr = i;
     return;
   }
Index: eggdrop1.6/src/mod/share.mod/share.c
diff -u eggdrop1.6/src/mod/share.mod/share.c:1.90 eggdrop1.6/src/mod/share.mod/share.c:1.91
--- eggdrop1.6/src/mod/share.mod/share.c:1.90	Sun Jan  3 07:27:55 2010
+++ eggdrop1.6/src/mod/share.mod/share.c	Sun Feb  7 11:21:14 2010
@@ -1,7 +1,7 @@
 /*
  * share.c -- part of share.mod
  *
- * $Id: share.c,v 1.90 2010/01/03 13:27:55 pseudo Exp $
+ * $Id: share.c,v 1.91 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -630,7 +630,7 @@
           }
           uet->got_share(u, e, par, idx);
           if (!e->u.list) {
-            list_delete((struct list_type **) &(u->entries),
+            egg_list_delete((struct list_type **) &(u->entries),
                         (struct list_type *) e);
             nfree(e);
           }
@@ -1694,7 +1694,7 @@
             list->next = NULL;
             list->extra = user_malloc(strlen(lt->extra) + 1);
             strcpy(list->extra, lt->extra);
-            list_append((&nue->u.list), list);
+            egg_list_append((&nue->u.list), list);
           }
         } else {
           if (ue->type->dup_user && (t || ue->type->got_share))
Index: eggdrop1.6/src/modules.c
diff -u eggdrop1.6/src/modules.c:1.104 eggdrop1.6/src/modules.c:1.105
--- eggdrop1.6/src/modules.c:1.104	Thu Jan  7 07:48:31 2010
+++ eggdrop1.6/src/modules.c	Sun Feb  7 11:21:14 2010
@@ -4,7 +4,7 @@
  *
  * by Darrin Smith (beldin at light.iinet.net.au)
  *
- * $Id: modules.c,v 1.104 2010/01/07 13:48:31 pseudo Exp $
+ * $Id: modules.c,v 1.105 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -287,9 +287,9 @@
   (Function) chanout_but,
   /* 72 - 75 */
   (Function) check_validity,
-  (Function) list_delete,
-  (Function) list_append,
-  (Function) list_contains,
+  (Function) egg_list_delete,
+  (Function) egg_list_append,
+  (Function) egg_list_contains,
   /* 76 - 79 */
   (Function) answer,
   (Function) getmyip,
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1232 eggdrop1.6/src/patch.h:1.1233
--- eggdrop1.6/src/patch.h:1.1232	Wed Feb  3 02:58:24 2010
+++ eggdrop1.6/src/patch.h	Sun Feb  7 11:21:14 2010
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1232 2010/02/03 08:58:24 pseudo Exp $
+ * $Id: patch.h,v 1.1233 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1265187270");            /* current unixtime */
+patch("1265562606");            /* current unixtime */
 /*
  *
  *
  */
-patch("cidr-isdigit");
+patch("list_delete");
 /*
  *
  *
Index: eggdrop1.6/src/tcluser.c
diff -u eggdrop1.6/src/tcluser.c:1.49 eggdrop1.6/src/tcluser.c:1.50
--- eggdrop1.6/src/tcluser.c:1.49	Mon Jan  4 07:15:11 2010
+++ eggdrop1.6/src/tcluser.c	Sun Feb  7 11:21:14 2010
@@ -2,7 +2,7 @@
  * tcluser.c -- handles:
  *   Tcl stubs for the user-record-oriented commands
  *
- * $Id: tcluser.c,v 1.49 2010/01/04 13:15:11 pseudo Exp $
+ * $Id: tcluser.c,v 1.50 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -589,7 +589,7 @@
   }
   r = et->tcl_set(irp, u, e, argc, argv);
   /* Yeah... e is freed, and we read it... (tcl: setuser hand HOSTS none) */
-  if ((!e->u.list) && (list_delete((struct list_type **) &(u->entries),
+  if ((!e->u.list) && (egg_list_delete((struct list_type **) &(u->entries),
       (struct list_type *) e)))
     nfree(e);
     /* else maybe already freed... (entry_type==HOSTS) <drummer> */
Index: eggdrop1.6/src/userent.c
diff -u eggdrop1.6/src/userent.c:1.39 eggdrop1.6/src/userent.c:1.40
--- eggdrop1.6/src/userent.c:1.39	Thu Jan  7 07:48:31 2010
+++ eggdrop1.6/src/userent.c	Sun Feb  7 11:21:14 2010
@@ -2,7 +2,7 @@
  * userent.c -- handles:
  *   user-entry handling, new style more versatile.
  *
- * $Id: userent.c,v 1.39 2010/01/07 13:48:31 pseudo Exp $
+ * $Id: userent.c,v 1.40 2010/02/07 17:21:14 pseudo 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(&e->u.list, (struct list_type *) old);
+    egg_list_delete(&e->u.list, (struct list_type *) old);
     nfree(old->key);
     nfree(old->data);
     nfree(old);
@@ -1080,14 +1080,14 @@
   "HOSTS"
 };
 
-int list_append(struct list_type **h, struct list_type *i)
+int egg_list_append(struct list_type **h, struct list_type *i)
 {
   for (; *h; h = &((*h)->next));
   *h = i;
   return 1;
 }
 
-int list_delete(struct list_type **h, struct list_type *i)
+int egg_list_delete(struct list_type **h, struct list_type *i)
 {
   for (; *h; h = &((*h)->next))
     if (*h == i) {
@@ -1097,7 +1097,7 @@
   return 0;
 }
 
-int list_contains(struct list_type *h, struct list_type *i)
+int egg_list_contains(struct list_type *h, struct list_type *i)
 {
   for (; h; h = h->next)
     if (h == i) {
@@ -1138,7 +1138,7 @@
       e->type = NULL;
     }
   }
-  return list_delete((struct list_type **) &entry_type_list,
+  return egg_list_delete((struct list_type **) &entry_type_list,
                      (struct list_type *) type);
 }
 
@@ -1198,7 +1198,7 @@
   }
   r = et->set(u, e, d);
   if (!e->u.list) {
-    list_delete((struct list_type **) &(u->entries), (struct list_type *) e);
+    egg_list_delete((struct list_type **) &(u->entries), (struct list_type *) e);
     nfree(e);
   }
   return r;
Index: eggdrop1.6/src/users.c
diff -u eggdrop1.6/src/users.c:1.58 eggdrop1.6/src/users.c:1.59
--- eggdrop1.6/src/users.c:1.58	Thu Jan  7 07:48:31 2010
+++ eggdrop1.6/src/users.c	Sun Feb  7 11:21:14 2010
@@ -10,7 +10,7 @@
  *
  * dprintf'ized, 9nov1995
  *
- * $Id: users.c,v 1.58 2010/01/07 13:48:31 pseudo Exp $
+ * $Id: users.c,v 1.59 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -885,7 +885,7 @@
                 list->next = NULL;
                 list->extra = user_malloc(strlen(s) + 1);
                 strcpy(list->extra, s);
-                list_append((&ue->u.list), list);
+                egg_list_append((&ue->u.list), list);
                 ok = 1;
               }
             if (!ok) {
Index: eggdrop1.6/src/users.h
diff -u eggdrop1.6/src/users.h:1.19 eggdrop1.6/src/users.h:1.20
--- eggdrop1.6/src/users.h:1.19	Sun Jan  3 07:27:32 2010
+++ eggdrop1.6/src/users.h	Sun Feb  7 11:21:14 2010
@@ -2,7 +2,7 @@
  * users.h
  *   structures and definitions used by users.c and userrec.c
  *
- * $Id: users.h,v 1.19 2010/01/03 13:27:32 pseudo Exp $
+ * $Id: users.h,v 1.20 2010/02/07 17:21:14 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -36,9 +36,9 @@
         (b)->next = *(a);                                               \
         *(a) = (b);                                                     \
 }
-int list_append(struct list_type **, struct list_type *);
-int list_delete(struct list_type **, struct list_type *);
-int list_contains(struct list_type *, struct list_type *);
+int egg_list_append(struct list_type **, struct list_type *);
+int egg_list_delete(struct list_type **, struct list_type *);
+int egg_list_contains(struct list_type *, struct list_type *);
 
 
 /* New userfile format stuff
----------------------- End of diff -----------------------


More information about the Changes mailing list