aboutsummaryrefslogtreecommitdiffstats
path: root/epan/radius_dict.l
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-04-25 21:19:22 +0000
committerGuy Harris <guy@alum.mit.edu>2011-04-25 21:19:22 +0000
commit1a52f126cd4dd53cfa445e1352d0486ea528cc7b (patch)
tree617ffb87e95a195b782d9e4d84026e98d2777276 /epan/radius_dict.l
parent3de56a2a7b4057bcc65fd1286626ab713a9de004 (diff)
More fun with GArrays: cast away some warnings that don't report real
alignment problems and that wouldn't even happen if the "data" member of a GArray were a "void *". Clean up indentation. svn path=/trunk/; revision=36854
Diffstat (limited to 'epan/radius_dict.l')
-rw-r--r--epan/radius_dict.l12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/radius_dict.l b/epan/radius_dict.l
index 2ebe3f4a51..e2a5fb4b02 100644
--- a/epan/radius_dict.l
+++ b/epan/radius_dict.l
@@ -461,7 +461,7 @@ static void setup_tlvs(gpointer k _U_, gpointer v, gpointer p _U_) {
} vs;
if (g_hash_table_lookup_extended(value_strings, s->name, &key, &vs.p)) {
- s->vs = (value_string*) vs.a->data;
+ s->vs = (value_string*)(void *)vs.a->data;
g_array_free(vs.a, FALSE);
g_hash_table_remove(value_strings, key);
g_free(key);
@@ -478,7 +478,7 @@ static void setup_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
} vs;
if (g_hash_table_lookup_extended(value_strings,a->name,&key,&vs.p) ) {
- a->vs = (value_string*) vs.a->data;
+ a->vs = (value_string*)(void *)vs.a->data;
g_array_free(vs.a,FALSE);
g_hash_table_remove(value_strings,key);
g_free(key);
@@ -496,13 +496,13 @@ static void setup_vendors(gpointer k _U_, gpointer v, gpointer p) {
}
static gboolean destroy_value_strings(gpointer k, gpointer v, gpointer p _U_) {
- value_string* vs = (value_string*)(((GArray*)v)->data);
+ value_string* vs = (value_string*)(void *)(((GArray*)v)->data);
g_free(k);
- for (;vs->strptr;vs++) {
- g_free((void*)vs->strptr);
- }
+ for (;vs->strptr;vs++) {
+ g_free((void*)vs->strptr);
+ }
g_array_free(v,TRUE);
return TRUE;