From: Günther Deschner <gd@samba.org>
Date: Fri, 6 Mar 2015 16:39:46 +0000 (+0100)
Subject: s4-scripting: add string representation of error code define to generated table.
X-Git-Tag: tdb-1.3.5~601
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=169f6cd37b57376d63956c25694e12cc415c5aba

s4-scripting: add string representation of error code define to generated table.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source4/scripting/bin/gen_hresult.py b/source4/scripting/bin/gen_hresult.py
index ea5e5328c68..6644553f3c5 100755
--- a/source4/scripting/bin/gen_hresult.py
+++ b/source4/scripting/bin/gen_hresult.py
@@ -148,14 +148,17 @@ def generateSourceFile(out_file):
     out_file.write("static const struct {\n")
     out_file.write("	HRESULT error_code;\n")
     out_file.write("	const char *error_str;\n")
+    out_file.write("	const char *error_message;\n")
     out_file.write("} hresult_errs[] = {\n")
 
     for err in Errors:
         out_file.write("	{\n")
         if err.isWinError:
             out_file.write("		HRESULT_FROM_WIN32(%s),\n"%err.err_define)
+            out_file.write("		\"HRESULT_FROM_WIN32(%s)\",\n"%err.err_define)
         else:
             out_file.write("		%s,\n"%err.err_define)
+            out_file.write("		\"%s\",\n"%err.err_define)
         out_file.write("		\"%s\"\n"%err.err_string)
         out_file.write("	},\n")
     out_file.write("};\n")
@@ -166,7 +169,7 @@ def generateSourceFile(out_file):
     out_file.write("	int i;\n")
     out_file.write("	for (i = 0; i < ARRAY_SIZE(hresult_errs); ++i) {\n")
     out_file.write("		if (HRES_IS_EQUAL(err_code, hresult_errs[i].error_code)) {\n")
-    out_file.write("			result = hresult_errs[i].error_str;\n")
+    out_file.write("			result = hresult_errs[i].error_message;\n")
     out_file.write("			break;\n")
     out_file.write("		}\n")
     out_file.write("	}\n")