From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1574261325; cv=none; d=zoho.com; s=zohoarc; b=idIcf+b4GOblQdp+4XWqCRL2DOY0AiUlxJmM/paU1eehTagAbBdkrBRV+Xfatx1T41Wdh+KUWi8zCne9i4MtDr04C4BUH4xNK8fIUEsOlENS0Qg8qes4za87dTy7gJZpkQ+aPthE3avSpvBVIJeha13Z/MNMf4j+K5B+QU5JjSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261325; 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=fBdlYKcYs1rLuQYnxz0jszkh6f7OZlFTIimifI2TFkA=; b=d+2kkvdiBg7eLslAuF5a+SXZlClhK+5efFBMl5S8+cipy6KzcGINjbUn5ZhKlL8sg1EuHFLSwtXuKIeY0xVpA8RQdDnIAxN8WiGcrMVmN72h9YVU0Mo+6Ms8pLNoh4yFH3D04cAEJngpWAUlxyte+/uoid2gV5DgMfKQbRwPPwU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574261325133772.7609328655165; Wed, 20 Nov 2019 06:48:45 -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-97-immBPReuM1-jIbi9r3UyeQ-1; Wed, 20 Nov 2019 09:48:41 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CF3C8C0EBA; Wed, 20 Nov 2019 14:48:35 +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 10C9C66D44; Wed, 20 Nov 2019 14:48:35 +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 C106D4BB78; Wed, 20 Nov 2019 14:48:34 +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 xAKEmVXO004779 for ; Wed, 20 Nov 2019 09:48:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id AE6C31037AD2; Wed, 20 Nov 2019 14:48:31 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A83A1037AD1 for ; Wed, 20 Nov 2019 14:48:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261324; 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=fBdlYKcYs1rLuQYnxz0jszkh6f7OZlFTIimifI2TFkA=; b=iJaaEoJzPlN+H/Qnb6Ttkyy2VuzYNUHVB3e4JyQ+37+VHtysZxMy6YqWK6vBSOss1VYd+4 Putf9kAud+zDvlgpsnUIPNn7UsecLt4tZtDu+xvPZmjnlZJT8XBSIse2yrUWzADkmsnMl5 YGq5HVYwiS4hefZwobKg/f4anFyvO6E= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:14 +0100 Message-Id: <9f0bb1ae1d7f15b8cfeccbfab6a9775250cc1fc6.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 01/14] util: define IS_BLANK instead of using c_isblank 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.79 on 10.5.11.16 X-MC-Unique: immBPReuM1-jIbi9r3UyeQ-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" The same way how we have IS_EOL in two files where we actually need it defince IS_BLANK so we can drop usage of c_isblank. Signed-off-by: Pavel Hrdina Reviewed-by: Cole Robinson --- src/util/virconf.c | 7 ++++--- src/util/virkeyfile.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index cc88000387..42c847f999 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -56,13 +56,14 @@ struct _virConfParserCtxt { #define CUR (*ctxt->cur) #define NEXT if (ctxt->cur < ctxt->end) ctxt->cur++; #define IS_EOL(c) (((c) =3D=3D '\n') || ((c) =3D=3D '\r')) +#define IS_BLANK(c) (((c) =3D=3D ' ') || ((c) =3D=3D '\t')) =20 #define SKIP_BLANKS_AND_EOL \ - do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR) || IS_EOL(CUR))) = { \ + do { while ((ctxt->cur < ctxt->end) && (IS_BLANK(CUR) || IS_EOL(CUR))) {= \ if (CUR =3D=3D '\n') ctxt->line++; \ ctxt->cur++; } } while (0) #define SKIP_BLANKS \ - do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR))) \ + do { while ((ctxt->cur < ctxt->end) && (IS_BLANK(CUR))) \ ctxt->cur++; } while (0) =20 VIR_ENUM_IMPL(virConf, @@ -428,7 +429,7 @@ virConfParseString(virConfParserCtxtPtr ctxt) while ((ctxt->cur < ctxt->end) && (!IS_EOL(CUR))) NEXT; /* Reverse to exclude the trailing blanks from the value */ - while ((ctxt->cur > base) && (c_isblank(CUR))) + while ((ctxt->cur > base) && (IS_BLANK(CUR))) ctxt->cur--; if (VIR_STRNDUP(ret, base, ctxt->cur - base) < 0) return NULL; diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index c7e756d26a..6cd3a5168e 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -77,6 +77,7 @@ struct _virKeyFileParserCtxt { =20 #define IS_EOF (ctxt->cur >=3D ctxt->end) #define IS_EOL(c) (((c) =3D=3D '\n') || ((c) =3D=3D '\r')) +#define IS_BLANK(c) (((c) =3D=3D ' ') || ((c) =3D=3D '\t')) #define CUR (*ctxt->cur) #define NEXT if (!IS_EOF) ctxt->cur++; =20 @@ -205,7 +206,7 @@ static int virKeyFileParseComment(virKeyFileParserCtxtP= tr ctxt) =20 static int virKeyFileParseBlank(virKeyFileParserCtxtPtr ctxt) { - while ((ctxt->cur < ctxt->end) && c_isblank(CUR)) + while ((ctxt->cur < ctxt->end) && IS_BLANK(CUR)) ctxt->cur++; =20 if (!((ctxt->cur =3D=3D ctxt->end) || IS_EOL(CUR))) { @@ -226,7 +227,7 @@ static int virKeyFileParseStatement(virKeyFileParserCtx= tPtr ctxt) ret =3D virKeyFileParseValue(ctxt); } else if (CUR =3D=3D '#' || CUR =3D=3D ';') { ret =3D virKeyFileParseComment(ctxt); - } else if (c_isblank(CUR) || IS_EOL(CUR)) { + } else if (IS_BLANK(CUR) || IS_EOL(CUR)) { ret =3D virKeyFileParseBlank(ctxt); } else { virKeyFileError(ctxt, VIR_ERR_CONF_SYNTAX, "unexpected statement"); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1574261330; cv=none; d=zoho.com; s=zohoarc; b=gU4Q8gvcxcBufLQnpouau9sjGtl19jc8QEaM6QO637MQ/3IkcxPVRawXgr6H4mda4aGHDgR2ks34O4WM3ApIa5siIdho/l93oc8W//mJoQA2oQAX7Ms4WTT3GNWbm1HNlHNfs/Ns6zs1hzLCiOdJj5w3pGENw0mbTpw+xUX3Mu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261330; 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=LN9vrF7tXFT0qFnVWfC+pJoJaca2OakpNxnHc3bpWbs=; b=KUhXUkZnK6rFm35ITLJfrx/UuoVNvswOskVkmrQpmKG/WiIgC2xfaG/vSg4DhJanDc40Tr9JyVmIrnvRFYiFKPRkrCKUTseQBW62dmbE3o5fFlSVBdwYpfwFPVIc1RGG2SskRfoPdYzT7TjjzUy74p0JaOp01oPs46jUfylb4sk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 157426133053419.067009289947578; Wed, 20 Nov 2019 06:48:50 -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-346-vnr5y8foNd-YMFGpv8XX7A-1; Wed, 20 Nov 2019 09:48:47 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D678802690; Wed, 20 Nov 2019 14:48:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 568135F79B; Wed, 20 Nov 2019 14:48:40 +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 144B018089D0; Wed, 20 Nov 2019 14:48:40 +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 xAKEmWSK004791 for ; Wed, 20 Nov 2019 09:48:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7E6541054FBF; Wed, 20 Nov 2019 14:48:32 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06B951037ACE for ; Wed, 20 Nov 2019 14:48:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261329; 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=LN9vrF7tXFT0qFnVWfC+pJoJaca2OakpNxnHc3bpWbs=; b=OK9JX3NyejjV0Lb42DmtT+3V0+4p8QevRvsNYP1fzS6JRenqCU9ORI4DkVrtfPVqWFrVud +AAn99IB2BdkKVB/ys1xo4ijIZlgLb3GQrnrfU82g1yAIm+mJI8WA4+nbVYqKzi3KtOeNB 4cNcoGpGWo5n41VO1COTlbiHBpPp8ZU= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:15 +0100 Message-Id: <83fc5a42f5c90fcc8dcfad5bebe7ffca7126dcb0.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 02/14] virkeyfile: define IS_ASCII instead c_isascii 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.79 on 10.5.11.15 X-MC-Unique: vnr5y8foNd-YMFGpv8XX7A-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" GLib doesn't provide alternative to c_isascii and this is the only usage of that macro so define a replacement ourselves. Signed-off-by: Pavel Hrdina Reviewed-by: Cole Robinson --- src/util/virkeyfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 6cd3a5168e..054a187ba2 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -21,7 +21,6 @@ #include =20 =20 -#include "c-ctype.h" #include "virlog.h" #include "viralloc.h" #include "virfile.h" @@ -78,6 +77,7 @@ struct _virKeyFileParserCtxt { #define IS_EOF (ctxt->cur >=3D ctxt->end) #define IS_EOL(c) (((c) =3D=3D '\n') || ((c) =3D=3D '\r')) #define IS_BLANK(c) (((c) =3D=3D ' ') || ((c) =3D=3D '\t')) +#define IS_ASCII(c) ((c) < 128) #define CUR (*ctxt->cur) #define NEXT if (!IS_EOF) ctxt->cur++; =20 @@ -110,7 +110,7 @@ static int virKeyFileParseGroup(virKeyFileParserCtxtPtr= ctxt) VIR_FREE(ctxt->groupname); =20 name =3D ctxt->cur; - while (!IS_EOF && c_isascii(CUR) && CUR !=3D ']') + while (!IS_EOF && IS_ASCII(CUR) && CUR !=3D ']') ctxt->cur++; if (CUR !=3D ']') { virKeyFileError(ctxt, VIR_ERR_CONF_SYNTAX, "cannot find end of gro= up name, expected ']'"); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1574261323; cv=none; d=zoho.com; s=zohoarc; b=n/Wo34Y4SzaDKC4GgdiXJo5RMyHsv8+sTxVdA38wuk7RZkUFhLYs//1I8ysmnrreWjD6hRR1x8GNMvbFE2OEHRN6vvmUeT7Jd+nwRflqf757wpOYPgyR27/LvokZ/1rQ/ZKozi8X0jrBowQXauTiuSMl3BMeNxUnuXZ+BBJW9Nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261323; 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=gHHLKtXUksjn9mfeWZE0S3A33z6ZIr/1apREdZTU5x8=; b=nSOjlqU21usr5rO3FxdVYZt5Ij90eNlB4nMwFhYhJvf49fAom+1pSIqc5FAdieqXO9ks6Y5sAr/ZjyvZeMa76jzLDzaU4idQeHEy3FMcCmdBgMc+na6o8Serv1AcQB4wNzL+btn/ON07aoEV/MQvDjCAz3MIETL7CD/FDi8YJFE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1574261323103690.6736783405925; Wed, 20 Nov 2019 06:48:43 -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-84-Y_MUUlP6MmqwZdQ2bLEWiQ-1; Wed, 20 Nov 2019 09:48:40 -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 19BA38C0EA6; Wed, 20 Nov 2019 14:48:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E69591037ACE; Wed, 20 Nov 2019 14:48:34 +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 4E90718089D0; Wed, 20 Nov 2019 14:48:34 +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 xAKEmX3I004799 for ; Wed, 20 Nov 2019 09:48:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5710D1037AD2; Wed, 20 Nov 2019 14:48:33 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5F931037ACE for ; Wed, 20 Nov 2019 14:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261321; 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=gHHLKtXUksjn9mfeWZE0S3A33z6ZIr/1apREdZTU5x8=; b=aC1CdCS7uwEmh6zH66hNOzxhK2q91+Lx0AeeOcSHF/fAsVObg6QOh4WebW+BM7+DYvk2yB dMjeQfTiVr0LwLnKe+pvsdSAjqWplg3XcptRzv+tgoRip58BvwP0xKWpBfuqNtq033hQG/ V52JLMy1f30+A/nJ9ctdzpOFX2AIZaQ= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:16 +0100 Message-Id: <7159a98f256049d6b51d50ba2f54e9b8877feaf4.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 03/14] use g_ascii_isalnum instead of c_isalnum 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: Y_MUUlP6MmqwZdQ2bLEWiQ-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 Reviewed-by: Cole Robinson --- src/node_device/node_device_udev.c | 3 +-- src/util/virconf.c | 2 +- src/util/virkeyfile.c | 4 ++-- tools/vsh.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index fabd2ec454..cae00dc9dc 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -22,7 +22,6 @@ #include #include #include -#include =20 #include "dirname.h" #include "node_device_conf.h" @@ -307,7 +306,7 @@ udevGenerateDeviceName(struct udev_device *device, def->name =3D virBufferContentAndReset(&buf); =20 for (i =3D 0; i < strlen(def->name); i++) { - if (!(c_isalnum(*(def->name + i)))) + if (!(g_ascii_isalnum(*(def->name + i)))) *(def->name + i) =3D '_'; } =20 diff --git a/src/util/virconf.c b/src/util/virconf.c index 42c847f999..b67716b9ce 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -562,7 +562,7 @@ virConfParseName(virConfParserCtxtPtr ctxt) return NULL; } while ((ctxt->cur < ctxt->end) && - (c_isalnum(CUR) || (CUR =3D=3D '_') || + (g_ascii_isalnum(CUR) || (CUR =3D=3D '_') || ((ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) && ((CUR =3D=3D ':') || (CUR =3D=3D '.') || (CUR =3D=3D '-'))) || ((ctxt->conf->flags & VIR_CONF_FLAG_LXC_FORMAT) && diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 054a187ba2..e50a37d3a7 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -154,7 +154,7 @@ static int virKeyFileParseValue(virKeyFileParserCtxtPtr= ctxt) } =20 keystart =3D ctxt->cur; - while (!IS_EOF && c_isalnum(CUR) && CUR !=3D '=3D') + while (!IS_EOF && g_ascii_isalnum(CUR) && CUR !=3D '=3D') ctxt->cur++; if (CUR !=3D '=3D') { virKeyFileError(ctxt, VIR_ERR_CONF_SYNTAX, "expected end of value = name, expected '=3D'"); @@ -223,7 +223,7 @@ static int virKeyFileParseStatement(virKeyFileParserCtx= tPtr ctxt) =20 if (CUR =3D=3D '[') { ret =3D virKeyFileParseGroup(ctxt); - } else if (c_isalnum(CUR)) { + } else if (g_ascii_isalnum(CUR)) { ret =3D virKeyFileParseValue(ctxt); } else if (CUR =3D=3D '#' || CUR =3D=3D ';') { ret =3D virKeyFileParseComment(ctxt); diff --git a/tools/vsh.c b/tools/vsh.c index 1076c8254b..beee1c2986 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1444,7 +1444,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *pa= rser, vshCmd **partial) } else if (data_only) { goto get_data; } else if (tkdata[0] =3D=3D '-' && tkdata[1] =3D=3D '-' && - c_isalnum(tkdata[2])) { + g_ascii_isalnum(tkdata[2])) { char *optstr =3D strchr(tkdata + 2, '=3D'); size_t opt_index =3D 0; =20 --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1574261328; cv=none; d=zoho.com; s=zohoarc; b=AF+p+Ml+qpIK+eenUeVgWKEQzr9EchJ3XO5lhhE53kFJgKiJELFRVm3f7tT34GH1TbLdctBKn0emEORs46rb9lqwi2ZCqnJocTiZL6z3zqvLsSiY1NgOuVG1qSV6hNPRQ+P3NLazk0AwZWFNxJxyY8GZOIA6YtceN1FLSdQ5FX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261328; 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=Fs1A2Fs/NJaxF2mjy011PAMGVc1a1xRXDrJlQCvySOo=; b=DHQM0oqJgAykxwYwwbacoGRywSHikxsYVpiXhGB9Q03Qj3vyoSTZbQ1l7wLogwaqvduqspCED3afZX7/WgyphENFCvpRxMXa9Rk/trZ1P/ftYlXCPXRTWAQyw0zPAulkA1coE3kpOWvX+Qat4ONZ+hNXjTUHkUtrN0mfE4fTCBA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1574261328971450.25182515279107; Wed, 20 Nov 2019 06:48:48 -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-286-HeZsTMeYM8uO12CGdlNwMg-1; Wed, 20 Nov 2019 09:48:45 -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 6F406107ACC7; Wed, 20 Nov 2019 14:48:40 +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 45A0A1037ADA; Wed, 20 Nov 2019 14:48:40 +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 EE32B4E566; Wed, 20 Nov 2019 14:48:39 +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 xAKEmaw8004819 for ; Wed, 20 Nov 2019 09:48:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id BE9041037ADA; Wed, 20 Nov 2019 14:48:36 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 489761037AD2 for ; Wed, 20 Nov 2019 14:48:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261327; 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=Fs1A2Fs/NJaxF2mjy011PAMGVc1a1xRXDrJlQCvySOo=; b=cUtgknnIgrIaYQ/S8yzzwiFMWqmmHS94Qktbne8VF2x+LGMi/09Shqqpd9ta0KxCqA/Zij m99wlPFbPM6a2yeszwxB3TD/7QmdeJzaLzZ4JcdE2K1Ruac4cGN5SL+vV0y8ffMRSGK+3f KlArWpZYWT/1ORCP3XzT+pPluNRTAnU= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:17 +0100 Message-Id: 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 04/14] use g_ascii_isalpha instead of c_isalpha 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: HeZsTMeYM8uO12CGdlNwMg-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 Reviewed-by: Cole Robinson --- src/conf/network_conf.c | 3 +-- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_qapi.c | 4 +--- src/util/virconf.c | 2 +- src/util/virfile.c | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6970831593..5551b5b4d5 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -37,7 +37,6 @@ #include "virxml.h" #include "viruuid.h" #include "virbuffer.h" -#include "c-ctype.h" #include "virfile.h" #include "virstring.h" =20 @@ -482,7 +481,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, } =20 name =3D virXMLPropString(node, "name"); - if (name && (!c_isalpha(name[0]))) { + if (name && (!g_ascii_isalpha(name[0]))) { virReportError(VIR_ERR_XML_ERROR, _("Cannot use host name '%s' in network '%s'"), name, networkName); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f54b9b21ff..5eea0ebcd7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -40,7 +40,6 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "c-ctype.h" #include "cpu/cpu.h" #include "viruuid.h" #include "virfile.h" @@ -3768,7 +3767,7 @@ qemuDomainDefNamespaceParseCommandlineArgs(qemuDomain= XmlNsDefPtr nsdef, static int qemuDomainDefNamespaceParseCommandlineEnvNameValidate(const char *envname) { - if (!c_isalpha(envname[0]) && envname[0] !=3D '_') { + if (!g_ascii_isalpha(envname[0]) && envname[0] !=3D '_') { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid environment name, it must begin with a l= etter or underscore")); return -1; diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 484f274c63..15a85fd1ad 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -25,8 +25,6 @@ #include "virerror.h" #include "virlog.h" =20 -#include "c-ctype.h" - #define VIR_FROM_THIS VIR_FROM_QEMU =20 VIR_LOG_INIT("qemu.qemu_qapi"); @@ -165,7 +163,7 @@ virQEMUQAPISchemaTraverseObject(virJSONValuePtr cur, const char *query =3D virQEMUQAPISchemaTraverseContextNextQuery(ctxt); char modifier =3D *query; =20 - if (!c_isalpha(modifier)) + if (!g_ascii_isalpha(modifier)) query++; =20 /* exit on modifers for other types */ diff --git a/src/util/virconf.c b/src/util/virconf.c index b67716b9ce..a9a7148701 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -556,7 +556,7 @@ virConfParseName(virConfParserCtxtPtr ctxt) SKIP_BLANKS; base =3D ctxt->cur; /* TODO: probably need encoding support and UTF-8 parsing ! */ - if (!c_isalpha(CUR) && + if (!g_ascii_isalpha(CUR) && !((ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) && (CUR =3D=3D '.= '))) { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a name")); return NULL; diff --git a/src/util/virfile.c b/src/util/virfile.c index fca7ff9d35..a329f2e83f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3190,7 +3190,7 @@ virFileIsAbsPath(const char *path) return true; =20 #ifdef WIN32 - if (c_isalpha(path[0]) && + if (g_ascii_isalpha(path[0]) && path[1] =3D=3D ':' && VIR_FILE_IS_DIR_SEPARATOR(path[2])) return true; @@ -3242,7 +3242,7 @@ virFileSkipRoot(const char *path) =20 #ifdef WIN32 /* Skip X:\ */ - if (c_isalpha(path[0]) && + if (g_ascii_isalpha(path[0]) && path[1] =3D=3D ':' && VIR_FILE_IS_DIR_SEPARATOR(path[2])) return path + 3; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1574261335; cv=none; d=zoho.com; s=zohoarc; b=bjJgWx6898IjRuIAYcGL+hEEfTY4vg7fAmjMZ25mvjUDRG+KPXs/PJO/t6y/r1NHL3i/F4FAYuVu06kh8Ud0nhhRHMJamd5EWtvJRsCi7l8t7LFB3s9K2fK0AH/b3ODCHJlqCwZyFDsRKYifErAoOjCy9PIzTOPe6qeCkcn3440= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261335; 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=O+d1WzD2i+4tEyQytPTLqGvnTnl8S2kNSxVvoU+bndo=; b=juI/adlqpUBUP6FLxdJZ1VASZPN5ruUb8WfzF5/Qhq0HLWkjtmj36bthEv0r4bKZUZddOFp79H9Sm7FBVAq79Lk1wY1a604enORphpmMpD9OTdYwr5lDwhDl87r+6gPqS+PaObC7arA74DVwu2h9ke5bjS9fZ3pwSMSyCPp8xCM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574261335743839.467379428229; Wed, 20 Nov 2019 06:48:55 -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-419-RT3HdUP1Np-wJiCqeh9WAA-1; Wed, 20 Nov 2019 09:48:50 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ABF8C109D093; Wed, 20 Nov 2019 14:48:41 +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 83B3267276; Wed, 20 Nov 2019 14:48:41 +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 3D9D44E56D; Wed, 20 Nov 2019 14:48:41 +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 xAKEmbtk004824 for ; Wed, 20 Nov 2019 09:48:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8BDD61037AD2; Wed, 20 Nov 2019 14:48:37 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1740F1037ACE for ; Wed, 20 Nov 2019 14:48:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261334; 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=O+d1WzD2i+4tEyQytPTLqGvnTnl8S2kNSxVvoU+bndo=; b=P15NHOyvE2CSgjOsw8pDfdNlgJ6wprzPPxT6zpcIhLsqTfyWY8B9YU+L9L4snhrHQndkL3 6C1MjOhPsS5R4sjQp5lQiDQdcpudOMcCyTXConflC7iL9JI2+HV7ZPzHOMg7ka6okJTdGS RWx3uwUXbos95iTwi5s6giimcO4LYhs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:18 +0100 Message-Id: <43e04df82ac7b0361826aff9b14dae2d3c341c8d.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 05/14] use g_ascii_iscntrl instead of c_iscntrl 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.79 on 10.5.11.16 X-MC-Unique: RT3HdUP1Np-wJiCqeh9WAA-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 Reviewed-by: Cole Robinson --- tools/vsh-table.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vsh-table.c b/tools/vsh-table.c index 9008b0d431..28072c9719 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -226,7 +226,7 @@ vshTableSafeEncode(const char *s, size_t *width) =20 while (p && *p) { if ((*p =3D=3D '\\' && *(p + 1) =3D=3D 'x') || - c_iscntrl(*p)) { + g_ascii_iscntrl(*p)) { g_snprintf(buf, HEX_ENCODE_LENGTH + 1, "\\x%02x", *p); buf +=3D HEX_ENCODE_LENGTH; *width +=3D HEX_ENCODE_LENGTH; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 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=1574261410; cv=none; d=zoho.com; s=zohoarc; b=Lus0C7nAsCbJjWRxjde/KSqKpT91+vl+Wv+OfqKO+58Kxw7XJfkxhY4FFJzYJDLHf6RaVwWsVJtd2WcgpdWlhH3C8YloJeS2ZaXxh6nJ9T+Z28ZDY6p85nC6NaD8gpmEtBB24DsPHRGf8lLDrypcyhjQ/hNqdxuhWST2de7SQRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261410; 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=l3U6nDyoqxt4252KH3QWcPZ1FJNts0Pi5bIahlscl80=; b=GebpguRIT8N6D7YwYU0NETMIG8l8WsuFEwDgkMRIaYLaI1N2Lz1SZ5tbwGPExX/0EkosPfGwN42w+QKIxrAadCZo9SmiH5TrIyNg2sGJVp/yodn/n9Wnz2Oubn4h+FhGJTaEpohCkbVW/MPwzqEwZOrvH5/LqGCdkWokQcy5W4Y= 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 1574261410595635.0963078319196; Wed, 20 Nov 2019 06:50:10 -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-418-LKHDX7d6PbCqKZ7Low1fOw-1; Wed, 20 Nov 2019 09:48:50 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 42365109D08B; Wed, 20 Nov 2019 14:48:44 +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 08B972AA88; Wed, 20 Nov 2019 14:48:44 +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 AEF844E56D; Wed, 20 Nov 2019 14:48:43 +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 xAKEme1o004838 for ; Wed, 20 Nov 2019 09:48:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4580D1037AD4; Wed, 20 Nov 2019 14:48:40 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id C465A1037AD2 for ; Wed, 20 Nov 2019 14:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261409; 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=l3U6nDyoqxt4252KH3QWcPZ1FJNts0Pi5bIahlscl80=; b=WzIfzhMm5WRHAswNEb0187oLThkJss/ZnTNHK7D5/lf7rTPSZ+tewRxZ9wRn/2GmeBwqeg 3YEuKn4VMOX+SINAyvNwMpfTTqwFU+bGKB3ESLa7BG0KvIZCI92dNrxiPsgDCS27ntThTp aQkpBV2bexW/rFrFUvYaWSpVYhea40c= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:19 +0100 Message-Id: <238bc5f6566f0740555144c3ac0121a4e8ef15f0.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 06/14] use g_ascii_isdigit instead of c_isdigit frum 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.23 X-MC-Unique: LKHDX7d6PbCqKZ7Low1fOw-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 Reviewed-by: Cole Robinson --- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_conf.c | 3 +-- src/storage/parthelper.c | 5 ++--- src/util/virbitmap.c | 5 ++--- src/util/virconf.c | 7 +++---- src/util/virfile.c | 4 +--- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index b7b06ed67a..29d91d3539 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -567,7 +567,7 @@ udevBridgeScanDirFilter(const struct dirent *entry) */ if (strlen(entry->d_name) >=3D 5) { if (STRPREFIX(entry->d_name, VIR_NET_GENERATED_TAP_PREFIX) && - c_isdigit(entry->d_name[4])) + g_ascii_isdigit(entry->d_name[4])) return 0; } =20 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6e4e6f5c90..1097b7a417 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -29,7 +29,6 @@ #include "internal.h" #include "virlog.h" #include "virerror.h" -#include "c-ctype.h" #include "datatypes.h" #include "virconf.h" #include "virfile.h" @@ -1860,7 +1859,7 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfigPtr cfg, char *p =3D mem_tokens[j] + 4; unsigned long long multiplier =3D 1; =20 - while (c_isdigit(*p)) + while (g_ascii_isdigit(*p)) p++; if (virStrToLong_ull(mem_tokens[j] + 4, &p, 10, maxmem) < = 0) break; diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index f1a8cc01ea..761a7f93fc 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -38,7 +38,6 @@ =20 #include "virutil.h" #include "virfile.h" -#include "c-ctype.h" #include "virstring.h" #include "virgettext.h" =20 @@ -87,7 +86,7 @@ int main(int argc, char **argv) * path, then append the "p" partition separator. Otherwise, if * the path ends with a letter already, then no need for a separat= or. */ - if (c_isdigit(path[strlen(path)-1]) || devmap_partsep) + if (g_ascii_isdigit(path[strlen(path)-1]) || devmap_partsep) partsep =3D "p"; else partsep =3D ""; @@ -97,7 +96,7 @@ int main(int argc, char **argv) return 2; =20 partsep =3D *canonical_path && - c_isdigit(canonical_path[strlen(canonical_path)-1]) ? "p" : ""; + g_ascii_isdigit(canonical_path[strlen(canonical_path)-1]) ? "p= " : ""; } =20 if ((dev =3D ped_device_get(path)) =3D=3D NULL) { diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 9bdb785025..15addee2e9 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -26,7 +26,6 @@ #include "virbitmap.h" #include "viralloc.h" #include "virbuffer.h" -#include "c-ctype.h" #include "virstring.h" #include "virutil.h" #include "virerror.h" @@ -506,7 +505,7 @@ virBitmapParseSeparator(const char *str, neg =3D true; } =20 - if (!c_isdigit(*cur)) + if (!g_ascii_isdigit(*cur)) goto error; =20 if (virStrToLong_i(cur, &tmp, 10, &start) < 0) @@ -642,7 +641,7 @@ virBitmapParseUnlimited(const char *str) neg =3D true; } =20 - if (!c_isdigit(*cur)) + if (!g_ascii_isdigit(*cur)) goto error; =20 if (virStrToLong_i(cur, &tmp, 10, &start) < 0) diff --git a/src/util/virconf.c b/src/util/virconf.c index a9a7148701..3b45436499 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -29,7 +29,6 @@ #include "virbuffer.h" #include "virconf.h" #include "virutil.h" -#include "c-ctype.h" #include "virlog.h" #include "viralloc.h" #include "virfile.h" @@ -350,11 +349,11 @@ virConfParseLong(virConfParserCtxtPtr ctxt, long long= *val) } else if (CUR =3D=3D '+') { NEXT; } - if ((ctxt->cur >=3D ctxt->end) || (!c_isdigit(CUR))) { + if ((ctxt->cur >=3D ctxt->end) || (!g_ascii_isdigit(CUR))) { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("unterminated number")); return -1; } - while ((ctxt->cur < ctxt->end) && (c_isdigit(CUR))) { + while ((ctxt->cur < ctxt->end) && (g_ascii_isdigit(CUR))) { l =3D l * 10 + (CUR - '0'); NEXT; } @@ -514,7 +513,7 @@ virConfParseValue(virConfParserCtxtPtr ctxt) virConfFreeList(lst); return NULL; } - } else if (c_isdigit(CUR) || (CUR =3D=3D '-') || (CUR =3D=3D '+')) { + } else if (g_ascii_isdigit(CUR) || (CUR =3D=3D '-') || (CUR =3D=3D '+'= )) { if (ctxt->conf->flags & VIR_CONF_FLAG_VMX_FORMAT) { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("numbers not allowed in VMX format")); diff --git a/src/util/virfile.c b/src/util/virfile.c index a329f2e83f..74e1339855 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -80,8 +80,6 @@ #include "virstring.h" #include "virutil.h" =20 -#include "c-ctype.h" - #define VIR_FROM_THIS VIR_FROM_NONE =20 VIR_LOG_INIT("util.file"); @@ -696,7 +694,7 @@ static int virFileLoopDeviceOpenSearch(char **dev_name) * new kernels have a dev named 'loop-control' */ if (!STRPREFIX(de->d_name, "loop") || - !c_isdigit(de->d_name[4])) + !g_ascii_isdigit(de->d_name[4])) continue; =20 looppath =3D g_strdup_printf("/dev/%s", de->d_name); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1574261586; cv=none; d=zoho.com; s=zohoarc; b=LISxbtgoZW3H53DWoEPJmYkP7AGoWVQ2OyRjcjU3OjA2OhevdBIgANN/1tHEJbgUYtVaejFmR0/eaY2tbJ+Xg0LTukXPY4Jn99kITs3gD08vwL0+YJZzWzClxqLaWXKTnC00wXhga3U9wYLZH0zT2jtSeJqtpQO5PPAPw02ZQs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261586; 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=E9SC4bn02vmrtH164Ncvjt0yyvIFyzHPcX4o2lqvp2s=; b=UC4UElKS/aHVCheetIsUfbz1M/DTFT/YcqQEZhTZ+WE7E2GKEe5yVJ5WSlJWJp561UNl5BjgaPIdvfxyi4d9InjgicrJg2vf/pNBIJXWGy8YGQgonvzwcb4B/HjJdbIPJ/cHiAmos4rErNG1QdozXYarl4/hgA37eGbydy924cQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574261586435818.2383721102825; Wed, 20 Nov 2019 06:53:06 -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-357-KjkBeL5EMTeGwHURfu3gxA-1; Wed, 20 Nov 2019 09:48:59 -0500 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 1849285EE84; Wed, 20 Nov 2019 14:48:48 +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 DC46260519; Wed, 20 Nov 2019 14:48:47 +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 8995C4E56F; Wed, 20 Nov 2019 14:48:47 +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 xAKEmfoB004845 for ; Wed, 20 Nov 2019 09:48:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1E9D01073024; Wed, 20 Nov 2019 14:48:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B27A1037AD2 for ; Wed, 20 Nov 2019 14:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261585; 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=E9SC4bn02vmrtH164Ncvjt0yyvIFyzHPcX4o2lqvp2s=; b=HLgIOxj0z7YSkSfQtwGQ65fe09FMU+OZ5Pf/ysp/3Eq1X1HxMkiEphNMb/AdMcFbTW7nYR BhM6Lr5jIVe8lbUs3el7/2SceA7aCfRzaxX8bK3WroyKej5BWUsm8OgOqmR+kAgysJYC41 zzVIvyDPB71h3KpT0nVdJkxlSAz9ND8= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:20 +0100 Message-Id: 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 07/14] use g_ascii_islower instead of c_islower 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.79 on 10.5.11.11 X-MC-Unique: KjkBeL5EMTeGwHURfu3gxA-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 Reviewed-by: Cole Robinson --- src/util/virutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index f965bb0e5d..f3cf494353 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -393,11 +393,11 @@ int virDiskNameParse(const char *name, int *disk, int= *partition) } } =20 - if (!ptr || !c_islower(*ptr)) + if (!ptr || !g_ascii_islower(*ptr)) return -1; =20 for (i =3D 0; *ptr; i++) { - if (!c_islower(*ptr)) + if (!g_ascii_islower(*ptr)) break; =20 idx =3D (idx + (i < 1 ? 0 : 1)) * 26; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1574261338; cv=none; d=zoho.com; s=zohoarc; b=mzxEWMsWYfMfgSwRA4I8OUO5bCX/uxxAa9qZpCiXczEzU20972sladagZx2PvIgIj0iUoVKs/Ub4gRle4tE0etVMU0xz0ssLp7v+6/+4IYYKdyvKRsAezUDIx3f05cFq7Lu9DaC9K+hiI+hlUUf55nVkamBPtQpayOsJ93AYIAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261338; 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=zNZkl635e4Pa/x72eSkKhgNORs/G9h+gIvXI19vbDwk=; b=CPDzj907bBdYaasxH90dNn0x07FsuKkuDDjwjAweDOD0Jk/+64bX577CyduORoftaSbVy2dTOxTu1UGx+OQGyFHd3S64XTy2H3d0Yj3+6/WyFa2l4QxWzrLf9jiPIjOnJt/wvEkV76nTyyUnHUQVAVJD0AHkilHL8mndmfAYQOI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574261338543594.0358295065578; Wed, 20 Nov 2019 06:48:58 -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-159-VPZpl_aSM72nP16uo-nc1w-1; Wed, 20 Nov 2019 09:48:55 -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 716668026BB; Wed, 20 Nov 2019 14:48:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 381FD1037ACE; Wed, 20 Nov 2019 14:48:45 +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 EB6E81808878; Wed, 20 Nov 2019 14:48:44 +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 xAKEmfsS004853 for ; Wed, 20 Nov 2019 09:48:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id E09331037AD4; Wed, 20 Nov 2019 14:48:41 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B5F31037ACE for ; Wed, 20 Nov 2019 14:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261337; 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=zNZkl635e4Pa/x72eSkKhgNORs/G9h+gIvXI19vbDwk=; b=aSFtgzkRGI801yH6/GYkqlJ7QM8HDpiKqhLFB9svo/hVeHd4vllbfVC8jW905N4GjrKDsu 1BSHKHzfqQmlh80SiFe9s/3KEoFLIrgMUBFJkv/EQxuEHkIUQkmSLql5C+j7Wf40BcipuU zhKqQTri69zbWR9ZnAc7N1lXgePjJzU= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:21 +0100 Message-Id: <8208e79f82a177ff569dbadb38f70133e6ac8f8b.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 08/14] use g_ascii_isprint instead of c_isprint 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: VPZpl_aSM72nP16uo-nc1w-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 Reviewed-by: Cole Robinson --- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_monitor.c | 3 +-- src/util/virstring.c | 4 ++-- tools/vsh-table.c | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index e6add56cd6..5fa8d24a91 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -146,7 +146,6 @@ VIR_ONCE_GLOBAL_INIT(qemuAgent); =20 =20 #if DEBUG_RAW_IO -# include static char * qemuAgentEscapeNonPrintable(const char *text) { @@ -155,7 +154,7 @@ qemuAgentEscapeNonPrintable(const char *text) for (i =3D 0; text[i] !=3D '\0'; i++) { if (text[i] =3D=3D '\\') virBufferAddLit(&buf, "\\\\"); - else if (c_isprint(text[i]) || text[i] =3D=3D '\n' || + else if (g_ascii_isprint(text[i]) || text[i] =3D=3D '\n' || (text[i] =3D=3D '\r' && text[i+1] =3D=3D '\n')) virBufferAddChar(&buf, text[i]); else diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index cdad5c955d..ae649108d7 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -199,14 +199,13 @@ VIR_ENUM_IMPL(qemuMonitorDumpStatus, =20 =20 #if DEBUG_RAW_IO -# include static char * qemuMonitorEscapeNonPrintable(const char *text) { size_t i; virBuffer buf =3D VIR_BUFFER_INITIALIZER; for (i =3D 0; text[i] !=3D '\0'; i++) { - if (c_isprint(text[i]) || + if (g_ascii_isprint(text[i]) || text[i] =3D=3D '\n' || (text[i] =3D=3D '\r' && text[i + 1] =3D=3D '\n')) virBufferAddChar(&buf, text[i]); diff --git a/src/util/virstring.c b/src/util/virstring.c index 40c83841e9..a66b406298 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1350,7 +1350,7 @@ virStringIsPrintable(const char *str) size_t i; =20 for (i =3D 0; str[i]; i++) - if (!c_isprint(str[i])) + if (!g_ascii_isprint(str[i])) return false; =20 return true; @@ -1369,7 +1369,7 @@ virStringBufferIsPrintable(const uint8_t *buf, size_t i; =20 for (i =3D 0; i < buflen; i++) - if (!c_isprint(buf[i])) + if (!g_ascii_isprint(buf[i])) return false; =20 return true; diff --git a/tools/vsh-table.c b/tools/vsh-table.c index 28072c9719..a2365b2c32 100644 --- a/tools/vsh-table.c +++ b/tools/vsh-table.c @@ -25,7 +25,6 @@ #include #include #include -#include "c-ctype.h" =20 #include "viralloc.h" #include "virbuffer.h" @@ -244,7 +243,7 @@ vshTableSafeEncode(const char *s, size_t *width) * Not valid multibyte sequence -- maybe it's * printable char according to the current locales. */ - if (!c_isprint(*p)) { + if (!g_ascii_isprint(*p)) { g_snprintf(buf, HEX_ENCODE_LENGTH + 1, "\\x%02x", *p); buf +=3D HEX_ENCODE_LENGTH; *width +=3D HEX_ENCODE_LENGTH; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1574261526; cv=none; d=zoho.com; s=zohoarc; b=M3BjGy3Q2SelNmV4jdnzHHXermZ57d/Srmz/xv+QchRmVUmzCYl8U1iDuX0f9/7gLJsRoD1XhnAQr1SdEcWpwQyBEXNE6WM4qPB2mQWimmK5D6IO1V7rlWL7NIXR/ZLSfJPJYlBlAKSccoc7tNVOwAT0n5trC7Kx4pjeHajnr04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261526; 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=nIObJZMuLN6D4ZsFgMVAq4nyEt/uHttLOoveidDaIqE=; b=ONDE/uDLJLFeSixVvlUza4KMx4xNaJvXht6LXoA4xTwg41kuIVeWZfUOz1U09OOYJbu4cFxJtPNco8yQ599SJyNIOjHV9b4Rem9/tslK84S0IF6LRKGXXmpQT0Z/ivOfNNOKi4o4fxeZxJPUFOKfiDAzfGSoclKZiDOozhlcYj8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 157426152677617.837632281890137; Wed, 20 Nov 2019 06:52:06 -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-83-RI4CH2C0PMyOKTog9nHSpQ-1; Wed, 20 Nov 2019 09:48:59 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 950211802D1D; Wed, 20 Nov 2019 14:48:51 +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 66C2E6BF79; Wed, 20 Nov 2019 14:48:51 +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 276F34E571; Wed, 20 Nov 2019 14:48:51 +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 xAKEmg2d004861 for ; Wed, 20 Nov 2019 09:48:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id AEA411037AD4; Wed, 20 Nov 2019 14:48:42 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38EC91037ACE 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=1574261525; 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=nIObJZMuLN6D4ZsFgMVAq4nyEt/uHttLOoveidDaIqE=; b=HuM1aBwDxLQ788T1eKXsjmep2WPM8ePVB8U0V1JtlImW+IZxizaGWOF0MEYLAIvmDLgSwy ohiJ9qKnUnOmyRlcNzpMTc6lvxdDkCOjCVY90fel83Aubuku1GdxtYbi/bIo6MKuzKsMhc mMbg0pY09R1Z9uAxwgbqBRm6wC8qqC4= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:22 +0100 Message-Id: <73fad952cd07d4d6a80f77d5df74467aa5b7a61c.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 09/14] use g_ascii_isspace instead of c_isspace 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.79 on 10.5.11.13 X-MC-Unique: RI4CH2C0PMyOKTog9nHSpQ-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 Reviewed-by: Cole Robinson --- src/bhyve/bhyve_parse_command.c | 3 +-- src/conf/nwfilter_conf.c | 3 +-- src/interface/interface_backend_udev.c | 3 +-- src/rpc/virnetsocket.c | 3 +-- src/util/virhostcpu.c | 7 +++---- src/util/virnetdevvportprofile.c | 3 +-- src/util/virpidfile.c | 3 +-- src/util/virstoragefile.c | 3 +-- src/util/virstring.c | 6 +++--- src/util/viruuid.c | 4 ++-- 10 files changed, 15 insertions(+), 23 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 050a558cee..5eec05c7d4 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -31,7 +31,6 @@ #include "virlog.h" #include "virstring.h" #include "virutil.h" -#include "c-ctype.h" =20 #define VIR_FROM_THIS VIR_FROM_BHYVE =20 @@ -212,7 +211,7 @@ bhyveCommandLineToArgv(const char *nativeConfig, arglist[args_count++] =3D arg; arglist[args_count] =3D NULL; =20 - while (next && c_isspace(*next)) + while (next && g_ascii_isspace(*next)) next++; =20 curr =3D next; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 6c7b85d4c8..5bcf52a84c 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -42,7 +42,6 @@ #include "nwfilter_params.h" #include "nwfilter_conf.h" #include "domain_conf.h" -#include "c-ctype.h" #include "virfile.h" #include "virstring.h" =20 @@ -775,7 +774,7 @@ parseStringItems(const struct int_map *int_map, i =3D 0; while (input[i]) { found =3D false; - while (c_isspace(input[i]) || input[i] =3D=3D sep) + while (g_ascii_isspace(input[i]) || input[i] =3D=3D sep) i++; if (!input[i]) break; diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 29d91d3539..7df5cf2cc3 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -25,7 +25,6 @@ =20 #include "virerror.h" #include "virfile.h" -#include "c-ctype.h" #include "datatypes.h" #include "domain_conf.h" #include "interface_driver.h" @@ -932,7 +931,7 @@ udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, vid_pos +=3D strlen(vid_prefix); =20 if ((vid_len =3D strspn(vid_pos, "0123456789")) =3D=3D 0 || - !c_isspace(vid_pos[vid_len])) { + !g_ascii_isspace(vid_pos[vid_len])) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to find the VID for the VLAN device '%s'"= ), name); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 21ef7a8034..b98287e6d7 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -40,7 +40,6 @@ # include #endif =20 -#include "c-ctype.h" #ifdef WITH_SELINUX # include #endif @@ -1813,7 +1812,7 @@ static ssize_t virNetSocketReadWire(virNetSocketPtr s= ock, char *buf, size_t len) errout !=3D NULL) { size_t elen =3D strlen(errout); /* remove trailing whitespace */ - while (elen && c_isspace(errout[elen - 1])) + while (elen && g_ascii_isspace(errout[elen - 1])) errout[--elen] =3D '\0'; } =20 diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index a3ef067f41..22102f2c75 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -38,7 +38,6 @@ # include #endif =20 -#include "c-ctype.h" #include "viralloc.h" #define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW #include "virhostcpupriv.h" @@ -512,7 +511,7 @@ virHostCPUParseFrequencyString(const char *str, str +=3D strlen(prefix); =20 /* Skip all whitespace */ - while (c_isspace(*str)) + while (g_ascii_isspace(*str)) str++; if (*str =3D=3D '\0') goto error; @@ -524,7 +523,7 @@ virHostCPUParseFrequencyString(const char *str, str++; =20 /* Skip all whitespace */ - while (c_isspace(*str)) + while (g_ascii_isspace(*str)) str++; if (*str =3D=3D '\0') goto error; @@ -533,7 +532,7 @@ virHostCPUParseFrequencyString(const char *str, * followed by a fractional part (which gets discarded) or some * leading whitespace */ if (virStrToLong_ui(str, &p, 10, &ui) < 0 || - (*p !=3D '.' && *p !=3D '\0' && !c_isspace(*p))) { + (*p !=3D '.' && *p !=3D '\0' && !g_ascii_isspace(*p))) { goto error; } =20 diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index 6442c2a2cf..a7e7361a4c 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -49,7 +49,6 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp, #if WITH_VIRTUALPORT =20 # include -# include # include # include =20 @@ -482,7 +481,7 @@ virNetDevVPortProfileGetLldpadPid(void) char *endptr; =20 if (virStrToLong_ui(buffer, &endptr, 10, &res) =3D=3D 0 - && (*endptr =3D=3D '\0' || c_isspace(*endptr)) + && (*endptr =3D=3D '\0' || g_ascii_isspace(*endptr)) && res !=3D 0) { pid =3D res; } else { diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index a825a23e49..249515aff2 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -34,7 +34,6 @@ #include "intprops.h" #include "virlog.h" #include "virerror.h" -#include "c-ctype.h" #include "virstring.h" #include "virprocess.h" =20 @@ -130,7 +129,7 @@ int virPidFileReadPath(const char *path, pidstr[bytes] =3D '\0'; =20 if (virStrToLong_ll(pidstr, &endptr, 10, &pid_value) < 0 || - !(*endptr =3D=3D '\0' || c_isspace(*endptr)) || + !(*endptr =3D=3D '\0' || g_ascii_isspace(*endptr)) || (pid_t) pid_value !=3D pid_value) { rc =3D -1; goto cleanup; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 77f885ef1d..5e371694d1 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -30,7 +30,6 @@ #include "virerror.h" #include "virlog.h" #include "virfile.h" -#include "c-ctype.h" #include "vircommand.h" #include "virhash.h" #include "virendian.h" @@ -1376,7 +1375,7 @@ int virStorageFileGetLVMKey(const char *path, char *tmp =3D *key; =20 /* Find first non-space character */ - while (*tmp && c_isspace(*tmp)) + while (*tmp && g_ascii_isspace(*tmp)) tmp++; /* Kill leading spaces */ if (tmp !=3D *key) diff --git a/src/util/virstring.c b/src/util/virstring.c index a66b406298..311c9058db 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -794,7 +794,7 @@ virSkipSpaces(const char **str) { const char *cur =3D *str; =20 - while (c_isspace(*cur)) + while (g_ascii_isspace(*cur)) cur++; *str =3D cur; } @@ -811,7 +811,7 @@ virSkipSpacesAndBackslash(const char **str) { const char *cur =3D *str; =20 - while (c_isspace(*cur) || *cur =3D=3D '\\') + while (g_ascii_isspace(*cur) || *cur =3D=3D '\\') cur++; *str =3D cur; } @@ -840,7 +840,7 @@ virTrimSpaces(char *str, char **endp) end =3D str + strlen(str); else end =3D *endp; - while (end > str && c_isspace(end[-1])) + while (end > str && g_ascii_isspace(end[-1])) end--; if (endp) { if (!*endp) diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 7626d72c23..835c873300 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -102,7 +102,7 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) * 32 hexadecimal digits the end. */ cur =3D uuidstr; - while (c_isspace(*cur)) + while (g_ascii_isspace(*cur)) cur++; =20 for (i =3D 0; i < VIR_UUID_BUFLEN;) { @@ -128,7 +128,7 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) } =20 while (*cur) { - if (!c_isspace(*cur)) + if (!g_ascii_isspace(*cur)) goto error; cur++; } --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 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 Reviewed-by: Cole Robinson --- 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 From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1574261407; cv=none; d=zoho.com; s=zohoarc; b=ePYuUxuoh7pSgB4YYOb85r5mGGsACGVYJYDnVYU247fR3/pHDDio6rp0DA9R/MpIlK6bEnvz7rO8EyBoiBRtD0zH+48S64tPwDC7eLH5vYuYXT1WbDq7+U2GY1OvshsV/EetvE5tUlXgHsEiZFzmc/+0xT+U77oerTy9Kgs9vHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261407; 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=oTBJJ/xMITwrD5agauZH/gKqvefFJPZIRfyrerBcVf4=; b=GTISHJd6IMEla6gAhRhuw+PvbgD8O6euTqjRiYsvQVEMyGO8HB/LU1mFZnbpyfkZ8SBTq9nhxbxl0RFcXTK6qM4bWukL3Rga+4YGE1nwRk40Wi77kG7hqyBMBKp2mA67T14yZj6dhpv33bxDUKaxu6dV1d1T577u0A5sjxfsEjU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1574261407962724.4436246694783; Wed, 20 Nov 2019 06:50:07 -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-218-7hOyDWhBMoOTSyvwwYgoew-1; Wed, 20 Nov 2019 09:48:55 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10E78109D09E; Wed, 20 Nov 2019 14:48:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DDD122AA92; Wed, 20 Nov 2019 14:48:48 +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 A0840180880D; Wed, 20 Nov 2019 14:48:48 +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 xAKEmic7004877 for ; Wed, 20 Nov 2019 09:48:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4AC931037ACE; Wed, 20 Nov 2019 14:48:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id C98F71037ADA for ; Wed, 20 Nov 2019 14:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261405; 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=oTBJJ/xMITwrD5agauZH/gKqvefFJPZIRfyrerBcVf4=; b=GH8QzG4iRNDClALtmscyfNeJVooHcTrZoeK0fAcb/tI0vfewPE5Zj2Dqn656hBFU8onifw 1tFbrp+4mAlKuZVtSN7SPX3M/QVuM+GgiKELDB4R0jg1SQUKLp1OUoLgHxN1dJ/ggv7vh7 9cszGRaxKc8OBJEfvIUDCOJbZHlAGXw= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:24 +0100 Message-Id: <7b9fc0f5c0033d938bb88bf153fde42a9e783a79.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 11/14] use g_ascii_tolower instead of c_tolower 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.23 X-MC-Unique: 7hOyDWhBMoOTSyvwwYgoew-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 Reviewed-by: Cole Robinson --- src/remote/remote_driver.c | 3 +-- src/util/virmacaddr.c | 5 ++--- src/util/virutil.c | 5 ++--- src/vmx/vmx.c | 6 ++---- tools/virsh-domain.c | 3 +-- tools/vsh.c | 3 +-- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a1384fc655..176400a252 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -49,7 +49,6 @@ #include "virauth.h" #include "virauthconfig.h" #include "virstring.h" -#include "c-ctype.h" =20 #define VIR_FROM_THIS VIR_FROM_REMOTE =20 @@ -225,7 +224,7 @@ static int remoteSplitURIScheme(virURIPtr uri, =20 p =3D *transport; while (*p) { - *p =3D c_tolower(*p); + *p =3D g_ascii_tolower(*p); p++; } } diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index a6893faf9a..182bd582fb 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -21,7 +21,6 @@ #include =20 =20 -#include "c-ctype.h" #include "virmacaddr.h" #include "virrandom.h" #include "virutil.h" @@ -42,8 +41,8 @@ virMacAddrCompare(const char *p, const char *q) ++p; while (*q =3D=3D '0' && g_ascii_isxdigit(q[1])) ++q; - c =3D c_tolower(*p); - d =3D c_tolower(*q); + c =3D g_ascii_tolower(*p); + d =3D g_ascii_tolower(*q); =20 if (c =3D=3D 0 || d =3D=3D 0) break; diff --git a/src/util/virutil.c b/src/util/virutil.c index 12f44796c8..ed1f696e37 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -63,7 +63,6 @@ # include #endif =20 -#include "c-ctype.h" #include "mgetgroups.h" #include "virerror.h" #include "virlog.h" @@ -201,7 +200,7 @@ virScaleInteger(unsigned long long *value, const char *= suffix, =20 if (!suffix[1] || STRCASEEQ(suffix + 1, "iB")) { base =3D 1024; - } else if (c_tolower(suffix[1]) =3D=3D 'b' && !suffix[2]) { + } else if (g_ascii_tolower(suffix[1]) =3D=3D 'b' && !suffix[2]) { base =3D 1000; } else { virReportError(VIR_ERR_INVALID_ARG, @@ -209,7 +208,7 @@ virScaleInteger(unsigned long long *value, const char *= suffix, return -1; } scale =3D 1; - switch (c_tolower(*suffix)) { + switch (g_ascii_tolower(*suffix)) { case 'e': scale *=3D base; G_GNUC_FALLTHROUGH; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 20dc974928..fbf0dd7581 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -22,8 +22,6 @@ =20 #include =20 -#include - #include "internal.h" #include "virerror.h" #include "virfile.h" @@ -1089,7 +1087,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDefPtr = def, tmp =3D copy; =20 for (; *tmp !=3D '\0'; ++tmp) - *tmp =3D c_tolower(*tmp); + *tmp =3D g_ascii_tolower(*tmp); =20 model =3D virDomainControllerModelSCSITypeFromString(copy); VIR_FREE(copy); @@ -1972,7 +1970,7 @@ virVMXParseSCSIController(virConfPtr conf, int contro= ller, bool *present, tmp =3D virtualDev_string; =20 for (; *tmp !=3D '\0'; ++tmp) - *tmp =3D c_tolower(*tmp); + *tmp =3D g_ascii_tolower(*tmp); =20 *virtualDev =3D virVMXControllerModelSCSITypeFromString(virtualDev= _string); =20 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b248a15c16..fb7c479f4d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -35,7 +35,6 @@ #include "internal.h" #include "virbitmap.h" #include "virbuffer.h" -#include "c-ctype.h" #include "conf/domain_conf.h" #include "viralloc.h" #include "vircommand.h" @@ -8780,7 +8779,7 @@ static int getSignalNumber(const char *signame) char *p =3D str; =20 for (i =3D 0; signame[i]; i++) - p[i] =3D c_tolower(signame[i]); + p[i] =3D g_ascii_tolower(signame[i]); =20 if (virStrToLong_i(p, NULL, 10, &signum) >=3D 0) return signum; diff --git a/tools/vsh.c b/tools/vsh.c index beee1c2986..6c78a7a373 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -25,7 +25,6 @@ #include #include #include -#include "c-ctype.h" #include #include #include @@ -2343,7 +2342,7 @@ vshAskReedit(vshControl *ctl, const char *msg, bool r= elax_avail) while (true) { vshPrint(ctl, "\r%s %s %s: ", msg, _("Try again?"), relax_avail ? "[y,n,i,f,?]" : "[y,n,f,?]"); - c =3D c_tolower(getchar()); + c =3D g_ascii_tolower(getchar()); =20 if (c =3D=3D '?') { vshPrintRaw(ctl, --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1574261341; cv=none; d=zoho.com; s=zohoarc; b=LkI5U1GaU2WxjGUsXCex4wrVMgawB2g4qTDo7eWRWQ3eB/u2kUtmrEDfUAkfVFhskiqKTum/zn9wiFLYQsWw/R6SetHJoqnjG5G2ZkK8qBUisJhTqVN/yLt3QAFHmZOfdop3jgTHU4PHS56Ec7/Be9WoCYR48Jv5JkuhSp/lnBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261341; 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=eKvasq1IR/no5mMndkeO0PDbwfZZPWIUhySfdj6JlXo=; b=WuypbPchKcmsm1b7xT0hy7D/v77FBbNs20rOCR8j+HcngjbaUNfiDDDaIQ4FMBz//fPa2kIh7trBRnZcS//8On7GgW9A/clNfMxQ4irCOjtwVeLAqN3cm3qHr9rXIQOu418ZaiYsVlKvHVdky7f3FMGzPbaE98PSnKdRaCzx1PU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1574261341262416.41735137983085; Wed, 20 Nov 2019 06:49:01 -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-340-pP9etBChN1OQuXGG883BXg-1; Wed, 20 Nov 2019 09:48:58 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 813818C0EA6; Wed, 20 Nov 2019 14:48:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5817167154; Wed, 20 Nov 2019 14:48:52 +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 1D8D6180612F; Wed, 20 Nov 2019 14:48:52 +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 xAKEmjdm004887 for ; Wed, 20 Nov 2019 09:48:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 186031037ACE; Wed, 20 Nov 2019 14:48:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96BB51037AD4 for ; Wed, 20 Nov 2019 14:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261340; 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=eKvasq1IR/no5mMndkeO0PDbwfZZPWIUhySfdj6JlXo=; b=S0nd0d7E2qL8QFhUp8qR+1ovXtt5yFgpfGphJB0bMH5/tialTN1rRBqZwqcHlWvrP9litw v/qB58eWWUpjJIUvxjEXV7xegac+eGTfdQDE/s/TX+8rJ6jTvxvadHpNmePlNGVGI/ECOb 9649+Kuz/H3Xz/w+5spi4H1/pCDYc3k= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:25 +0100 Message-Id: <03e9791699eca17abc3cd7d9344db999a8bbfe6a.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 12/14] use g_ascii_toupper instead of c_toupper 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.79 on 10.5.11.12 X-MC-Unique: pP9etBChN1OQuXGG883BXg-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 Reviewed-by: Cole Robinson --- src/util/virstring.c | 3 +-- tools/virsh-console.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 311c9058db..bd7c640042 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -21,7 +21,6 @@ #include #include =20 -#include "c-ctype.h" #include "virstring.h" #include "virthread.h" #include "viralloc.h" @@ -1329,7 +1328,7 @@ virStringToUpper(char **dst, const char *src) return -1; =20 for (i =3D 0; src[i]; i++) { - cap[i] =3D c_toupper(src[i]); + cap[i] =3D g_ascii_toupper(src[i]); if (cap[i] =3D=3D '-') cap[i] =3D '_'; } diff --git a/tools/virsh-console.c b/tools/virsh-console.c index a087d82776..2e498a6903 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -29,7 +29,6 @@ # include # include # include -# include =20 # include "internal.h" # include "virsh.h" @@ -399,7 +398,7 @@ static char virshGetEscapeChar(const char *s) { if (*s =3D=3D '^') - return CONTROL(c_toupper(s[1])); + return CONTROL(g_ascii_toupper(s[1])); =20 return *s; } --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 14:15:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1574261476; cv=none; d=zoho.com; s=zohoarc; b=fuZu532GUq1jxX94+jqbjpqbP/5wIELA35+iMf5fNY5AMnb7qMY0xQ0tfl5LR8jwVahgnPyo/Th88eQZf0IKnahgOU81DxUgn7RIyjp7hCPh6xlBrClj5SXqkiiv7tyn4KankbxPSSFZhg79pm0H0bSxd29IRcPcDVho9RICNoo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574261476; 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=4VB4r8XIhR7uNwf5mjoWFhnxWbIt+qypIKz3sK/dCw4=; b=FGidt6R6ZffqVW4VlOBiohiGXge1L6wMcqBrH1qSxi8EaqnBN5TPq9fxVasn6J2Hly6m7kIqm1FzpXZRNmEotPuHZaaL1+KuAlEP4AdBlO+2Rn858GfP+NTS11Wiucjy7H7dpHfCLWt9Qo4PiB8ayY8kn9bWo7jILTENoMML1s0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 15742614762721001.7352357183058; Wed, 20 Nov 2019 06:51:16 -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-5-dsiESJI4NQaQ0ESoTTIRQw-1; Wed, 20 Nov 2019 09:49:06 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D81D9126A; Wed, 20 Nov 2019 14:48:59 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5638667154; Wed, 20 Nov 2019 14:48:59 +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 0AE851803C40; Wed, 20 Nov 2019 14:48:59 +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 xAKEmjcH004897 for ; Wed, 20 Nov 2019 09:48:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id D9F5E1054FC0; Wed, 20 Nov 2019 14:48:45 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 650591054FBF for ; Wed, 20 Nov 2019 14:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261474; 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=4VB4r8XIhR7uNwf5mjoWFhnxWbIt+qypIKz3sK/dCw4=; b=NCTiy28I2vE9XDdH6oJ+BEIQfk9VIOa7valGT7ZLDIje6BTlDw+wsEoyH3N17qOnvINaGp +qkCtysCqm7Z1ksXjE9uG4mvmlDQ1Ln5R9q7NOMrdHGYgrNa41SepVMjFUbfwQIK7GtjtR +Vn1xbuojJRoK19/Fjg79P+HB9+RRBs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:26 +0100 Message-Id: <065a4cbcb73fa8ea28f4d9a9ed589182087fd8c9.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 13/14] syntax-check: update c-type checks to refer to Glib 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.79 on 10.5.11.12 X-MC-Unique: dsiESJI4NQaQ0ESoTTIRQw-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 Reviewed-by: Cole Robinson --- build-aux/syntax-check.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index f1e976ec76..fd8c2c6be5 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -532,7 +532,7 @@ sc_prohibit_select: # Prohibit the inclusion of . sc_prohibit_ctype_h: @prohibit=3D'^# *include *' \ - halt=3D'use c-ctype.h instead of ctype.h' \ + halt=3D'use Glib g_ascii_* function instead of ctype.h' \ $(_sc_search_regexp) =20 # We have our own wrapper for mocking purposes @@ -583,7 +583,7 @@ ctype_re =3D isalnum|isalpha|isascii|isblank|iscntrl|is= digit|isgraph|islower\ sc_avoid_ctype_macros: @prohibit=3D'\b($(ctype_re)) *\(' \ in_vc_files=3D'\.[ch]$$' \ - halt=3D'use c-ctype.h instead of ctype macros' \ + halt=3D'use Glib g_ascii_ macros instead of ctype macros' \ $(_sc_search_regexp) =20 sc_avoid_strcase: @@ -1552,13 +1552,6 @@ sc_prohibit_openat_without_use: re=3D'\<(openat_(permissive|needs_fchdir|(save|restore)_fail)|l?(stat|ch(= own|mod))at|(euid)?accessat|(FCHMOD|FCHOWN|STAT)AT_INLINE)\>' \ $(_sc_header_without_use) =20 -# Prohibit the inclusion of c-ctype.h without an actual use. -ctype_re =3D isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islow= er\ -|isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper -sc_prohibit_c_ctype_without_use: - @h=3D'c-ctype.h' re=3D'\ (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1574261345972806.7363121722046; Wed, 20 Nov 2019 06:49:05 -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-333-SrG2mJCOMBKt9_GVUA3wHw-1; Wed, 20 Nov 2019 09:49:02 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 698781823E5C; Wed, 20 Nov 2019 14:48:56 +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 358AC5ED43; Wed, 20 Nov 2019 14:48:56 +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 D0D0B4E575; 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 xAKEmnfY004917 for ; Wed, 20 Nov 2019 09:48:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 59E6F1037ACE; Wed, 20 Nov 2019 14:48:49 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id D96B11037AD2 for ; Wed, 20 Nov 2019 14:48:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574261344; 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=EbATKPkCe9zvTV0LqcNEK6QlA6afTDwmvqFVwpzz2Xw=; b=JXB9hexNR0QC2iKeFvCiTFQA6oVkYRqElntFOTwbUxG9qLv/VBGIKb8hBFwL1qpk9xa1hv 6hgGqHWLkQf5k9PwQN8WpqVi0lozLDE9QJjMW6C97zLpwoIH9Hg03OO8HNNT7ViL8/QPtb DwX1FuMU44SCntsDbag7D+lE9Z4mjLs= From: Pavel Hrdina To: libvir-list@redhat.com Date: Wed, 20 Nov 2019 15:48:27 +0100 Message-Id: <36e783bb8bfa520f74823d6422afd4873d4b9ade.1574261217.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 14/14] bootstrap.conf: drop usage of c-type gnulib module 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.79 on 10.5.11.14 X-MC-Unique: SrG2mJCOMBKt9_GVUA3wHw-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 Reviewed-by: Cole Robinson --- bootstrap.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index abb03bf3a2..e1f715db37 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -20,7 +20,6 @@ gnulib_modules=3D' accept bind -c-ctype c-strcase canonicalize-lgpl chown --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list