diff options
author | Guy Harris <guy@alum.mit.edu> | 2007-04-30 19:24:25 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2007-04-30 19:24:25 +0000 |
commit | 1d73cea47065011c327f83b9c26ab973504a8117 (patch) | |
tree | 5dd407225e18178c9fdc4c126cccdf7d4dfd08b0 /epan/dissectors/packet-radius.c | |
parent | db53f99ccabc039963b3540b10eeef7ff41e2ea4 (diff) |
Add a header that redefines g_array_index() to throw in a "void *" cast
to work around the "data" field of a GArray being a guint8 *, and
defines a g_array_data() macro to extract that field and cast it to void
*.
Use that header where needed.
svn path=/trunk/; revision=21627
Diffstat (limited to 'epan/dissectors/packet-radius.c')
-rw-r--r-- | epan/dissectors/packet-radius.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index c01246766a..0474818204 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -64,6 +64,7 @@ #include <epan/tap.h> #include <epan/addr_resolv.h> #include <epan/emem.h> +#include <epan/garrayfix.h> #include "packet-radius.h" @@ -1492,13 +1493,13 @@ proto_register_radius(void) dict->vendors_by_name = g_hash_table_new(g_str_hash,g_str_equal); } - radius_vendors = (value_string*)(void *)ri.vend_vs->data; + radius_vendors = (value_string*)g_array_data(ri.vend_vs); proto_radius = proto_register_protocol("Radius Protocol", "RADIUS", "radius"); register_dissector("radius", dissect_radius, proto_radius); - proto_register_field_array(proto_radius,(hf_register_info*)(void *)(ri.hf->data),ri.hf->len); - proto_register_subtree_array((gint**)(void *)(ri.ett->data), ri.ett->len); + proto_register_field_array(proto_radius,(hf_register_info*)g_array_data(ri.hf),ri.hf->len); + proto_register_subtree_array((gint**)g_array_data(ri.ett), ri.ett->len); register_init_routine(&radius_init_protocol); |