[agd-cvs] server/src object.c,1.10,1.11 sys.c,1.9,1.10 sys.h,1.5,1.6

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

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

Modified Files:
	object.c sys.c sys.h 
Log Message:
Cleanups.

Index: sys.h
===================================================================
RCS file: /cvsroot/agd/server/src/sys.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sys.h	16 Mar 2004 14:14:26 -0000	1.5
+++ sys.h	21 Mar 2004 10:34:47 -0000	1.6
@@ -26,10 +26,6 @@
 
 extern config_t conf;
 
-#if 0
-char *get_working_dir(void);
-int dir_exists(char *name, int verbose);
-#endif
 int legal_path(char *fn);
 
 char *stringdup(char *s);

Index: object.c
===================================================================
RCS file: /cvsroot/agd/server/src/object.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- object.c	21 Mar 2004 08:50:45 -0000	1.10
+++ object.c	21 Mar 2004 10:34:47 -0000	1.11
@@ -166,14 +166,11 @@
 	new_ob->name = xmalloc(strlen(base_ob->name) + 10);
 	sprintf(new_ob->name, "%s#%d", base_ob->name, base_ob->ref);
 
-	/*new_ob->prog = type_xmalloc(program_t);
-	new_ob->prog->fun_table = *copy_array(&base_ob->prog->fun_table, NULL);
-	new_ob->prog->functions = *copy_array(&base_ob->prog->functions, (void*(*)(void *)) copy_fun);*/
 	new_ob->prog = base_ob->prog;
 	ref_prog(new_ob->prog);
 	
 	/* Memory leak? */
-	new_ob/*->prog*/->variables = *copy_array(&base_ob/*->prog*/->variables, (void*(*)(void*)) copy_var);
+	new_ob->variables = *copy_array(&base_ob->variables, (void*(*)(void*)) copy_var);
 	
 	apply(new_ob, "create", NULL);
 	list_push(&all_objects, new_ob);
@@ -187,20 +184,6 @@
 	return ob && ob->iaob;
 }
 
-/* WTF? */
-#if 0
-object_t *this_object(void)
-{
-	return this_ob;
-}
-
-
-object_t *previous_object(void)
-{
-	return previous_ob;
-}
-#endif
-
 void tell_object(object_t *ob, char *s)
 {
 	player_t *p;
@@ -212,14 +195,6 @@
 }
 
 
-/* Poiiintleeesss... */
-char *file_name(object_t *ob)
-{
-	if(ob)
-		return ob->name;
-	return NULL;
-}
-
 #ifdef DEBUG
 void report_obs(void)
 {

Index: sys.c
===================================================================
RCS file: /cvsroot/agd/server/src/sys.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sys.c	16 Mar 2004 14:14:04 -0000	1.9
+++ sys.c	21 Mar 2004 10:34:47 -0000	1.10
@@ -151,6 +151,7 @@
 	return p;
 }
 
+#ifdef DEBUG
 void xfree(void *p)
 {
 	mstats.free++;
@@ -162,6 +163,9 @@
 
 	free(p);
 }
+#else
+#define xfree(p) free(p)
+#endif
 
 int legal_path(char *fn)
 {