summaryrefslogtreecommitdiff
path: root/asn1/ess
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-03-14 06:26:55 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-03-14 06:26:55 +0000
commitfad318ad441dded882073655a06dc8dba5bd2fe7 (patch)
tree70ff0d0096d043840f94fac3c3937f42c5c25936 /asn1/ess
parent455139f4befdaa6b6a681b4eeb8dda712f6ce40b (diff)
downloadwireshark-fad318ad441dded882073655a06dc8dba5bd2fe7.tar.gz
From beroset:
changed implicit casts to explicit casts and corrected one erroneous cast (from void* to void**) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48286
Diffstat (limited to 'asn1/ess')
-rw-r--r--asn1/ess/packet-ess-template.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c
index 96fa4d2a8f..424038405a 100644
--- a/asn1/ess/packet-ess-template.c
+++ b/asn1/ess/packet-ess-template.c
@@ -76,8 +76,8 @@ UAT_CSTRING_CB_DEF(ess_category_attributes, name, ess_category_attributes_t);
static void *
ess_copy_cb(void *dest, const void *orig, size_t len _U_)
{
- ess_category_attributes_t *u = dest;
- const ess_category_attributes_t *o = orig;
+ ess_category_attributes_t *u = (ess_category_attributes_t *)dest;
+ const ess_category_attributes_t *o = (ess_category_attributes_t *)orig;
u->oid = g_strdup(o->oid);
u->lacv = o->lacv;
@@ -89,7 +89,7 @@ ess_copy_cb(void *dest, const void *orig, size_t len _U_)
static void
ess_free_cb(void *r)
{
- ess_category_attributes_t *u = r;
+ ess_category_attributes_t *u = (ess_category_attributes_t *)r;
g_free(u->oid);
g_free(u->name);
@@ -169,7 +169,7 @@ void proto_register_ess(void) {
sizeof(ess_category_attributes_t),
"ess_category_attributes",
TRUE,
- (void*) &ess_category_attributes,
+ (void**) &ess_category_attributes,
&num_ess_category_attributes,
UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */
"ChEssCategoryAttributes",