From: Michael Roth <mdroth@linux.vnet.ibm.com>
Date: Tue, 29 Nov 2011 22:47:48 +0000 (-0600)
Subject: qapi: fix guardname generation
X-Git-Tag: qemu-xen-4.3.0-rc1~1944
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d8e1f214a0046b85f5297b0396f3678531b8982d;p=qemu-upstream-4.3-testing.git

qapi: fix guardname generation

Fix a bug in handling dotted paths, and exclude directory prefixes
from generated guardnames to avoid odd/pseudo-random guardnames in
generated headers.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/scripts/qapi.py b/scripts/qapi.py
index 52999763e..6e05469e6 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -200,6 +200,7 @@ def basename(filename):
     return filename.split("/")[-1]
 
 def guardname(filename):
-    if filename.startswith('./'):
-        filename = filename[2:]
-    return filename.replace("/", "_").replace("-", "_").split(".")[0].upper() + '_H'
+    guard = basename(filename).rsplit(".", 1)[0]
+    for substr in [".", " ", "-"]:
+        guard = guard.replace(substr, "_")
+    return guard.upper() + '_H'