From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAOWq-0003Me-OB for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAOWk-0005y6-PV for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAOWk-0005xb-KG for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:38 -0400 From: Markus Armbruster Date: Wed, 1 Jul 2015 22:21:52 +0200 Message-Id: <1435782155-31412-5-git-send-email-armbru@redhat.com> In-Reply-To: <1435782155-31412-1-git-send-email-armbru@redhat.com> References: <1435782155-31412-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC v2 04/47] qapi-event: Clean up how name of enum QAPIEvent is made List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, berto@igalia.com, mdroth@linux.vnet.ibm.com Use c_name() instead of ad hoc code. Doesn't upcase the -p prefix, which is an improvement in my book. Unbreaks prefix containing '.', but other funny characters remain broken. To be fixed next. Signed-off-by: Markus Armbruster --- scripts/qapi-event.py | 2 +- tests/test-qmp-event.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 56bc602..cc74f4d 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -267,7 +267,7 @@ fdecl.write(mcgen(''' exprs = parse_schema(input_file) -event_enum_name = prefix.upper().replace('-', '_') + "QAPIEvent" +event_enum_name = c_name(prefix + "QAPIEvent", protect=False) event_enum_values = [] event_enum_strings = [] diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index 1ee40e1..28f146d 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -94,7 +94,7 @@ static bool qdict_cmp_simple(QDict *a, QDict *b) /* This function is hooked as final emit function, which can verify the correctness. */ -static void event_test_emit(TEST_QAPIEvent event, QDict *d, Error **errp) +static void event_test_emit(test_QAPIEvent event, QDict *d, Error **errp) { QObject *obj; QDict *t; -- 1.9.3