---
libstore/copy.c | 16 +++++++++++++---
libstore/device.c | 16 +++++++++++++---
libstore/memobj.c | 17 +++++++++--------
libstore/module.c | 2 +-
libstore/nbd.c | 22 ++++++++++++----------
libstore/part.c | 2 +-
libstore/task.c | 14 +++++++++++---
libstore/typed.c | 2 +-
libstore/unknown.c | 27 ++++++++++++++-------------
libstore/unzipstore.c | 2 +-
libstore/url.c | 7 ++++---
libstore/zero.c | 16 ++++++++++++----
12 files changed, 92 insertions(+), 51 deletions(-)
diff --git a/libstore/copy.c b/libstore/copy.c
index 16b99390..76e0f440 100644
--- a/libstore/copy.c
+++ b/libstore/copy.c
@@ -170,9 +170,19 @@ copy_clone (const struct store *from, struct store *to)
const struct store_class
store_copy_class =
{
- STORAGE_COPY, "copy", copy_read, copy_write, copy_set_size,
- copy_allocate_encoding, copy_encode, copy_decode,
- copy_set_flags, copy_clear_flags, copy_cleanup, copy_clone, 0, copy_open
+ .id = STORAGE_COPY,
+ .name = "copy",
+ .read = copy_read,
+ .write = copy_write,
+ .set_size = copy_set_size,
+ .allocate_encoding = copy_allocate_encoding,
+ .encode = copy_encode,
+ .decode = copy_decode,
+ .set_flags = copy_set_flags,
+ .clear_flags = copy_clear_flags,
+ .cleanup = copy_cleanup,
+ .clone = copy_clone,
+ .open = copy_open,
};
STORE_STD_CLASS (copy);
diff --git a/libstore/device.c b/libstore/device.c
index ddd99d6c..56f3d93d 100644
--- a/libstore/device.c
+++ b/libstore/device.c
@@ -326,9 +326,19 @@ dev_map (const struct store *store, vm_prot_t prot,
mach_port_t *memobj)
const struct store_class
store_device_class =
{
- STORAGE_DEVICE, "device", dev_read, dev_write, dev_set_size,
- store_std_leaf_allocate_encoding, store_std_leaf_encode, dev_decode,
- dev_set_flags, dev_clear_flags, 0, 0, 0, dev_open, 0, dev_map, dev_sync
+ .id = STORAGE_DEVICE,
+ .name = "device",
+ .read = dev_read,
+ .write = dev_write,
+ .set_size = dev_set_size,
+ .allocate_encoding = store_std_leaf_allocate_encoding,
+ .encode = store_std_leaf_encode,
+ .decode = dev_decode,
+ .set_flags = dev_set_flags,
+ .clear_flags = dev_clear_flags,
+ .open = dev_open,
+ .map = dev_map,
+ .sync = dev_sync,
};
STORE_STD_CLASS (device);
diff --git a/libstore/memobj.c b/libstore/memobj.c
index e98e1b26..df656deb 100644
--- a/libstore/memobj.c
+++ b/libstore/memobj.c
@@ -192,13 +192,14 @@ memobj_decode (struct store_enc *enc, const struct
store_class *const *classes,
const struct store_class
store_memobj_class =
{
- STORAGE_MEMORY, "memobj",
- map: memobj_map,
- read: memobj_read,
- set_size: memobj_set_size,
- write: memobj_write,
- allocate_encoding: store_std_leaf_allocate_encoding,
- encode: store_std_leaf_encode,
- decode: memobj_decode,
+ .id = STORAGE_MEMORY,
+ .name = "memobj",
+ .map = memobj_map,
+ .read = memobj_read,
+ .set_size = memobj_set_size,
+ .write = memobj_write,
+ .allocate_encoding = store_std_leaf_allocate_encoding,
+ .encode = store_std_leaf_encode,
+ .decode = memobj_decode,
};
STORE_STD_CLASS (memobj);
diff --git a/libstore/module.c b/libstore/module.c
index 6e75099a..da99ca43 100644
--- a/libstore/module.c
+++ b/libstore/module.c
@@ -117,7 +117,7 @@ store_module_open (const char *name, int flags,
}
const struct store_class store_module_open_class =
-{ -1, "module", open: store_module_open };
+{ .id = -1, .name = "module", .open = store_module_open };
STORE_STD_CLASS (module_open);
error_t
diff --git a/libstore/nbd.c b/libstore/nbd.c
index 5ddf2dc8..1d95d670 100644
--- a/libstore/nbd.c
+++ b/libstore/nbd.c
@@ -476,16 +476,18 @@ nbd_clear_flags (struct store *store, int flags)
const struct store_class store_nbd_class =
{
- STORAGE_NETWORK, "nbd",
- open: nbd_open,
- validate_name: nbd_validate_name,
- read: nbd_read,
- write: nbd_write,
- set_size: nbd_set_size,
- allocate_encoding: store_std_leaf_allocate_encoding,
- encode: store_std_leaf_encode,
- decode: nbd_decode,
- set_flags: nbd_set_flags, clear_flags: nbd_clear_flags,
+ .id = STORAGE_NETWORK,
+ .name = "nbd",
+ .open = nbd_open,
+ .validate_name = nbd_validate_name,
+ .read = nbd_read,
+ .write = nbd_write,
+ .set_size = nbd_set_size,
+ .allocate_encoding = store_std_leaf_allocate_encoding,
+ .encode = store_std_leaf_encode,
+ .decode = nbd_decode,
+ .set_flags = nbd_set_flags,
+ .clear_flags = nbd_clear_flags,
};
STORE_STD_CLASS (nbd);
diff --git a/libstore/part.c b/libstore/part.c
index 349d90f5..e0937c66 100644
--- a/libstore/part.c
+++ b/libstore/part.c
@@ -205,5 +205,5 @@ store_part_open (const char *name, int flags,
}
const struct store_class
-store_part_class = { -1, "part", open: store_part_open };
+store_part_class = { .id = -1, .name = "part", .open = store_part_open };
STORE_STD_CLASS (part);
diff --git a/libstore/task.c b/libstore/task.c
index 977cdc77..136c4e32 100644
--- a/libstore/task.c
+++ b/libstore/task.c
@@ -140,9 +140,17 @@ task_clear_flags (struct store *store, int flags)
const struct store_class
store_task_class =
{
- STORAGE_TASK, "task", task_read, task_write, task_set_size,
- store_std_leaf_allocate_encoding, store_std_leaf_encode, task_decode,
- task_set_flags, task_clear_flags, 0, 0, 0, task_open
+ .id = STORAGE_TASK,
+ .name = "task",
+ .read = task_read,
+ .write = task_write,
+ .set_size = task_set_size,
+ .allocate_encoding = store_std_leaf_allocate_encoding,
+ .encode = store_std_leaf_encode,
+ .decode = task_decode,
+ .set_flags = task_set_flags,
+ .clear_flags = task_clear_flags,
+ .open = task_open,
};
STORE_STD_CLASS (task);
diff --git a/libstore/typed.c b/libstore/typed.c
index b1be747d..0a70a7f8 100644
--- a/libstore/typed.c
+++ b/libstore/typed.c
@@ -173,5 +173,5 @@ store_typed_open (const char *name, int flags,
}
const struct store_class
-store_typed_open_class = { -1, "typed", open: store_typed_open };
+store_typed_open_class = { .id = -1, .name = "typed", .open = store_typed_open
};
STORE_STD_CLASS (typed_open);
diff --git a/libstore/unknown.c b/libstore/unknown.c
index 0b06cbf7..624c1842 100644
--- a/libstore/unknown.c
+++ b/libstore/unknown.c
@@ -217,18 +217,19 @@ unknown_open (const char *name, int flags,
const struct store_class store_unknown_class =
{
- -1, "unknown",
- read: noread,
- write: nowrite,
- set_size: noset_size,
- allocate_encoding: unknown_allocate_encoding,
- encode: unknown_encode,
- decode: store_unknown_decode,
- set_flags: noflags,
- clear_flags: noflags,
- cleanup: unknown_cleanup,
- clone: unknown_clone,
- open: unknown_open,
- validate_name: unknown_validate_name,
+ .id = -1,
+ .name = "unknown",
+ .read = noread,
+ .write = nowrite,
+ .set_size = noset_size,
+ .allocate_encoding = unknown_allocate_encoding,
+ .encode = unknown_encode,
+ .decode = store_unknown_decode,
+ .set_flags = noflags,
+ .clear_flags = noflags,
+ .cleanup = unknown_cleanup,
+ .clone = unknown_clone,
+ .open = unknown_open,
+ .validate_name = unknown_validate_name,
};
STORE_STD_CLASS (unknown);
diff --git a/libstore/unzipstore.c b/libstore/unzipstore.c
index cc86887e..7209be38 100644
--- a/libstore/unzipstore.c
+++ b/libstore/unzipstore.c
@@ -263,5 +263,5 @@ STORE_UNZIP(open) (const char *name, int flags,
}
const struct store_class STORE_UNZIP(class) =
-{ -1, STRINGIFY(UNZIP), open: STORE_UNZIP(open) };
+{ .id = -1, .name = STRINGIFY(UNZIP), .open = STORE_UNZIP(open) };
STORE_STD_CLASS_1 (UNZIP);
diff --git a/libstore/url.c b/libstore/url.c
index 9b5f524e..a1066fa0 100644
--- a/libstore/url.c
+++ b/libstore/url.c
@@ -85,8 +85,9 @@ store_url_decode (struct store_enc *enc,
const struct store_class store_url_open_class =
{
- STORAGE_NETWORK, "url",
- open: store_url_open,
- decode: store_url_decode
+ .id = STORAGE_NETWORK,
+ .name = "url",
+ .open = store_url_open,
+ .decode = store_url_decode
};
STORE_STD_CLASS (url_open);
diff --git a/libstore/zero.c b/libstore/zero.c
index 37c239b5..6d3904d1 100644
--- a/libstore/zero.c
+++ b/libstore/zero.c
@@ -181,10 +181,18 @@ zero_map (const struct store *store, vm_prot_t prot,
mach_port_t *memobj)
const struct store_class
store_zero_class =
{
- STORAGE_ZERO, "zero", zero_read, zero_write, zero_set_size,
- zero_allocate_encoding, zero_encode, zero_decode,
- 0, 0, 0, 0, zero_remap, zero_open, zero_validate_name,
- zero_map
+ .id = STORAGE_ZERO,
+ .name = "zero",
+ .read = zero_read,
+ .write = zero_write,
+ .set_size = zero_set_size,
+ .allocate_encoding = zero_allocate_encoding,
+ .encode = zero_encode,
+ .decode = zero_decode,
+ .remap = zero_remap,
+ .open = zero_open,
+ .validate_name = zero_validate_name,
+ .map = zero_map,
};
STORE_STD_CLASS (zero);
--
2.52.0
