Apply suggestions from code review

Author: picnixz

Tools/ssl/make_ssl_data.py

@@ -178,11 +178,11 @@ def gen_error_codes(args):
     yield "/* generated from args.reasons */"
     yield "static struct py_ssl_error_code error_codes[] = {"
     for reason, libname, errname, num in args.reasons:
-        yield f"#ifdef {reason}"
+        yield f"  #ifdef {reason}"
         yield f'    {{"{errname}", ERR_LIB_{libname}, {reason}}},'
-        yield "#else"
+        yield "  #else"
         yield f'    {{"{errname}", {args.lib2errnum[libname]}, {num}}},'
-        yield "#endif"
+        yield "  #endif"
     yield "    {NULL, 0, 0}  /* sentinel */"
     yield "};"
 
@@ -204,42 +204,6 @@ def get_openssl_git_commit(args):
     return git_describe.stdout.strip()
 
 
-def get_header_name(args, commit):
-    if args.openssl_version is not None:
-        return f"Py_SSL_DATA_{args.openssl_version}_H"
-    if args.output is not None:
-        # deduce the header from the filename
-        basename = os.path.basename(args.output)
-        filestem, _ = os.path.splitext(basename)
-        suffix = filestem.strip('_').upper()
-        return f"Py_SSL_DATA_{suffix.removeprefix('SSL_DATA_')}_H"
-    # deduce the header from the Git commit
-    match = re.match(r"openssl[^\d](\d+)[^\d](\d+)[^\d]([a-z0-9]+)",
-                     commit, re.ASCII | re.IGNORECASE)
-    if match is None:
-        error("cannot extract OpenSSL version from Git commit %r; "
-              "specify it via -H/--openssl-version instead", commit)
-    major, minor, patch = match.groups()
-    return f"Py_SSL_DATA_{major}{minor}{patch}_H"
-
-
-def gen_header_prolog_and_epilog(header_name):
-    prolog = f"""\
-#ifndef {header_name}
-#define {header_name}
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {{
-#endif"""
-    epilog = f"""\
-#ifdef __cplusplus
-}}
-#endif
-
-#endif /* !{header_name} */"""
-    return prolog, epilog
 
 
 def main(args=None):
@@ -268,19 +232,16 @@ def main(args=None):
     args.reasons = sorted(reasons, key=operator.itemgetter(0, 3))
 
     commit = get_openssl_git_commit(args)
-    header_name = get_header_name(args, commit)
-    prolog, epilog = gen_header_prolog_and_epilog(header_name)
 
     lines = [
         "/* File generated by Tools/ssl/make_ssl_data.py */",
         f"/* Generated on {datetime.datetime.now(datetime.UTC).isoformat()} */",
         f"/* Generated from Git commit {commit} */",
+        "",
     ]
-    lines.extend(["", prolog, ""])
     lines.extend(gen_library_codes(args))
     lines.append("")
     lines.extend(gen_error_codes(args))
-    lines.extend(["", epilog])
 
     if args.output is None:
         for line in lines: