From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 18 Nov 2019 14:15:31 +0000 (+0100)
Subject: use g_ascii_tolower instead of c_tolower from gnulib
X-Git-Tag: v6.0.0-rc1~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc0e7541ad01e85da5e17d318df9c7301f5cbadb;p=thirdparty%2Flibvirt.git

use g_ascii_tolower instead of c_tolower from gnulib

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ddb95914a6..e684fcba09 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"
 
 #define VIR_FROM_THIS VIR_FROM_REMOTE
 
@@ -225,7 +224,7 @@ static int remoteSplitURIScheme(virURIPtr uri,
 
         p = *transport;
         while (*p) {
-            *p = c_tolower(*p);
+            *p = 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 <config.h>
 
 
-#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 == '0' && g_ascii_isxdigit(q[1]))
             ++q;
-        c = c_tolower(*p);
-        d = c_tolower(*q);
+        c = g_ascii_tolower(*p);
+        d = g_ascii_tolower(*q);
 
         if (c == 0 || d == 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 <sys/un.h>
 #endif
 
-#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,
 
         if (!suffix[1] || STRCASEEQ(suffix + 1, "iB")) {
             base = 1024;
-        } else if (c_tolower(suffix[1]) == 'b' && !suffix[2]) {
+        } else if (g_ascii_tolower(suffix[1]) == 'b' && !suffix[2]) {
             base = 1000;
         } else {
             virReportError(VIR_ERR_INVALID_ARG,
@@ -209,7 +208,7 @@ virScaleInteger(unsigned long long *value, const char *suffix,
             return -1;
         }
         scale = 1;
-        switch (c_tolower(*suffix)) {
+        switch (g_ascii_tolower(*suffix)) {
         case 'e':
             scale *= base;
             G_GNUC_FALLTHROUGH;
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 07ccae613d..2afb0b2823 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -22,8 +22,6 @@
 
 #include <config.h>
 
-#include <c-ctype.h>
-
 #include "internal.h"
 #include "virerror.h"
 #include "virfile.h"
@@ -1095,7 +1093,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDefPtr def,
     tmp = copy;
 
     for (; *tmp != '\0'; ++tmp)
-        *tmp = c_tolower(*tmp);
+        *tmp = g_ascii_tolower(*tmp);
 
     model = virDomainControllerModelSCSITypeFromString(copy);
     VIR_FREE(copy);
@@ -1977,7 +1975,7 @@ virVMXParseSCSIController(virConfPtr conf, int controller, bool *present,
         tmp = virtualDev_string;
 
         for (; *tmp != '\0'; ++tmp)
-            *tmp = c_tolower(*tmp);
+            *tmp = g_ascii_tolower(*tmp);
 
         *virtualDev = virVMXControllerModelSCSITypeFromString(virtualDev_string);
 
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 45b9bf8a38..56137bdd74 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"
@@ -8844,7 +8843,7 @@ static int getSignalNumber(const char *signame)
     char *p = str;
 
     for (i = 0; signame[i]; i++)
-        p[i] = c_tolower(signame[i]);
+        p[i] = g_ascii_tolower(signame[i]);
 
     if (virStrToLong_i(p, NULL, 10, &signum) >= 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 <stdarg.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include "c-ctype.h"
 #include <fcntl.h>
 #include <time.h>
 #include <sys/stat.h>
@@ -2343,7 +2342,7 @@ vshAskReedit(vshControl *ctl, const char *msg, bool relax_avail)
     while (true) {
         vshPrint(ctl, "\r%s %s %s: ", msg, _("Try again?"),
                  relax_avail ? "[y,n,i,f,?]" : "[y,n,f,?]");
-        c = c_tolower(getchar());
+        c = g_ascii_tolower(getchar());
 
         if (c == '?') {
             vshPrintRaw(ctl,