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

util: uuid: remove use of virHexToBin

Browse Source 
Prefer g_ascii_xdigit_value to virHexToBin.

Check the return value of the function and
remove the g_ascii_isxdigit calls, since
they're done anyway internally.

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:53 +01:00
parent 49f4d54951
commit 6ac33f22fd
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util/viruuid.c
View File

@ -29,7 +29,6 @@
#include <unistd.h>
#include "internal.h"
#include "virutil.h"
#include "virerror.h"
#include "virlog.h"
#include "viralloc.h"
@ -105,6 +104,7 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid)
cur++;
for (i = 0; i < VIR_UUID_BUFLEN;) {
int val;
uuid[i] = 0;
if (*cur == 0)
return -1;
@ -112,16 +112,15 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid)
cur++;
continue;
}
if (!g_ascii_isxdigit(*cur))
if ((val = g_ascii_xdigit_value(*cur)) < 0)
return -1;
uuid[i] = virHexToBin(*cur);
uuid[i] *= 16;
uuid[i] = 16 * val;
cur++;
if (*cur == 0)
return -1;
if (!g_ascii_isxdigit(*cur))
if ((val = g_ascii_xdigit_value(*cur)) < 0)
return -1;
uuid[i] += virHexToBin(*cur);
uuid[i] += val;
i++;
cur++;
}