External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all use of virHexToBin

Browse Source 
Replace it by g_ascii_xdigit_value.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Ján Tomko 2020-02-23 20:58:35 +01:00
parent 6ac33f22fd
commit 2e53bfa1bb
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/util/virbitmap.c
View File

@ -27,7 +27,6 @@
#include "viralloc.h"
#include "virbuffer.h"
#include "virstring.h"
#include "virutil.h"
#include "virerror.h"
#define VIR_FROM_THIS VIR_FROM_NONE
@ -1168,7 +1167,7 @@ virBitmapNewString(const char *string)
return NULL;
for (i = 0; i < len; i++) {
unsigned long nibble = virHexToBin(string[len - i - 1]);
unsigned long nibble = g_ascii_xdigit_value(string[len - i - 1]);
nibble <<= VIR_BITMAP_BIT_OFFSET(i * 4);
bitmap->map[VIR_BITMAP_UNIT_OFFSET(i * 4)] |= nibble;
}

5
src/util/virmacaddr.c
View File

@ -23,7 +23,6 @@
#include "virmacaddr.h"
#include "virrandom.h"
#include "virutil.h"
#include "viralloc.h"
static const unsigned char virMacAddrBroadcastAddrRaw[VIR_MAC_BUFLEN] =
@ -213,8 +212,8 @@ virMacAddrParseHex(const char *str, virMacAddrPtr addr)
return -1;
for (i = 0; i < VIR_MAC_BUFLEN; i++)
addr->addr[i] = (virHexToBin(str[2 * i]) << 4 |
virHexToBin(str[2 * i + 1]));
addr->addr[i] = (g_ascii_xdigit_value(str[2 * i]) << 4 |
g_ascii_xdigit_value(str[2 * i + 1]));
return 0;
}

4
src/vmx/vmx.c
View File

@ -28,7 +28,6 @@
#include "virconf.h"
#include "viralloc.h"
#include "virlog.h"
#include "viruuid.h"
#include "vmx.h"
#include "viruri.h"
#include "virstring.h"
@ -673,7 +672,8 @@ virVMXUnescapeHex(char *string, char escape)
if (!g_ascii_isxdigit(tmp1[1]) || !g_ascii_isxdigit(tmp1[2]))
return -1;
*tmp2++ = virHexToBin(tmp1[1]) * 16 + virHexToBin(tmp1[2]);
*tmp2++ = g_ascii_xdigit_value(tmp1[1]) * 16 +
g_ascii_xdigit_value(tmp1[2]);
tmp1 += 3;
} else {
*tmp2++ = *tmp1++;