sr_dbg("Opened %s.", vdev->capturefile);
} else {
/* Try as first chunk filename. */
- snprintf(capturefile, 15, "%s-1", vdev->capturefile);
+ snprintf(capturefile, sizeof(capturefile) - 1, "%s-1", vdev->capturefile);
if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
vdev->cur_chunk = 1;
if (!(vdev->capfile = zip_fopen(vdev->archive,
} else {
/* Capture data is chunked, advance to the next chunk. */
vdev->cur_chunk++;
- snprintf(capturefile, 15, "%s-%d", vdev->capturefile,
+ snprintf(capturefile, sizeof(capturefile) - 1, "%s-%d", vdev->capturefile,
vdev->cur_chunk);
if (zip_stat(vdev->archive, capturefile, 0, &zs) != -1) {
if (!(vdev->capfile = zip_fopen(vdev->archive,
return SR_OK;
}
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct session_vdev *vdev;
return SR_OK;
}
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct session_vdev *vdev;
return SR_OK;
}
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- (void)sdi;
- (void)cg;
-
- switch (key) {
- case SR_CONF_DEVICE_OPTIONS:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
- break;
- default:
- return SR_ERR_NA;
- }
-
- return SR_OK;
+ return STD_CONFIG_LIST(key, data, sdi, cg, NULL, NULL, devopts);
}
static int dev_acquisition_start(const struct sr_dev_inst *sdi)
.longname = "Session-emulating driver",
.api_version = 1,
.init = std_init,
- .cleanup = std_dev_clear,
+ .cleanup = std_cleanup,
.scan = NULL,
.dev_list = NULL,
.dev_clear = std_dev_clear,