[agd-cvs] server/src dfparse.y,1.6,1.7

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

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

Modified Files:
	dfparse.y 
Log Message:
Cleanup.

Index: dfparse.y
===================================================================
RCS file: /cvsroot/agd/server/src/dfparse.y,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dfparse.y	18 Mar 2004 20:47:48 -0000	1.6
+++ dfparse.y	28 Mar 2004 17:58:30 -0000	1.7
@@ -28,8 +28,8 @@
 #include <stdlib.h> /* realloc */
 #include <stdio.h> /* FILE* */
 #include <errno.h>
-
 #include <time.h>
+
 #include "sys.h" /* xmalloc */
 #include "array.h"
 #include "lpc.h"
@@ -40,7 +40,7 @@
 		 "int arglen;\n\tint args[%d];\n} dfdecl_t;\n"
 typedef struct {
 	int ret;
-	char *name/*, *c_name*/;
+	char *name;
 	int arglen;
 	int *args;
 } dfdecl_t;
@@ -51,6 +51,7 @@
 YYLTYPE yylloc;
 
 int find_linear_len(array_t *a);
+
 %}
 
 %union {
@@ -180,28 +181,8 @@
 
 	printf("dfdecl_t decl[] = {\n");
 	for(i=0;i<numdecl;i++) {
-#if 0
-		char *c_name;
-		int c_name_dynamic = 0;
-
-		if(dfdecl[i].c_name) {
-			c_name = dfdecl[i].c_name;
-		} else {
-			c_name_dynamic = 1;
-			c_name = xmalloc(strlen(dfdecl[i].name) + 4);
-			if(dfdecl[i].arglen || dfdecl[i].ret != T_VOID) {
-				sprintf(c_name, "df_%s", dfdecl[i].name);
-			} else {
-				sprintf(c_name, "do_%s", dfdecl[i].name);
-			}
-		}
-#endif
-			
-		printf("\t/* %d */ { %d, \"%s\", (void (*)(void))df_%s, ", i, dfdecl[i].ret, dfdecl[i].name, dfdecl[i].name);
-#if 0
-		if(c_name_dynamic)
-			xfree(c_name);
-#endif
+		printf("\t/* %d */ { %d, \"%s\", (void (*)(void))df_%s, ",
+			  i, dfdecl[i].ret, dfdecl[i].name, dfdecl[i].name);
 
 		printf("%d, {", dfdecl[i].arglen);
 		for(j=0;j<dfdecl[i].arglen;j++) {