X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftarget_v5upgrade.c;h=3f2c9583f51a31c4196f922faab05daccfb1a9c0;hb=5917eb3d38171296d021351aba4e2601c8819bb7;hp=345ca73f4f0b7d47ee90f64e8b4de436caf58784;hpb=e14e8b7f5c5bf9d0fe5cc632c6383f304d4ac2ad;p=collectd.git diff --git a/src/target_v5upgrade.c b/src/target_v5upgrade.c index 345ca73f..3f2c9583 100644 --- a/src/target_v5upgrade.c +++ b/src/target_v5upgrade.c @@ -281,7 +281,6 @@ static int v5_zfs_arc_counts (const data_set_t *ds, value_list_t *vl) /* {{{ */ static int v5_zfs_arc_l2_bytes (const data_set_t *ds, value_list_t *vl) /* {{{ */ { value_list_t new_vl; - value_t new_values[2]; if (vl->values_len != 2) return (FC_TARGET_STOP); @@ -290,8 +289,6 @@ static int v5_zfs_arc_l2_bytes (const data_set_t *ds, value_list_t *vl) /* {{{ * memcpy (&new_vl, vl, sizeof (new_vl)); /* Reset data we can't simply copy */ - new_vl.values = new_values; - new_vl.values_len = 2; new_vl.meta = NULL; /* Change the type/-instance to "io_octets-L2" */ @@ -299,8 +296,12 @@ static int v5_zfs_arc_l2_bytes (const data_set_t *ds, value_list_t *vl) /* {{{ * sstrncpy (new_vl.type_instance, "L2", sizeof (new_vl.type_instance)); /* Copy the actual values. */ - new_vl.values[0].derive = (derive_t) vl->values[0].counter; - new_vl.values[1].derive = (derive_t) vl->values[1].counter; + value_t values[] = { + { .derive = (derive_t) vl->values[0].counter }, + { .derive = (derive_t) vl->values[1].counter }, + }; + new_vl.values = values; + new_vl.values_len = STATIC_ARRAY_SIZE (values); /* Dispatch new value lists instead of this one */ plugin_dispatch_values (&new_vl);