diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-17 17:21:25 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-18 01:23:42 +0000 |
| commit | 909d891b267852d386f0e47cb4ccd818b7f99176 (patch) | |
| tree | e3035c13d3b6bf8fec8bfd793d0e8d65d5eea500 /asn1 | |
| parent | b10bad126a7bb605216badebce6f4ba30eef0106 (diff) | |
Some additional UAT update callback changes.
I guess the signature mismatch must just be a warning with Clang; it's
not with MSVC.
Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73
Reviewed-on: https://code.wireshark.org/review/7225
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ldap/packet-ldap-template.c | 9 | ||||
| -rw-r--r-- | asn1/snmp/packet-snmp-template.c | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 423b9f1549..77c4b8f485 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -406,7 +406,7 @@ static guint num_attribute_types = 0; static GHashTable* attribute_types_hash = NULL; -static void +static gboolean attribute_types_update_cb(void *r, char **err) { attribute_type_t *rec = (attribute_type_t *)r; @@ -414,13 +414,13 @@ attribute_types_update_cb(void *r, char **err) if (rec->attribute_type == NULL) { *err = g_strdup("Attribute type can't be empty"); - return; + return FALSE; } g_strstrip(rec->attribute_type); if (rec->attribute_type[0] == 0) { *err = g_strdup("Attribute type can't be empty"); - return; + return FALSE; } /* Check for invalid characters (to avoid asserting out when @@ -429,10 +429,11 @@ attribute_types_update_cb(void *r, char **err) c = proto_check_field_name(rec->attribute_type); if (c) { *err = g_strdup_printf("Attribute type can't contain '%c'", c); - return; + return FALSE; } *err = NULL; + return TRUE; } static void * diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 222ffc3ead..cf2d8b7bfe 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -1368,7 +1368,7 @@ snmp_users_free_cb(void* p) g_free(ue->engine.data); } -static void +static gboolean snmp_users_update_cb(void* p _U_, char** err) { snmp_ue_assoc_t* ue = (snmp_ue_assoc_t*)p; @@ -1379,7 +1379,7 @@ snmp_users_update_cb(void* p _U_, char** err) if (num_ueas == 0) /* Nothing to update */ - return; + return FALSE; if (! ue->user.userName.len) g_string_append_printf(es,"no userName\n"); @@ -1414,9 +1414,10 @@ snmp_users_update_cb(void* p _U_, char** err) if (es->len) { es = g_string_truncate(es,es->len-1); *err = g_string_free(es, FALSE); + return FALSE; } - return; + return TRUE; } static void |