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 /epan/dissectors/packet-snmp.c | |
| 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 'epan/dissectors/packet-snmp.c')
| -rw-r--r-- | epan/dissectors/packet-snmp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 7499c575ea..01377388ed 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -1470,7 +1470,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; @@ -1481,7 +1481,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"); @@ -1516,9 +1516,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 @@ -3076,7 +3077,7 @@ static int dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1864 "../../asn1/snmp/packet-snmp-template.c" +#line 1865 "../../asn1/snmp/packet-snmp-template.c" guint @@ -3898,7 +3899,7 @@ void proto_register_snmp(void) { NULL, HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2421 "../../asn1/snmp/packet-snmp-template.c" +#line 2422 "../../asn1/snmp/packet-snmp-template.c" }; /* List of subtrees */ @@ -3938,7 +3939,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2437 "../../asn1/snmp/packet-snmp-template.c" +#line 2438 "../../asn1/snmp/packet-snmp-template.c" }; static ei_register_info ei[] = { { &ei_snmp_failed_decrypted_data_pdu, { "snmp.failed_decrypted_data_pdu", PI_MALFORMED, PI_WARN, "Failed to decrypt encryptedPDU", EXPFILL }}, |