From 67fa64ce0ef92943a25de0f0760f8cfc10c2bbf3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 27 Sep 2019 15:46:25 +0200 Subject: qapi: Move check for reserved names out of add_name() The checks for reserved names are spread far and wide. Move one from add_name() to new check_defn_name_str(). This is a first step towards collecting them all in dedicated name checking functions next to check_name(). While there, drop the quotes around the meta-type in check_name_str()'s error messages: "'command' uses ... name 'NAME'" becomes "command uses ... name 'NAME'". Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20190927134639.4284-13-armbru@redhat.com> --- tests/qapi-schema/bad-ident.err | 2 +- tests/qapi-schema/reserved-command-q.err | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/qapi-schema') diff --git a/tests/qapi-schema/bad-ident.err b/tests/qapi-schema/bad-ident.err index ddc96bd3a9..79d14758ce 100644 --- a/tests/qapi-schema/bad-ident.err +++ b/tests/qapi-schema/bad-ident.err @@ -1,2 +1,2 @@ tests/qapi-schema/bad-ident.json: In struct '*oops': -tests/qapi-schema/bad-ident.json:2: 'struct' uses invalid name '*oops' +tests/qapi-schema/bad-ident.json:2: struct uses invalid name '*oops' diff --git a/tests/qapi-schema/reserved-command-q.err b/tests/qapi-schema/reserved-command-q.err index 0844e14b26..631cb5cdcc 100644 --- a/tests/qapi-schema/reserved-command-q.err +++ b/tests/qapi-schema/reserved-command-q.err @@ -1,2 +1,2 @@ tests/qapi-schema/reserved-command-q.json: In command 'q-unix': -tests/qapi-schema/reserved-command-q.json:5: 'command' uses invalid name 'q-unix' +tests/qapi-schema/reserved-command-q.json:5: command uses invalid name 'q-unix' -- cgit v1.2.3-55-g7522