]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
use g_ascii_toupper instead of c_toupper from gnulib
authorPavel Hrdina <phrdina@redhat.com>
Mon, 18 Nov 2019 14:16:33 +0000 (15:16 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Tue, 10 Dec 2019 12:49:24 +0000 (13:49 +0100)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
src/util/virstring.c
tools/virsh-console.c

index 311c9058db7c0d99802d30bd8a9b7f0b2e96dfe1..bd7c640042a33770a3bef1ed2e8e1b95241ee596 100644 (file)
@@ -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] = '_';
     }
index a087d82776ae8872cad02f79a685decdfdb45e97..2e498a690395831fb1fafd67fe110cde7eec55b1 100644 (file)
@@ -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;
 }