From nobody Thu Dec 18 08:10:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574261412; cv=none; d=zoho.com; s=zohoarc; b=Fblw6dpQCcpaN+p2OhL/SSXcF7FepHP3ic8jkduRA2XiNfTg4i2U/TvflRQc/oG0/26CwreybiS2Rs6O7/T8fkKOuMSvNAcCTk+N5OFL482bZfCLH7oSgNrJ8sK36VbAk+GD8fhSw1/SUVnXbVw3qHZe5rpXfMWTMNcsxgTSVRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261412; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nstvlRvJbh5aClK1LTMQKw3RzAtu9/Ba2WWBBe8/MA4=; b=nq5lyMYJNa4FDGsuWcFLyD6fnRHWCS4v6RIzacMZnm8AaN4Xw/gdNSwHI4QDKsNGwvuoLhqVzubg5AxfZuLjPWD/gWscBYsJzCU659hkrSuTqgZynzckBMWV6h3EYPG4vki7Aqp5lGLIq4aVohdj1CuTliVnwi97LO6kQO4epmQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1574261412934255.3233639439735; Wed, 20 Nov 2019 06:50:12 -0800 (PST) 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-113-RzMaSEZ7MgS0i7e-Iv0rjw-1; Wed, 20 Nov 2019 09:49:03 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E6AE5109D09B; Wed, 20 Nov 2019 14:48:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B6CEA1037ADB; Wed, 20 Nov 2019 14:48:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 73DE44E573; Wed, 20 Nov 2019 14:48:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAKEmhFv004869 for ; Wed, 20 Nov 2019 09:48:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7CBD81037ADA; Wed, 20 Nov 2019 14:48:43 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 078B01037ACE for ; Wed, 20 Nov 2019 14:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261411; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nstvlRvJbh5aClK1LTMQKw3RzAtu9/Ba2WWBBe8/MA4=; b=Mgk+XkJCQ1hnDfrVo3RQKXzXSithdzsOmlh9phatOmD+2SuhmQPddkCwc/JYUXiIIg7W69 ti5S4gkMK5IC4LTHND3gh2Zi2NqyK5Wgen3SKs4FcxYCy/UPysEW7Zsypa5sTs+UAJV8b4 5oVgAMSUQUmUOBngWqUB9I9HLePcc3o= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:23 +0100 Message-Id: <8a821e4a09f24cedbfb295726f1e44ad18f6a2ba.1574261216.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 10/14] use g_ascii_isxdigit instead of c_isxdigit from gnulib X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: RzMaSEZ7MgS0i7e-Iv0rjw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/util/virmacaddr.c | 6 +++--- src/util/virutil.c | 2 +- src/util/viruuid.c | 5 ++--- src/vmx/vmx.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 3eb6407c45..a6893faf9a 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -38,9 +38,9 @@ virMacAddrCompare(const char *p, const char *q) { unsigned char c, d; do { - while (*p =3D=3D '0' && c_isxdigit(p[1])) + while (*p =3D=3D '0' && g_ascii_isxdigit(p[1])) ++p; - while (*q =3D=3D '0' && c_isxdigit(q[1])) + while (*q =3D=3D '0' && g_ascii_isxdigit(q[1])) ++q; c =3D c_tolower(*p); d =3D c_tolower(*q); @@ -153,7 +153,7 @@ virMacAddrParse(const char* str, virMacAddrPtr addr) /* This is solely to avoid accepting the leading * space or "+" that strtoul would otherwise accept. */ - if (!c_isxdigit(*str)) + if (!g_ascii_isxdigit(*str)) break; =20 result =3D strtoul(str, &end_ptr, 16); /* exempt from syntax-check= */ diff --git a/src/util/virutil.c b/src/util/virutil.c index f3cf494353..12f44796c8 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1525,7 +1525,7 @@ virValidateWWN(const char *wwn) p +=3D 2; =20 for (i =3D 0; p[i]; i++) { - if (!c_isxdigit(p[i])) + if (!g_ascii_isxdigit(p[i])) break; } =20 diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 835c873300..0745189aa9 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -28,7 +28,6 @@ #include #include =20 -#include "c-ctype.h" #include "internal.h" #include "virutil.h" #include "virerror.h" @@ -113,14 +112,14 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) cur++; continue; } - if (!c_isxdigit(*cur)) + if (!g_ascii_isxdigit(*cur)) goto error; uuid[i] =3D virHexToBin(*cur); uuid[i] *=3D 16; cur++; if (*cur =3D=3D 0) goto error; - if (!c_isxdigit(*cur)) + if (!g_ascii_isxdigit(*cur)) goto error; uuid[i] +=3D virHexToBin(*cur); i++; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 0ccc4eefe6..20dc974928 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -666,7 +666,7 @@ virVMXUnescapeHex(char *string, char escape) /* Unescape from 'cXX' where c is the escape char and X is a hex digit= */ while (*tmp1 !=3D '\0') { if (*tmp1 =3D=3D escape) { - if (!c_isxdigit(tmp1[1]) || !c_isxdigit(tmp1[2])) + if (!g_ascii_isxdigit(tmp1[1]) || !g_ascii_isxdigit(tmp1[2])) return -1; =20 *tmp2++ =3D virHexToBin(tmp1[1]) * 16 + virHexToBin(tmp1[2]); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list