mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
rbd: Clean up after the previous commit
This code in qemu_rbd_parse_filename() found_str = qemu_rbd_next_tok(p, '\0', &p); p = found_str; has no effect. Drop it, and simplify qemu_rbd_next_tok(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> Message-id: 1490691368-32099-5-git-send-email-armbru@redhat.com Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
parent
730b00bbfd
commit
8efb339dd4
24
block/rbd.c
24
block/rbd.c
|
@ -104,19 +104,17 @@ static char *qemu_rbd_next_tok(char *src, char delim, char **p)
|
|||
|
||||
*p = NULL;
|
||||
|
||||
if (delim != '\0') {
|
||||
for (end = src; *end; ++end) {
|
||||
if (*end == delim) {
|
||||
break;
|
||||
}
|
||||
if (*end == '\\' && end[1] != '\0') {
|
||||
end++;
|
||||
}
|
||||
}
|
||||
for (end = src; *end; ++end) {
|
||||
if (*end == delim) {
|
||||
*p = end + 1;
|
||||
*end = '\0';
|
||||
break;
|
||||
}
|
||||
if (*end == '\\' && end[1] != '\0') {
|
||||
end++;
|
||||
}
|
||||
}
|
||||
if (*end == delim) {
|
||||
*p = end + 1;
|
||||
*end = '\0';
|
||||
}
|
||||
return src;
|
||||
}
|
||||
|
@ -177,10 +175,6 @@ static void qemu_rbd_parse_filename(const char *filename, QDict *options,
|
|||
goto done;
|
||||
}
|
||||
|
||||
found_str = qemu_rbd_next_tok(p, '\0', &p);
|
||||
|
||||
p = found_str;
|
||||
|
||||
/* The following are essentially all key/value pairs, and we treat
|
||||
* 'id' and 'conf' a bit special. Key/value pairs may be in any order. */
|
||||
while (p) {
|
||||
|
|
Loading…
Reference in a new issue