From b34920d09e42030c04d2ba33d4f70b3bea040308 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Mon, 12 Aug 2002 15:44:05 +0000
Subject: [PATCH] just declare er_list directly instead of including com_right
 in generated header files

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11084 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/com_err/compile_et.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/com_err/compile_et.c b/lib/com_err/compile_et.c
index 9565dcfbe..c89fa5660 100644
--- a/lib/com_err/compile_et.c
+++ b/lib/com_err/compile_et.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1998-2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -83,7 +83,7 @@ generate_c(void)
     fprintf(c_file, "#include \"%s\"\n", hfn);
     fprintf(c_file, "\n");
 
-    fprintf(c_file, "static const char *text[] = {\n");
+    fprintf(c_file, "static const char *%s_error_strings[] = {\n", name);
 
     for(ec = codes, n = 0; ec; ec = ec->next, n++) {
 	while(n < ec->number) {
@@ -98,20 +98,22 @@ generate_c(void)
     fprintf(c_file, "\tNULL\n");
     fprintf(c_file, "};\n");
     fprintf(c_file, "\n");
+    fprintf(c_file, "#define num_errors %d\n", number);
+    fprintf(c_file, "\n");
     fprintf(c_file, 
 	    "void initialize_%s_error_table_r(struct et_list **list)\n", 
 	    name);
     fprintf(c_file, "{\n");
     fprintf(c_file, 
-	    "    initialize_error_table_r(list, text, "
-	    "%s_num_errors, ERROR_TABLE_BASE_%s);\n", name, name);
+	    "    initialize_error_table_r(list, %s_error_strings, "
+	    "num_errors, ERROR_TABLE_BASE_%s);\n", name, name);
     fprintf(c_file, "}\n");
     fprintf(c_file, "\n");
     fprintf(c_file, "void initialize_%s_error_table(void)\n", name);
     fprintf(c_file, "{\n");
     fprintf(c_file,
-	    "    init_error_table(text, ERROR_TABLE_BASE_%s, "
-	    "%s_num_errors);\n", name, name);
+	    "    init_error_table(%s_error_strings, ERROR_TABLE_BASE_%s, "
+	    "num_errors);\n", name, name);
     fprintf(c_file, "}\n");
 
     fclose(c_file);
@@ -141,7 +143,7 @@ generate_h(void)
     fprintf(h_file, "#ifndef %s\n", fn);
     fprintf(h_file, "#define %s\n", fn);
     fprintf(h_file, "\n");
-    fprintf(h_file, "#include <com_right.h>\n");
+    fprintf(h_file, "struct et_list;\n");
     fprintf(h_file, "\n");
     fprintf(h_file, 
 	    "void initialize_%s_error_table_r(struct et_list **);\n",
@@ -152,16 +154,15 @@ generate_h(void)
 	    name, name);
     fprintf(h_file, "\n");
     fprintf(h_file, "typedef enum %s_error_number{\n", name);
-    fprintf(h_file, "\tERROR_TABLE_BASE_%s = %ld,\n", name, base);
-    fprintf(h_file, "\t%s_err_base = %ld,\n", name, base);
 
     for(ec = codes; ec; ec = ec->next) {
 	fprintf(h_file, "\t%s = %ld,\n", ec->name, base + ec->number);
     }
 
-    fprintf(h_file, "\t%s_num_errors = %d\n", name, number);
     fprintf(h_file, "} %s_error_number;\n", name);
     fprintf(h_file, "\n");
+    fprintf(h_file, "#define ERROR_TABLE_BASE_%s %ld\n", name, base);
+    fprintf(h_file, "\n");
     fprintf(h_file, "#endif /* %s */\n", fn);