[libvirt] [PATCH v2 12/14] use g_ascii_toupper instead of c_toupper from gnulib

Pavel Hrdina phrdina at redhat.com
Wed Nov 20 14:48:25 UTC 2019


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 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 <glib/gprintf.h>
 #include <locale.h>
 
-#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;
 
     for (i = 0; src[i]; i++) {
-        cap[i] = c_toupper(src[i]);
+        cap[i] = g_ascii_toupper(src[i]);
         if (cap[i] == '-')
             cap[i] = '_';
     }
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 <poll.h>
 # include <unistd.h>
 # include <signal.h>
-# include <c-ctype.h>
 
 # include "internal.h"
 # include "virsh.h"
@@ -399,7 +398,7 @@ static char
 virshGetEscapeChar(const char *s)
 {
     if (*s == '^')
-        return CONTROL(c_toupper(s[1]));
+        return CONTROL(g_ascii_toupper(s[1]));
 
     return *s;
 }
-- 
2.23.0




More information about the libvir-list mailing list