OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vmdk: Clean up control flow in vmdk_parse_extents() a bit

Browse Source 
Factor out loop stepping to turn a while-loop with goto into a
for-loop with continue.

Cc: Fam Zheng <famz@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-Id: <1450452927-8346-18-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-18 16:35:20 +01:00
parent 9af9e0fed7
commit e4937694b6
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
block/vmdk.c
View File

@ -760,6 +760,17 @@ static int vmdk_open_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
} }
} }
static const char *next_line(const char *s)
{
while (*s) {
if (*s == '\n') {
return s + 1;
}
s++;
}
return s;
}
static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
const char *desc_file_path, QDict *options, const char *desc_file_path, QDict *options,
Error **errp) Error **errp)
@ -769,7 +780,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
char access[11]; char access[11];
char type[11]; char type[11];
char fname[512]; char fname[512];
const char *p = desc; const char *p;
int64_t sectors = 0; int64_t sectors = 0;
int64_t flat_offset; int64_t flat_offset;
char *extent_path; char *extent_path;
@ -779,7 +790,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
char extent_opt_prefix[32]; char extent_opt_prefix[32];
Error *local_err = NULL; Error *local_err = NULL;
while (*p) { for (p = desc; *p; p = next_line(p)) {
/* parse extent line in one of below formats: /* parse extent line in one of below formats:
* *
* RW [size in sectors] FLAT "file-name.vmdk" OFFSET * RW [size in sectors] FLAT "file-name.vmdk" OFFSET
@ -791,7 +802,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
matches = sscanf(p, "%10s %" SCNd64 " %10s \"%511[^\n\r\"]\" %" SCNd64, matches = sscanf(p, "%10s %" SCNd64 " %10s \"%511[^\n\r\"]\" %" SCNd64,
access, &sectors, type, fname, &flat_offset); access, &sectors, type, fname, &flat_offset);
if (matches < 4 || strcmp(access, "RW")) { if (matches < 4 || strcmp(access, "RW")) {
goto next_line; continue;
} else if (!strcmp(type, "FLAT")) { } else if (!strcmp(type, "FLAT")) {
if (matches != 5 || flat_offset < 0) { if (matches != 5 || flat_offset < 0) {
error_setg(errp, "Invalid extent lines: \n%s", p); error_setg(errp, "Invalid extent lines: \n%s", p);
@ -813,7 +824,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
(strcmp(type, "FLAT") && strcmp(type, "SPARSE") && (strcmp(type, "FLAT") && strcmp(type, "SPARSE") &&
strcmp(type, "VMFS") && strcmp(type, "VMFSSPARSE")) || strcmp(type, "VMFS") && strcmp(type, "VMFSSPARSE")) ||
(strcmp(access, "RW"))) { (strcmp(access, "RW"))) {
goto next_line; continue;
} }
if (!path_is_absolute(fname) && !path_has_protocol(fname) && if (!path_is_absolute(fname) && !path_has_protocol(fname) &&
@ -870,15 +881,6 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs,
return -ENOTSUP; return -ENOTSUP;
} }
extent->type = g_strdup(type); extent->type = g_strdup(type);
next_line:
/* move to next line */
while (*p) {
if (*p == '\n') {
p++;
break;
}
p++;
}
} }
return 0; return 0;
} }