diff options
| author | João Valverde <j@v6e.pt> | 2023-04-17 01:06:04 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-04-19 15:12:25 +0000 |
| commit | 7595af96a08744392b1ff2a866c1d86ef6b7099e (patch) | |
| tree | 2872b856d3a9e91b926e6ae68f8facf126717cc5 /plugins | |
| parent | 0f66c595e2ce43afbbf840188f57fba844e634d7 (diff) | |
ftypes: Hide fvalue implementation
Exposing the fvalue_t implementation is exposing internal
details of the implementation. Fix that by making the fvalue_t
internal to the ftypes implementation and using setters/getters
where necessary.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/epan/mate/mate_util.c | 2 | ||||
| -rw-r--r-- | plugins/epan/transum/extractors.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/epan/mate/mate_util.c b/plugins/epan/mate/mate_util.c index 063a7294b7..29ca522fc7 100644 --- a/plugins/epan/mate/mate_util.c +++ b/plugins/epan/mate/mate_util.c @@ -293,7 +293,7 @@ extern AVP* new_avp_from_finfo(const gchar* name, field_info* finfo) { new_avp_val->n = scs_subscribe(avp_strings, name); - repr = fvalue_to_string_repr(NULL, &finfo->value,FTREPR_DISPLAY,finfo->hfinfo->display); + repr = fvalue_to_string_repr(NULL, finfo->value, FTREPR_DISPLAY, finfo->hfinfo->display); if (repr) { value = scs_subscribe(avp_strings, repr); diff --git a/plugins/epan/transum/extractors.c b/plugins/epan/transum/extractors.c index 87a6d3234f..80475ae377 100644 --- a/plugins/epan/transum/extractors.c +++ b/plugins/epan/transum/extractors.c @@ -41,7 +41,7 @@ int extract_uint(proto_tree *tree, int field_id, guint32 *result_array, size_t * for (size_t i = 0; i < *element_count && i < MAX_RETURNED_ELEMENTS; i++) { - result_array[i] = fvalue_get_uinteger(&((field_info*)finfo_array->pdata[i])->value); + result_array[i] = fvalue_get_uinteger(((field_info*)finfo_array->pdata[i])->value); } return 0; @@ -66,7 +66,7 @@ int extract_ui64(proto_tree *tree, int field_id, guint64 *result_array, size_t * for (size_t i = 0; i < *element_count && i < MAX_RETURNED_ELEMENTS; i++) { - result_array[i] = fvalue_get_uinteger64(&((field_info*)finfo_array->pdata[i])->value); + result_array[i] = fvalue_get_uinteger64(((field_info*)finfo_array->pdata[i])->value); } return 0; @@ -91,7 +91,7 @@ int extract_si64(proto_tree *tree, int field_id, guint64 *result_array, size_t * for (size_t i = 0; i < *element_count && i < MAX_RETURNED_ELEMENTS; i++) { - result_array[i] = fvalue_get_sinteger64(&((field_info*)finfo_array->pdata[i])->value); + result_array[i] = fvalue_get_sinteger64(((field_info*)finfo_array->pdata[i])->value); } return 0; @@ -116,10 +116,10 @@ int extract_bool(proto_tree *tree, int field_id, gboolean *result_array, size_t for (size_t i = 0; i < *element_count && i < MAX_RETURNED_ELEMENTS; i++) { - fvalue_t *fv = &(((field_info*)finfo_array->pdata[i])->value); + fvalue_t *fv = ((field_info*)finfo_array->pdata[i])->value; ws_assert(fvalue_type_ftenum(fv) == FT_BOOLEAN); - if (fv->value.uinteger64) + if (fvalue_get_uinteger64(fv)) result_array[i] = TRUE; else result_array[i] = FALSE; |