compile_et.c: Change the emitted name of the struct error_table

	to be et_XXX_error_table, instead of it being a static
	variable named "et".  (This change has already been made
	in the awk versions of compile_et.)

com_err.h, com_err.c: Remove the void *priv argument from
	com_err_va() and et_com_err() experimental API's.  (That
	was a braino; the private data pointer should come from
	the hook_func_data field.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9821 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 3 insertions, 3 deletions

diff --git a/src/util/et/compile_et.c b/src/util/et/compile_et.c
index d42c274337..20239312ea 100644
--- a/src/util/et/compile_et.c
+++ b/src/util/et/compile_et.c
@@ -247,15 +247,15 @@ int main (argc, argv) int argc; char **argv; {
     for (cpp = struct_def; *cpp; cpp++)
 	fputs (*cpp, cfile);
     fprintf(cfile,
-	    "static const struct error_table et = { text, %ldL, %d };\n\n",
-	    table_number, current);
+	    "const struct error_table et_%s_error_table = { text, %ldL, %d };\n\n",
+	    table_name, table_number, current);
     fputs("static struct et_list link = { 0, 0 };\n\n",
 	  cfile);
     fprintf(cfile, "void initialize_%s_error_table (%s) {\n",
 	    table_name, (language == lang_C) ? "void" : "NOARGS");
     fputs("    if (!link.table) {\n", cfile);
     fputs("        link.next = _et_list;\n", cfile);
-    fputs("        link.table = &et;\n", cfile);
+    fprintf(cfile, "        link.table = &et_%s_error_table;\n", table_name);
     fputs("        _et_list = &link;\n", cfile);
     fputs("    }\n", cfile);
     fputs("}\n", cfile);