From 6dcb71a788fc7ddb22cfa22cca76ec7b9cf2998e Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 19 Feb 2018 16:05:50 -0500 Subject: [PATCH] qapi: Simplify guardname() The guards around built-in declarations lose their _H. It never made much sense anyway. Backports commit 00dfc3b2c272d98556ec6095d56bdd8b036babf9 from qemu --- qemu/scripts/qapi.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/qemu/scripts/qapi.py b/qemu/scripts/qapi.py index 43a03386..43b5a3ac 100644 --- a/qemu/scripts/qapi.py +++ b/qemu/scripts/qapi.py @@ -957,14 +957,8 @@ def mcgen(code, **kwds): code = code[1:] return cgen(code, **kwds) -def basename(filename): - return filename.split("/")[-1] - def guardname(filename): - guard = basename(filename).rsplit(".", 1)[0] - for substr in [".", " ", "-"]: - guard = guard.replace(substr, "_") - return guard.upper() + '_H' + return c_name(filename, protect=False).upper() def guardstart(name): return mcgen(''' @@ -1034,6 +1028,7 @@ def parse_command_line(extra_options = "", extra_long_options = []): def open_output(output_dir, do_c, do_h, prefix, c_file, h_file, c_comment, h_comment): + guard = guardname(prefix + h_file) c_file = output_dir + prefix + c_file h_file = output_dir + prefix + h_file @@ -1066,7 +1061,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file, #define %(guard)s ''', - comment = h_comment, guard = guardname(h_file))) + comment = h_comment, guard = guard)) return (fdef, fdecl)