[agd-cvs] server/src vars.c,1.14,1.15 sys.h,1.10,1.11 sys.c,1.15,1.16 net.c,1.17,1.18 array.c,1.14,1.15

[Peep P. <so...@us...>]

Update of /cvsroot/agd/server/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15271

Modified Files:
	vars.c sys.h sys.c net.c array.c 
Log Message:
Removed xfree.

Index: sys.h
===================================================================
RCS file: /cvsroot/agd/server/src/sys.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sys.h	8 Jun 2004 20:44:53 -0000	1.10
+++ sys.h	14 Jun 2004 20:48:08 -0000	1.11
@@ -4,12 +4,6 @@
 /* memory allocation */
 void *xmalloc(size_t bytes);
 void *xrealloc(void *ptr, size_t bytes);
-#ifdef DEBUG
-void xfree(void *p);
-#else
-#define xfree free
-#endif
-
 
 /* configuration */
 typedef struct {

Index: net.c
===================================================================
RCS file: /cvsroot/agd/server/src/net.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- net.c	12 Jun 2004 20:09:13 -0000	1.17
+++ net.c	14 Jun 2004 20:48:08 -0000	1.18
@@ -112,7 +112,7 @@
 	if(!login_ob->u.ob) {
 		fprintf(stderr, "Warning: master::connect() didn't return an object.\n");
 		do_write("Oops, glitch in world fabric - you didn't get a login object.\n");
-		xfree(player_ob);
+		free(player_ob);
 		net_disconnect(p);
 		return;
 	}
@@ -124,9 +124,9 @@
 	if(this_player == p && p->ob == player_ob) /* wasn't changed. */
 		return;
 
-	debug("net_accept", "player object was changed to %p; freeing player_ob %p\n", p->ob, player_ob);
+	debug("net_accept", "player object was changed to %p (%s); freeing player_ob %p (%s)\n", p->ob, p->ob->name, player_ob, player_ob->name);
 	/* player_ob is not needed anymore if we get this far. */
-	xfree(player_ob);
+	free(player_ob);
 }
 
 void net_disconnect(player_t *p)
@@ -163,6 +163,7 @@
 	char *c;
 	
 	if(!p->input_to) {
+		debug("net", "player %p (with iaob %s) doesn't have input_to set\n", p->ob? p->ob->name :NULL, p);
 		goto out;
 	}
 

Index: sys.c
===================================================================
RCS file: /cvsroot/agd/server/src/sys.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sys.c	8 Jun 2004 20:44:53 -0000	1.15
+++ sys.c	14 Jun 2004 20:48:08 -0000	1.16
@@ -116,19 +116,6 @@
 	return p;
 }
 
-#ifdef DEBUG
-	/* Quite useless. */
-void xfree(void *p)
-{
-	if(!p) {
-		fprintf(stderr, "free() called on a nullpointer!\n");
-		return;
-	}
-
-	free(p);
-}
-#endif
-
 int legal_path(char *fn)
 {
 	char *p;

Index: array.c
===================================================================
RCS file: /cvsroot/agd/server/src/array.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- array.c	8 Jun 2004 20:23:06 -0000	1.14
+++ array.c	14 Jun 2004 20:48:08 -0000	1.15
@@ -27,11 +27,11 @@
 {
 	int i;
 	if(!freefun)
-		freefun = (void(*)(variable_t*))xfree; /* free_var? */
+		freefun = (void(*)(variable_t*))free; /* free_var? */
 	for(i=0;i<a->length;i++)
 		freefun(a->data[i]);
 	if(a->length)
-		xfree(a->data);
+		free(a->data);
 	init_array(a);	
 }
 

Index: vars.c
===================================================================
RCS file: /cvsroot/agd/server/src/vars.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- vars.c	8 Jun 2004 20:44:53 -0000	1.14
+++ vars.c	14 Jun 2004 20:48:08 -0000	1.15
@@ -16,8 +16,9 @@
 			unref_ob(v->u.ob, v);
 			break;
 		case T_STRING:
-			if(v->string_type != ST_STATIC)
-				xfree(v->u.s);
+			if(v->string_type != ST_STATIC) {
+				free(v->u.s);
+			}
 			break;
 	}
 }
@@ -138,7 +139,7 @@
 					buf = xmalloc(256);
 					sprintf(buf, "%d", v1->u.i);
 					buf2 = xmalloc(strlen(v2->u.s) + strlen(buf) + 1);
-					xfree(buf);
+					free(buf);
 					sprintf(buf2, "%d%s", v1->u.i, v2->u.s);
 					ret->type = T_STRING;
 					ret->u.s = buf2;
@@ -168,7 +169,7 @@
 					buf = xmalloc(256);
 					sprintf(buf, "%d", v2->u.i);
 					buf2 = xmalloc(strlen(v1->u.s) + strlen(buf) + 1);
-					xfree(buf);
+					free(buf);
 					sprintf(buf2, "%s%d", v1->u.s, v2->u.i);
 					ret->type = T_STRING;
 					ret->u.s = buf2;
@@ -206,7 +207,7 @@
 			printf("add_vars(): type %d vs %d; type %d is unknown\n", v1->type, v2->type, v1->type);
 			break;
 	}
-	xfree(ret);
+	free(ret);
 	return NULL;
 }
 #if 0