forked from vitalif/vitastor
Rename qemu_rbd_unescape and qemu_rbd_next_tok to *_vitastor_*
parent
b66160a7ad
commit
b52dd6843a
|
@ -70,7 +70,7 @@ static void vitastor_co_generic_bh_cb(void *opaque, long retval);
|
||||||
static void vitastor_co_read_cb(void *opaque, long retval, uint64_t version);
|
static void vitastor_co_read_cb(void *opaque, long retval, uint64_t version);
|
||||||
static void vitastor_close(BlockDriverState *bs);
|
static void vitastor_close(BlockDriverState *bs);
|
||||||
|
|
||||||
static char *qemu_rbd_next_tok(char *src, char delim, char **p)
|
static char *qemu_vitastor_next_tok(char *src, char delim, char **p)
|
||||||
{
|
{
|
||||||
char *end;
|
char *end;
|
||||||
*p = NULL;
|
*p = NULL;
|
||||||
|
@ -89,7 +89,7 @@ static char *qemu_rbd_next_tok(char *src, char delim, char **p)
|
||||||
return src;
|
return src;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void qemu_rbd_unescape(char *src)
|
static void qemu_vitastor_unescape(char *src)
|
||||||
{
|
{
|
||||||
char *p;
|
char *p;
|
||||||
for (p = src; *src; ++src, ++p)
|
for (p = src; *src; ++src, ++p)
|
||||||
|
@ -122,15 +122,15 @@ static void vitastor_parse_filename(const char *filename, QDict *options, Error
|
||||||
while (p)
|
while (p)
|
||||||
{
|
{
|
||||||
char *name, *value;
|
char *name, *value;
|
||||||
name = qemu_rbd_next_tok(p, '=', &p);
|
name = qemu_vitastor_next_tok(p, '=', &p);
|
||||||
if (!p)
|
if (!p)
|
||||||
{
|
{
|
||||||
error_setg(errp, "conf option %s has no value", name);
|
error_setg(errp, "conf option %s has no value", name);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
qemu_rbd_unescape(name);
|
qemu_vitastor_unescape(name);
|
||||||
value = qemu_rbd_next_tok(p, ':', &p);
|
value = qemu_vitastor_next_tok(p, ':', &p);
|
||||||
qemu_rbd_unescape(value);
|
qemu_vitastor_unescape(value);
|
||||||
if (!strcmp(name, "inode") ||
|
if (!strcmp(name, "inode") ||
|
||||||
!strcmp(name, "pool") ||
|
!strcmp(name, "pool") ||
|
||||||
!strcmp(name, "size") ||
|
!strcmp(name, "size") ||
|
||||||
|
|
Loading…
Reference in New Issue