From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RVWTr-0003Mj-4N for qemu-devel@nongnu.org; Tue, 29 Nov 2011 17:48:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RVWTn-0005pp-6o for qemu-devel@nongnu.org; Tue, 29 Nov 2011 17:48:51 -0500 From: Michael Roth Date: Tue, 29 Nov 2011 16:47:48 -0600 Message-Id: <1322606869-25865-1-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <4ED3F1C3.4060601@weilnetz.de> References: <4ED3F1C3.4060601@weilnetz.de> Subject: [Qemu-devel] [PATCH 1/2] qapi: fix guardname generation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, sw@weilnetz.de, stefano.stabellini@eu.citrix.com Fix a bug in handling dotted paths, and exclude directory prefixes from generated guardnames to avoid odd/pseudo-random guardnames in generated headers. --- scripts/qapi.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 5299976..6e05469 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' -- 1.7.4.1