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

storage: use GRegex virStorageBackendLogicalParseVolExtents

Browse Source 
Using GRegex simplifies the code since g_match_info_fetch will
copy the matched substring for us.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2019-11-13 14:32:19 +01:00
parent 815db3ea58
commit 70d6994679
1 changed files with 13 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/storage/storage_backend_logical.c
View File

@ -23,7 +23,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <regex.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -121,16 +120,15 @@ static int
virStorageBackendLogicalParseVolExtents(virStorageVolDefPtr vol, virStorageBackendLogicalParseVolExtents(virStorageVolDefPtr vol,
char **const groups) char **const groups)
{ {
g_autoptr(GRegex) re = NULL;
g_autoptr(GError) err = NULL;
g_autoptr(GMatchInfo) info = NULL;
int nextents, ret = -1; int nextents, ret = -1;
const char *regex_unit = "(\\S+)\\((\\S+)\\)"; const char *regex_unit = "(\\S+)\\((\\S+)\\)";
char *p = NULL;
size_t i; size_t i;
int err, nvars;
unsigned long long offset, size, length; unsigned long long offset, size, length;
virStorageVolSourceExtent extent; virStorageVolSourceExtent extent;
g_autofree char *regex = NULL; g_autofree char *regex = NULL;
g_autofree regex_t *reg = NULL;
g_autofree regmatch_t *vars = NULL;
memset(&extent, 0, sizeof(extent)); memset(&extent, 0, sizeof(extent));
@ -174,53 +172,29 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDefPtr vol,
strcat(regex, regex_unit); strcat(regex, regex_unit);
} }
if (VIR_ALLOC(reg) < 0) re = g_regex_new(regex, 0, 0, &err);
goto cleanup; if (!re) {
/* Each extent has a "path:offset" pair, and vars[0] will
* be the whole matched string.
*/
nvars = (nextents * 2) + 1;
if (VIR_ALLOC_N(vars, nvars) < 0)
goto cleanup;
err = regcomp(reg, regex, REG_EXTENDED);
if (err != 0) {
char error[100];
regerror(err, reg, error, sizeof(error));
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to compile regex %s"), _("Failed to compile regex %s"), err->message);
error); return -1;
goto cleanup;
} }
err = regexec(reg, groups[3], nvars, vars, 0); if (!g_regex_match(re, groups[3], 0, &info)) {
regfree(reg);
if (err != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed volume extent devices value")); _("malformed volume extent devices value"));
goto cleanup; goto cleanup;
} }
p = groups[3]; /* Each extent has a "path:offset" pair, and match #0
* is the whole matched string.
/* vars[0] is skipped */ */
for (i = 0; i < nextents; i++) { for (i = 0; i < nextents; i++) {
size_t j; size_t j;
int len;
g_autofree char *offset_str = NULL; g_autofree char *offset_str = NULL;
j = (i * 2) + 1; j = (i * 2) + 1;
len = vars[j].rm_eo - vars[j].rm_so; extent.path = g_match_info_fetch(info, j);
p[vars[j].rm_eo] = '\0'; offset_str = g_match_info_fetch(info, j + 1);
if (VIR_STRNDUP(extent.path,
p + vars[j].rm_so, len) < 0)
goto cleanup;
len = vars[j + 1].rm_eo - vars[j + 1].rm_so;
if (VIR_STRNDUP(offset_str, p + vars[j + 1].rm_so, len) < 0)
goto cleanup;
if (virStrToLong_ull(offset_str, NULL, 10, &offset) < 0) { if (virStrToLong_ull(offset_str, NULL, 10, &offset) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",