From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9F31C433DB for ; Tue, 23 Mar 2021 22:29:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7AF8961993 for ; Tue, 23 Mar 2021 22:29:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AF8961993 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOpWL-0001kd-Hn for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 18:29:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOpPX-000770-RS for qemu-devel@nongnu.org; Tue, 23 Mar 2021 18:22:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOpPT-0005MK-QJ for qemu-devel@nongnu.org; Tue, 23 Mar 2021 18:22:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616538118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XWbxuV6gefyi+u43HaL47W07asxRl166ybSwXGZXbcs=; b=PSZs5vRoPJUYRfR8nGPZZgupiYlxWVfLuLHB/5Fc/24iWuDwDePik1Wwcb09NaxVLYJ8no qRdgjoNqogxPnaqiElswckCqKZfX6DccDxEKgTJY9JijZkLJSv4f5d9L71qpkHCP1F902I f3C7a9pB+Jbq1SZ656E93gJ3xfGAwa4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-323-H3eeJJXKOOeltdZdwyjk7g-1; Tue, 23 Mar 2021 18:21:54 -0400 X-MC-Unique: H3eeJJXKOOeltdZdwyjk7g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56DD55B361; Tue, 23 Mar 2021 22:21:53 +0000 (UTC) Received: from [10.10.117.181] (ovpn-117-181.rdu2.redhat.com [10.10.117.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F79F2BFE9; Tue, 23 Mar 2021 22:21:49 +0000 (UTC) Subject: Re: [PATCH 11/28] qapi: Move uppercase rejection to check_name_lower() To: Markus Armbruster , qemu-devel@nongnu.org References: <20210323094025.3569441-1-armbru@redhat.com> <20210323094025.3569441-12-armbru@redhat.com> From: John Snow Message-ID: <510a6662-4511-aa59-8b4a-351e718b7a76@redhat.com> Date: Tue, 23 Mar 2021 18:21:48 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210323094025.3569441-12-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.roth@amd.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 3/23/21 5:40 AM, Markus Armbruster wrote: > check_name_lower() is the only user of check_name_str() using > permit_upper=False. Move the associated code from check_name_str() to > check_name_lower(), and drop the parameter. > > Signed-off-by: Markus Armbruster Reviewed-by: John Snow > --- > scripts/qapi/expr.py | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py > index 30285fe334..a815060ee2 100644 > --- a/scripts/qapi/expr.py > +++ b/scripts/qapi/expr.py > @@ -34,32 +34,31 @@ def check_name_is_str(name, info, source): > raise QAPISemError(info, "%s requires a string name" % source) > > > -def check_name_str(name, info, source, > - permit_upper=False): > +def check_name_str(name, info, source): > # Reserve the entire 'q_' namespace for c_name(), and for 'q_empty' > # and 'q_obj_*' implicit type names. > match = valid_name.match(name) > if not match or c_name(name, False).startswith('q_'): > raise QAPISemError(info, "%s has an invalid name" % source) > - if not permit_upper and name.lower() != name: > - raise QAPISemError( > - info, "%s uses uppercase in name" % source) > return match.group(3) > > > def check_name_upper(name, info, source): > - stem = check_name_str(name, info, source, permit_upper=True) > + stem = check_name_str(name, info, source) > # TODO reject '[a-z-]' in @stem > > > def check_name_lower(name, info, source, > permit_upper=False): > - stem = check_name_str(name, info, source, permit_upper) > + stem = check_name_str(name, info, source) > + if not permit_upper and name.lower() != name: > + raise QAPISemError( > + info, "%s uses uppercase in name" % source) > # TODO reject '_' in stem > > > def check_name_camel(name, info, source): > - stem = check_name_str(name, info, source, permit_upper=True) > + stem = check_name_str(name, info, source) > # TODO reject '[_-]' in stem, require CamelCase > > >