[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v2 4/9] rbd: Clean up after the previous commit
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC v2 4/9] rbd: Clean up after the previous commit |
Date: |
Fri, 24 Mar 2017 18:44:37 +0100 |
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 <address@hidden>
---
block/rbd.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 0fea348..182a5a3 100644
--- a/block/rbd.c
+++ b/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) {
--
2.7.4
- [Qemu-devel] [PATCH RFC v2 0/9] rbd: Clean up API and code, Markus Armbruster, 2017/03/24
- [Qemu-devel] [PATCH RFC v2 1/9] rbd: Reject -blockdev server.*.{numeric, to, ipv4, ipv6}, Markus Armbruster, 2017/03/24
- [Qemu-devel] [PATCH RFC v2 2/9] rbd: Fix to cleanly reject -drive without pool or image, Markus Armbruster, 2017/03/24
- [Qemu-devel] [PATCH RFC v2 4/9] rbd: Clean up after the previous commit,
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC v2 9/9] rbd: Reject invalid authentication methods, Markus Armbruster, 2017/03/24
- [Qemu-devel] [PATCH RFC v2 7/9] rbd: Clean up qemu_rbd_create()'s detour through QemuOpts, Markus Armbruster, 2017/03/24
- [Qemu-devel] [PATCH RFC v2 8/9] rbd: Rewrite the code to extract list-valued options, Markus Armbruster, 2017/03/24
- [Qemu-devel] [PATCH RFC v2 3/9] rbd: Don't limit length of parameter values, Markus Armbruster, 2017/03/24
- [Qemu-devel] [PATCH RFC v2 5/9] rbd: Don't accept -drive driver=rbd, keyvalue-pairs=..., Markus Armbruster, 2017/03/24