From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1rOB8m-0004Gd-WB for mharc-qemu-trivial@gnu.org; Fri, 12 Jan 2024 01:35:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOB8i-0004GA-V4 for qemu-trivial@nongnu.org; Fri, 12 Jan 2024 01:35:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOB8g-0001qU-Q5 for qemu-trivial@nongnu.org; Fri, 12 Jan 2024 01:35:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705041333; 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: in-reply-to:in-reply-to:references:references; bh=PMIpQZcnc580wUtLQFBJGZjJZz07Tpq6WDHyl5LT5P0=; b=CMjwrFHhigyq0vkPkkUPM/G6pibdoaHKDGCFpU9XQ5j8whME2iB7LqvbF2d1aKEPWFmr4X umvb+dkecMIWa714wOjg/VJKcQOC79WuH4EHm0dXnOw6aWiL7eB/CHppK2jDtJX60D+D7H nPRNDIW4wgTFlX9uDnWztQGu2OtsYjA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-uz40I5wjMP6E49k-2aezqg-1; Fri, 12 Jan 2024 01:35:28 -0500 X-MC-Unique: uz40I5wjMP6E49k-2aezqg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AAA04833B42; Fri, 12 Jan 2024 06:35:28 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.71]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A6EBC1D368; Fri, 12 Jan 2024 06:35:28 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7FEC521E6740; Fri, 12 Jan 2024 07:35:27 +0100 (CET) From: Markus Armbruster To: Thomas Huth Cc: qemu-devel@nongnu.org, Paolo Bonzini , qemu-trivial@nongnu.org Subject: Re: [PATCH] util/uri: Remove is_hex() function In-Reply-To: <20240112051740.926658-1-thuth@redhat.com> (Thomas Huth's message of "Fri, 12 Jan 2024 06:17:40 +0100") References: <20240112051740.926658-1-thuth@redhat.com> Date: Fri, 12 Jan 2024 07:35:27 +0100 Message-ID: <87h6jjqcsw.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -45 X-Spam_score: -4.6 X-Spam_bar: ---- X-Spam_report: (-4.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.467, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jan 2024 06:35:37 -0000 Thomas Huth writes: > We can simply use the g_ascii_isxdigit() from the glib instead. > > Signed-off-by: Thomas Huth > --- > util/uri.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/util/uri.c b/util/uri.c > index dcb3305236..7411c5ba14 100644 > --- a/util/uri.c > +++ b/util/uri.c > @@ -1561,15 +1561,6 @@ done_cd: > return 0; > } > > -static int is_hex(char c) > -{ > - if (((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || > - ((c >= 'A') && (c <= 'F'))) { > - return 1; > - } > - return 0; > -} > - > /** > * uri_string_unescape: > * @str: the string to unescape > @@ -1607,7 +1598,7 @@ char *uri_string_unescape(const char *str, int len, char *target) > in = str; > out = ret; > while (len > 0) { > - if ((len > 2) && (*in == '%') && (is_hex(in[1])) && (is_hex(in[2]))) { > + if (len > 2 && *in == '%' && g_ascii_isxdigit(in[1]) && g_ascii_isxdigit(in[2])) { > in++; > if ((*in >= '0') && (*in <= '9')) { > *out = (*in - '0'); Suggest to replace *in by in[0] while there, for symmetry. Long line, easy to break: if (len > 2 && in[0] == '%' && g_ascii_isxdigit(in[1]) && g_ascii_isxdigit(in[2])) {