8:48 a.m.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
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"
#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 20dc974928..fbf0dd7581 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"
@@ -1089,7 +1087,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);
@@ -1972,7 +1970,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 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 = 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,
--
2.23.0