diff options
Diffstat (limited to 'plugins/epan/transum/extractors.c')
-rw-r--r-- | plugins/epan/transum/extractors.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/epan/transum/extractors.c b/plugins/epan/transum/extractors.c index 80475ae3..92c3a144 100644 --- a/plugins/epan/transum/extractors.c +++ b/plugins/epan/transum/extractors.c @@ -11,7 +11,7 @@ */ #include "config.h" #include <epan/prefs.h> -#include <epan/packet.h> +#include <wsutil/array.h> #include "extractors.h" /* @@ -22,7 +22,7 @@ Return is 0 if all went well. If this function return -1 it is probably because the tree did not include the field defined by the field_id. */ -int extract_uint(proto_tree *tree, int field_id, guint32 *result_array, size_t *element_count) +int extract_uint(proto_tree *tree, int field_id, uint32_t *result_array, size_t *element_count) { GPtrArray *finfo_array; @@ -47,7 +47,7 @@ int extract_uint(proto_tree *tree, int field_id, guint32 *result_array, size_t * return 0; } -int extract_ui64(proto_tree *tree, int field_id, guint64 *result_array, size_t *element_count) +int extract_ui64(proto_tree *tree, int field_id, uint64_t *result_array, size_t *element_count) { GPtrArray *finfo_array; @@ -72,7 +72,7 @@ int extract_ui64(proto_tree *tree, int field_id, guint64 *result_array, size_t * return 0; } -int extract_si64(proto_tree *tree, int field_id, guint64 *result_array, size_t *element_count) +int extract_si64(proto_tree *tree, int field_id, uint64_t *result_array, size_t *element_count) { GPtrArray *finfo_array; @@ -97,7 +97,7 @@ int extract_si64(proto_tree *tree, int field_id, guint64 *result_array, size_t * return 0; } -int extract_bool(proto_tree *tree, int field_id, gboolean *result_array, size_t *element_count) +int extract_bool(proto_tree *tree, int field_id, bool *result_array, size_t *element_count) { GPtrArray *finfo_array; @@ -120,9 +120,9 @@ int extract_bool(proto_tree *tree, int field_id, gboolean *result_array, size_t ws_assert(fvalue_type_ftenum(fv) == FT_BOOLEAN); if (fvalue_get_uinteger64(fv)) - result_array[i] = TRUE; + result_array[i] = true; else - result_array[i] = FALSE; + result_array[i] = false; } return 0; |