[cvslog] (2004-03-01 22:58:43 UTC) Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Mon Mar 1 16:58:43 CST 2004


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2004-03-01 22:58:43 UTC
Commited by: stdarg <stdarg at techmonkeys.org>

Modified files:
     lib/eggdrop/eggmod.c lib/eggdrop/eggmod.h
     lib/eggdrop/hash_table.c lib/eggdrop/hash_table.h
     lib/eggdrop/help.c lib/eggdrop/users.c lib/eggdrop/xml.c
     lib/eggdrop/xml.h modules/script/scriptbind.c
     modules/server/channels.c modules/server/input.c
     modules/server/scriptcmds.c modules/server/server.c
     modules/server/server.h po/eggdrop.pot src/core_config.c

Log message:

* Fixed some valgrind errors; still a few in xml* though.

---------------------- diff included ----------------------
Index: eggdrop1.7/lib/eggdrop/eggmod.c
diff -u eggdrop1.7/lib/eggdrop/eggmod.c:1.10 eggdrop1.7/lib/eggdrop/eggmod.c:1.11
--- eggdrop1.7/lib/eggdrop/eggmod.c:1.10	Thu Dec 18 19:08:58 2003
+++ eggdrop1.7/lib/eggdrop/eggmod.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: eggmod.c,v 1.10 2003/12/19 01:08:58 stdarg Exp $";
+static const char rcsid[] = "$Id: eggmod.c,v 1.11 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -102,7 +102,11 @@
 	entry->refcount = 0;
 	module_list_head = entry;
 
-	if (startfunc(&entry->modinfo)) return(-4);
+	if (startfunc(&entry->modinfo)) {
+		module_list_head = module_list_head->next;
+		free(entry);
+		return(-4);
+	}
 
 	bind_check(BT_load, NULL, name, name);
 	putlog(LOG_MISC, "*", "Module loaded: %s", name);
@@ -142,12 +146,13 @@
 	return(NULL);
 }
 
-void *module_get_api(const char *name)
+void *module_get_api(const char *name, int major, int minor)
 {
 	module_list_t *entry;
 
 	entry = find_module(name);
 	if (!entry) return(NULL);
+	entry->refcount++;
 	return entry->modinfo.module_api;
 }
 
Index: eggdrop1.7/lib/eggdrop/eggmod.h
diff -u eggdrop1.7/lib/eggdrop/eggmod.h:1.6 eggdrop1.7/lib/eggdrop/eggmod.h:1.7
--- eggdrop1.7/lib/eggdrop/eggmod.h:1.6	Thu Dec 18 19:08:58 2003
+++ eggdrop1.7/lib/eggdrop/eggmod.h	Mon Mar  1 16:58:32 2004
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: eggmod.h,v 1.6 2003/12/19 01:08:58 stdarg Exp $
+ * $Id: eggmod.h,v 1.7 2004/03/01 22:58:32 stdarg Exp $
  */
 
 #ifndef _EGG_EGGMOD_H_
@@ -41,6 +41,9 @@
 
 	egg_close_func_t close_func;
 	void *module_data;
+
+	/* API and versioning info. */
+	int major, minor;
 	void *module_api;
 };
 
@@ -49,7 +52,7 @@
 int module_load(const char *name);
 int module_unload(const char *name, int why);
 egg_module_t *module_lookup(const char *name);
-void *module_get_api(const char *name);
+void *module_get_api(const char *name, int major, int minor);
 int module_addref(const char *name);
 int module_decref(const char *name);
 int module_list(const char ***names);
Index: eggdrop1.7/lib/eggdrop/hash_table.c
diff -u eggdrop1.7/lib/eggdrop/hash_table.c:1.6 eggdrop1.7/lib/eggdrop/hash_table.c:1.7
--- eggdrop1.7/lib/eggdrop/hash_table.c:1.6	Wed Dec 17 01:39:14 2003
+++ eggdrop1.7/lib/eggdrop/hash_table.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: hash_table.c,v 1.6 2003/12/17 07:39:14 wcc Exp $";
+static const char rcsid[] = "$Id: hash_table.c,v 1.7 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <stdio.h>
@@ -34,13 +34,11 @@
 hash_table_t *hash_table_create(hash_table_hash_alg alg, hash_table_cmp_alg cmp, int nrows, int flags)
 {
 	hash_table_t *ht;
-	int size;
 
 	if (nrows <= 0) nrows = 13; /* Give them a small table to start with. */
 
-	/* One of the rows is included in the struct definition. */
-	size = sizeof(*ht) + (nrows-1) * sizeof(hash_table_entry_t);
-	ht = calloc(1, size);
+	ht = calloc(1, sizeof(*ht));
+	ht->rows = calloc(nrows, sizeof(*ht->rows));
 
 	if (alg) ht->hash = alg;
 	else {
@@ -71,46 +69,44 @@
 			free(entry);
 		}
 	}
+	free(ht->rows);
 	free(ht);
 
 	return(0);
 }
 
-int hash_table_check_resize(hash_table_t **ht)
+int hash_table_check_resize(hash_table_t *ht)
 {
-	if ((*ht)->cells_in_use / (*ht)->max_rows > 100) {
-		hash_table_resize(ht, (*ht)->max_rows * 3);
+	if (ht->cells_in_use / ht->max_rows > 100) {
+		hash_table_resize(ht, ht->max_rows * 3);
 	}
 	return(0);
 }
 
-int hash_table_resize(hash_table_t **ht, int nrows)
+int hash_table_resize(hash_table_t *ht, int nrows)
 {
 	int i, newidx;
-	hash_table_t *newht, *oldht;
-	hash_table_row_t *row, *newrow;
+	hash_table_row_t *oldrow, *newrows;
 	hash_table_entry_t *entry, *next;
 
-	/* First allocate a new hash table. */
-	oldht = *ht;
-	newht = hash_table_create(oldht->hash, oldht->cmp, nrows, oldht->flags);
+	/* First allocate the new rows. */
+	newrows = calloc(nrows, sizeof(*newrows));
 
 	/* Now populate it with the old entries. */
-	for (i = 0; i < oldht->max_rows; i++) {
-		row = oldht->rows+i;
-		for (entry = row->head; entry; entry = next) {
+	for (i = 0; i < ht->max_rows; i++) {
+		oldrow = ht->rows+i;
+		for (entry = oldrow->head; entry; entry = next) {
 			next = entry->next;
 			newidx = entry->hash % nrows;
-			newrow = newht->rows+newidx;
-			entry->next = newrow->head;
-			newrow->head = entry;
-			newrow->len++;
+			entry->next = newrows[newidx].head;
+			newrows[newidx].head = entry;
+			newrows[newidx].len++;
 		}
 	}
 
-	newht->cells_in_use = oldht->cells_in_use;
-	free(oldht);
-	*ht = newht;
+	free(ht->rows);
+	ht->rows = newrows;
+	ht->max_rows = nrows;
 	return(0);
 }
 
@@ -139,6 +135,11 @@
 	row->len++;
 	ht->cells_in_use++;
 
+	/* See if we need to update the table. */
+	if (!(ht->flags & HASH_TABLE_NORESIZE)) {
+		hash_table_check_resize(ht);
+	}
+
 	return(0);
 }
 
Index: eggdrop1.7/lib/eggdrop/hash_table.h
diff -u eggdrop1.7/lib/eggdrop/hash_table.h:1.3 eggdrop1.7/lib/eggdrop/hash_table.h:1.4
--- eggdrop1.7/lib/eggdrop/hash_table.h:1.3	Wed Dec 17 01:39:14 2003
+++ eggdrop1.7/lib/eggdrop/hash_table.h	Mon Mar  1 16:58:32 2004
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: hash_table.h,v 1.3 2003/12/17 07:39:14 wcc Exp $
+ * $Id: hash_table.h,v 1.4 2004/03/01 22:58:32 stdarg Exp $
  */
 
 #ifndef _EGG_HASH_TABLE_H_
@@ -25,6 +25,7 @@
 #define HASH_TABLE_STRINGS	1
 #define HASH_TABLE_INTS		2
 #define HASH_TABLE_MIXED	4
+#define HASH_TABLE_NORESIZE	8
 
 /* Turns a key into an unsigned int. */
 typedef unsigned int (*hash_table_hash_alg)(const void *key);
@@ -52,13 +53,13 @@
 	int cells_in_use;
 	hash_table_hash_alg hash;
 	hash_table_cmp_alg cmp;
-	hash_table_row_t rows[1];
+	hash_table_row_t *rows;
 } hash_table_t;
 
 hash_table_t *hash_table_create(hash_table_hash_alg alg, hash_table_cmp_alg cmp, int nrows, int flags);
 int hash_table_destroy(hash_table_t *ht);
-int hash_table_check_resize(hash_table_t **ht);
-int hash_table_resize(hash_table_t **ht, int nrows);
+int hash_table_check_resize(hash_table_t *ht);
+int hash_table_resize(hash_table_t *ht, int nrows);
 int hash_table_insert(hash_table_t *ht, const void *key, void *data);
 int hash_table_replace(hash_table_t *ht, const void *key, void *data);
 int hash_table_find(hash_table_t *ht, const void *key, void *dataptr);
Index: eggdrop1.7/lib/eggdrop/help.c
diff -u eggdrop1.7/lib/eggdrop/help.c:1.2 eggdrop1.7/lib/eggdrop/help.c:1.3
--- eggdrop1.7/lib/eggdrop/help.c:1.2	Sun Jan 11 08:30:23 2004
+++ eggdrop1.7/lib/eggdrop/help.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: help.c,v 1.2 2004/01/11 14:30:23 stdarg Exp $";
+static const char rcsid[] = "$Id: help.c,v 1.3 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <stdio.h>
@@ -81,7 +81,6 @@
 
 		/* Insert help entry into the hashtable. */
 		hash_table_insert(name_ht, h->name, h);
-		hash_table_check_resize(&name_ht);
 
 		nhelp++;
 
Index: eggdrop1.7/lib/eggdrop/users.c
diff -u eggdrop1.7/lib/eggdrop/users.c:1.18 eggdrop1.7/lib/eggdrop/users.c:1.19
--- eggdrop1.7/lib/eggdrop/users.c:1.18	Sun Jan 11 06:16:08 2004
+++ eggdrop1.7/lib/eggdrop/users.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: users.c,v 1.18 2004/01/11 12:16:08 wcc Exp $";
+static const char rcsid[] = "$Id: users.c,v 1.19 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <stdio.h>
@@ -237,8 +237,6 @@
 
 	hash_table_insert(handle_ht, u->handle, u);
 	hash_table_insert(uid_ht, (void *)u->uid, u);
-	hash_table_check_resize(&handle_ht);
-	hash_table_check_resize(&uid_ht);
 	nusers++;
 	return(u);
 }
Index: eggdrop1.7/lib/eggdrop/xml.c
diff -u eggdrop1.7/lib/eggdrop/xml.c:1.7 eggdrop1.7/lib/eggdrop/xml.c:1.8
--- eggdrop1.7/lib/eggdrop/xml.c:1.7	Sun Jan 11 08:30:23 2004
+++ eggdrop1.7/lib/eggdrop/xml.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: xml.c,v 1.7 2004/01/11 14:30:23 stdarg Exp $";
+static const char rcsid[] = "$Id: xml.c,v 1.8 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <stdio.h>
@@ -77,7 +77,8 @@
 /* Append a node to another node's children. */
 xml_node_t *xml_node_add(xml_node_t *parent, xml_node_t *child)
 {
-	xml_node_t *newnode;
+	xml_node_t *newnode, *node;
+	int i;
 
 	newnode = malloc(sizeof(*newnode));
 	memcpy(newnode, child, sizeof(*child));
@@ -85,6 +86,18 @@
 	parent->children = realloc(parent->children, sizeof(child) * (parent->nchildren+1));
 	parent->children[parent->nchildren] = newnode;
 	parent->nchildren++;
+	newnode->next = newnode->prev = NULL;
+
+	if (child->name) {
+		for (i = parent->nchildren-2; i >= 0; i--) {
+			node = parent->children[i];
+			if (node->name && !strcasecmp(node->name, newnode->name)) {
+				node->next = child;
+				newnode->prev = node;
+				break;
+			}
+		}
+	}
 	return(newnode);
 }
 
Index: eggdrop1.7/lib/eggdrop/xml.h
diff -u eggdrop1.7/lib/eggdrop/xml.h:1.5 eggdrop1.7/lib/eggdrop/xml.h:1.6
--- eggdrop1.7/lib/eggdrop/xml.h:1.5	Wed Dec 17 01:39:14 2003
+++ eggdrop1.7/lib/eggdrop/xml.h	Mon Mar  1 16:58:32 2004
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Id: xml.h,v 1.5 2003/12/17 07:39:14 wcc Exp $
+ * $Id: xml.h,v 1.6 2004/03/01 22:58:32 stdarg Exp $
  */
 
 #ifndef _EGG_XML_H_
@@ -29,6 +29,7 @@
 } xml_attribute_t;
 
 typedef struct xml_node_b {
+	struct xml_node_b *next, *prev;
 	char *name;
 
 	char *text;
Index: eggdrop1.7/modules/script/scriptbind.c
diff -u eggdrop1.7/modules/script/scriptbind.c:1.6 eggdrop1.7/modules/script/scriptbind.c:1.7
--- eggdrop1.7/modules/script/scriptbind.c:1.6	Thu Dec 18 00:50:47 2003
+++ eggdrop1.7/modules/script/scriptbind.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: scriptbind.c,v 1.6 2003/12/18 06:50:47 wcc Exp $";
+static const char rcsid[] = "$Id: scriptbind.c,v 1.7 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -85,7 +85,7 @@
 static int script_unbind(char *table_name, char *mask, char *name)
 {
 	bind_table_t *table;
-	script_callback_t *callback;
+	script_callback_t *callback = NULL;
 	int retval;
 
 	table = bind_table_lookup(table_name);
Index: eggdrop1.7/modules/server/channels.c
diff -u eggdrop1.7/modules/server/channels.c:1.17 eggdrop1.7/modules/server/channels.c:1.18
--- eggdrop1.7/modules/server/channels.c:1.17	Sat Feb 28 00:00:21 2004
+++ eggdrop1.7/modules/server/channels.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: channels.c,v 1.17 2004/02/28 06:00:21 stdarg Exp $";
+static const char rcsid[] = "$Id: channels.c,v 1.18 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -194,7 +194,7 @@
 	return(NULL);
 }
 
-void uhost_cache_fillin(const char *nick, const char *uhost, int addref)
+void uhost_cache_addref(const char *nick, const char *uhost)
 {
 	char buf[64], *lnick;
 	uhost_cache_entry_t *cache = NULL;
@@ -203,16 +203,13 @@
 	make_lowercase(lnick);
 	hash_table_find(uhost_cache_ht, lnick, &cache);
 	if (!cache) {
-		cache = malloc(sizeof(*cache));
+		cache = calloc(1, sizeof(*cache));
 		cache->nick = strdup(nick);
 		make_lowercase(cache->nick);
-		cache->uhost = strdup(uhost);
-		cache->ref_count = 1;
+		if (uhost) cache->uhost = strdup(uhost);
 		hash_table_insert(uhost_cache_ht, cache->nick, cache);
 	}
-	else if (addref) {
-		cache->ref_count++;
-	}
+	cache->ref_count++;
 	if (lnick != buf) free(lnick);
 }
 
@@ -259,9 +256,10 @@
 	/* Do we need to fill in the uhost? */
 	if (uhost && !m->uhost) {
 		m->uhost = strdup(uhost);
-		uhost_cache_fillin(nick, uhost, 1);
 	}
 
+	uhost_cache_addref(nick, uhost);
+
 	return(m);
 }
 
Index: eggdrop1.7/modules/server/input.c
diff -u eggdrop1.7/modules/server/input.c:1.29 eggdrop1.7/modules/server/input.c:1.30
--- eggdrop1.7/modules/server/input.c:1.29	Thu Dec 18 17:10:42 2003
+++ eggdrop1.7/modules/server/input.c	Mon Mar  1 16:58:32 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: input.c,v 1.29 2003/12/18 23:10:42 stdarg Exp $";
+static const char rcsid[] = "$Id: input.c,v 1.30 2004/03/01 22:58:32 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -137,12 +137,14 @@
 		}
 		else {
 			name = strdup(arg);
-			value = strdup("true");
+			value = NULL;
 		}
 
 		current_server.support[nsupport].name = name;
 		current_server.support[nsupport++].value = value;
 
+		if (!value) continue;
+
 		if (!strcasecmp(name, "chantypes")) {
 			str_redup(&current_server.chantypes, value);
 		}
@@ -156,13 +158,15 @@
 			char *comma;
 			int j;
 
+			memset(types, 0, sizeof(types));
 			for (j = 0; j < 3; j++) {
 				comma = strchr(value, ',');
-				if (comma) *comma = 0;
+				if (!comma) break;
 				strlcpy(types[j], value, sizeof types[j]);
 				if (comma) *comma = ',';
 				value = comma+1;
 			}
+			if (comma) strlcpy(types[3], value, sizeof types[3]);
 			str_redup(&current_server.type1modes, types[0]);
 			str_redup(&current_server.type2modes, types[1]);
 			str_redup(&current_server.type3modes, types[2]);
Index: eggdrop1.7/modules/server/scriptcmds.c
diff -u eggdrop1.7/modules/server/scriptcmds.c:1.37 eggdrop1.7/modules/server/scriptcmds.c:1.38
--- eggdrop1.7/modules/server/scriptcmds.c:1.37	Sat Feb 28 00:00:21 2004
+++ eggdrop1.7/modules/server/scriptcmds.c	Mon Mar  1 16:58:33 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: scriptcmds.c,v 1.37 2004/02/28 06:00:21 stdarg Exp $";
+static const char rcsid[] = "$Id: scriptcmds.c,v 1.38 2004/03/01 22:58:33 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -320,6 +320,24 @@
 	return(0);
 }
 
+/* 005 support */
+static int script_supports(const char *name)
+{
+	const char *value;
+
+	if (!server_support(name, &value)) {
+		/* Supported. */
+		return(1);
+	}
+	return(0);
+}
+
+static const char *script_support_val(const char *name)
+{
+	const char *value;
+	server_support(name, &value);
+	return value;
+}
 
 static script_linked_var_t server_script_vars[] = {
 	{"", "servidx", &current_server.idx, SCRIPT_INTEGER | SCRIPT_READONLY, NULL},
@@ -345,7 +363,8 @@
 	{"", "nick_clear", nick_clear, NULL, 0, "", "", SCRIPT_INTEGER, 0},
 
 	/* Server commands. */
-	{"", "server_support", server_support, NULL, 1, "s", "name", SCRIPT_STRING, 0},
+	{"", "server_supports", script_supports, NULL, 1, "s", "name", SCRIPT_INTEGER, 0},
+	{"", "server_support_val", script_support_val, NULL, 1, "s", "name", SCRIPT_STRING, 0},
         {"", "putserv", script_putserv, NULL, 1, "sss", "?queue? ?next? text", SCRIPT_INTEGER, SCRIPT_VAR_ARGS | SCRIPT_VAR_FRONT},
 
 	/* DCC commands. */
Index: eggdrop1.7/modules/server/server.c
diff -u eggdrop1.7/modules/server/server.c:1.56 eggdrop1.7/modules/server/server.c:1.57
--- eggdrop1.7/modules/server/server.c:1.56	Sun Jan 11 04:54:32 2004
+++ eggdrop1.7/modules/server/server.c	Mon Mar  1 16:58:33 2004
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: server.c,v 1.56 2004/01/11 10:54:32 stdarg Exp $";
+static const char rcsid[] = "$Id: server.c,v 1.57 2004/03/01 22:58:33 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
@@ -54,14 +54,18 @@
 extern bind_list_t server_party_commands[];
 
 /* Look up the information we get from 005. */
-char *server_support(const char *name)
+int server_support(const char *name, const char **value)
 {
 	int i;
 
 	for (i = 0; i < current_server.nsupport; i++) {
-		if (!strcasecmp(name, current_server.support[i].name)) return(current_server.support[i].value);
+		if (!strcasecmp(name, current_server.support[i].name)) {
+			*value = current_server.support[i].value;
+			return(0);
+		}
 	}
-	return(NULL);
+	*value = NULL;
+	return(-1);
 }
 
 /* Every second, we want to
Index: eggdrop1.7/modules/server/server.h
diff -u eggdrop1.7/modules/server/server.h:1.15 eggdrop1.7/modules/server/server.h:1.16
--- eggdrop1.7/modules/server/server.h:1.15	Thu Dec 18 00:50:47 2003
+++ eggdrop1.7/modules/server/server.h	Mon Mar  1 16:58:33 2004
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: server.h,v 1.15 2003/12/18 06:50:47 wcc Exp $
+ * $Id: server.h,v 1.16 2004/03/01 22:58:33 stdarg Exp $
  */
 
 #ifndef _EGG_MOD_SERVER_SERVER_H_
@@ -80,6 +80,6 @@
 extern current_server_t current_server;
 
 /* And one lonely function, because he had nowhere else to fit. */
-extern char *server_support(const char *name);
+extern int server_support(const char *name, const char **value);
 
 #endif /* !_EGG_MOD_SERVER_SERVER_H_ */
Index: eggdrop1.7/po/eggdrop.pot
diff -u eggdrop1.7/po/eggdrop.pot:1.462 eggdrop1.7/po/eggdrop.pot:1.463
--- eggdrop1.7/po/eggdrop.pot:1.462	Mon Mar  1 12:15:13 2004
+++ eggdrop1.7/po/eggdrop.pot	Mon Mar  1 16:58:33 2004
@@ -1,14 +1,13 @@
-# eggdrop.pot
-# Copyright (C) 2004 Eggheads Development Team
-# This file is distributed under the same license as the Eggdrop package.
-
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Eggheads Development Team
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-01 12:15-0600\n"
+"POT-Creation-Date: 2004-03-01 17:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -36,19 +35,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#. --option
 #: lib/compat/getopt.c:758
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#. +option or -option
 #: lib/compat/getopt.c:762
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#. 1003.2 specifies the format of this message.
 #: lib/compat/getopt.c:788
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -59,7 +55,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#. 1003.2 specifies the format of this message.
 #: lib/compat/getopt.c:821 lib/compat/getopt.c:951
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -208,64 +203,59 @@
 msgid "Syntax: .perl <perlexpression>"
 msgstr ""
 
-#: modules/server/input.c:251
+#: modules/server/input.c:255
 #, c-format
 msgid "Action: %s %s"
 msgstr ""
 
-#: modules/server/input.c:418
+#: modules/server/input.c:422
 #, c-format
 msgid "NICK IS INVALID: %s (keeping '%s')."
 msgstr ""
 
-#: modules/server/input.c:421
+#: modules/server/input.c:425
 #, c-format
 msgid "Server says my nickname ('%s') is invalid, trying new random nick."
 msgstr ""
 
-#. We are online and have a nickname, we'll keep it
-#: modules/server/input.c:437
+#: modules/server/input.c:441
 #, c-format
 msgid "Nick is in use: '%s' (keeping '%s')."
 msgstr ""
 
-#: modules/server/input.c:440
+#: modules/server/input.c:444
 #, c-format
 msgid "Nick is in use: '%s' (trying next one)."
 msgstr ""
 
-#: modules/server/input.c:453
+#: modules/server/input.c:457
 #, c-format
 msgid "Cannot change to banned nickname (%s on %s)."
 msgstr ""
 
-#: modules/server/input.c:463
+#: modules/server/input.c:467
 #, c-format
 msgid "Can't change nickname to %s. Is my nickname banned?"
 msgstr ""
 
-#: modules/server/input.c:476
+#: modules/server/input.c:480
 msgid "Nick change was too fast."
 msgstr ""
 
-#. Usually if we get this then we really messed up somewhere
-#. * or this is a non-standard server, so we log it and kill the socket
-#. * hoping the next server will work :) -poptix
-#.
-#: modules/server/input.c:486
+#: modules/server/input.c:490
 #, c-format
 msgid "%s says I'm not registered, trying next one."
 msgstr ""
 
-#: modules/server/input.c:487
+#: modules/server/input.c:491
 msgid "The server says I'm not registered, trying next one."
 msgstr ""
 
-#: modules/server/input.c:509
+#: modules/server/input.c:513
 msgid "Disconnecting from server."
 msgstr ""
 
-#: modules/server/input.c:510
+#: modules/server/input.c:514
 msgid "disconnecting due to error"
 msgstr ""
 
@@ -354,37 +344,36 @@
 msgid "Action to %1$s: %2$s"
 msgstr ""
 
-#: modules/server/server.c:100
+#: modules/server/server.c:104
 #, c-format
 msgid "   Connecting to server %s/%d."
 msgstr ""
 
-#: modules/server/server.c:101
+#: modules/server/server.c:105
 #, c-format
 msgid "   Connecting to next server in %d seconds."
 msgstr ""
 
-#. First line, who we've connected to.
-#: modules/server/server.c:105
+#: modules/server/server.c:109
 #, c-format
 msgid "   Connected to %s/%d."
 msgstr ""
 
-#: modules/server/server.c:109
+#: modules/server/server.c:113
 #, c-format
 msgid "   Online as %s!%s@%s (%s)."
 msgstr ""
 
-#: modules/server/server.c:110
+#: modules/server/server.c:114
 #, c-format
 msgid "   Online as %s (still waiting for WHOIS result)."
 msgstr ""
 
-#: modules/server/server.c:112
+#: modules/server/server.c:116
 msgid "   Still logging in."
 msgstr ""
 
-#: modules/server/server.c:164
+#: modules/server/server.c:168
 msgid "server module unloading"
 msgstr ""
 
@@ -444,7 +433,6 @@
 msgstr ""
 
 #: modules/tclscript/tclscript.c:708
-#, c-format
 msgid ""
 "return \"    Library: [info library]\\n    Reported version: [info "
 "tclversion]\\n    Reported patchlevel: [info patchlevel]\""
@@ -708,7 +696,6 @@
 msgid "Last message repeated %d time(s).\n"
 msgstr ""
 
-#. It's too big.
 #: src/logfile.c:251
 #, c-format
 msgid "Cycling logfile %s: over max-logsize (%d kilobytes)."
@@ -742,7 +729,6 @@
 msgstr ""
 
 #: src/main.c:184
-#, c-format
 msgid ""
 "\n"
 "  -h, --help                 Print help and exit\n"
@@ -755,7 +741,6 @@
 "  FILE  optional config filename (default 'config.xml')\n"
 msgstr ""
 
-#. bug: option not considered.
 #: src/main.c:251
 #, c-format
 msgid "%s: option unknown: %c\n"
Index: eggdrop1.7/src/core_config.c
diff -u eggdrop1.7/src/core_config.c:1.14 eggdrop1.7/src/core_config.c:1.15
--- eggdrop1.7/src/core_config.c:1.14	Sun Jan 11 06:16:08 2004
+++ eggdrop1.7/src/core_config.c	Mon Mar  1 16:58:33 2004
@@ -18,14 +18,14 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: core_config.c,v 1.14 2004/01/11 12:16:08 wcc Exp $";
+static const char rcsid[] = "$Id: core_config.c,v 1.15 2004/03/01 22:58:33 stdarg Exp $";
 #endif
 
 #include <eggdrop/eggdrop.h>
 #include <string.h>
 #include "core_config.h"
 
-extern char configfile[];
+extern char *configfile;
 core_config_t core_config = {0};
 void *config_root = NULL;
 
----------------------- End of diff -----------------------



More information about the Changes mailing list