s4-scripting: add string representation of error code define to generated table.
authorGünther Deschner <gd@samba.org>
Fri, 6 Mar 2015 16:39:46 +0000 (17:39 +0100)
committerGünther Deschner <gd@samba.org>
Fri, 13 Mar 2015 22:58:07 +0000 (23:58 +0100)
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source4/scripting/bin/gen_hresult.py

index ea5e5328c68035efde94406341f2ecdbf5857cfe..6644553f3c59b7c0ecfbc30527b466701c782e3e 100755 (executable)
@@ -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")