osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2011-04-25 21:19:22 +00:00
parent 3de56a2a7b
commit 1a52f126cd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/radius_dict.l
View File

@ -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;