diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-17 16:40:28 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-18 00:41:09 +0000 |
| commit | 859511db14feae071cc1e6e1889ae39bfd276faa (patch) | |
| tree | a6ef5501110220c93d583439f5f0257c243cde64 /epan/dissectors/packet-devicenet.c | |
| parent | 3f765b3ef94fd6044279d47d0b30b46c344e5943 (diff) | |
Make UAT record update callbacks return a success/failure indication.
Have them return TRUE on success and FALSE on failure. Check the return
value rather than whether the error string pointer is null or not.
Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c
Reviewed-on: https://code.wireshark.org/review/7222
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-devicenet.c')
| -rw-r--r-- | epan/dissectors/packet-devicenet.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 5e7974c0d7..29a1e08b0b 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -128,11 +128,14 @@ static uat_devicenet_record_t *uat_devicenet_records = NULL; static uat_t *devicenet_uat = NULL; static guint num_devicenet_records_uat = 0; -static void uat_devicenet_record_update_cb(void* r, char** err) { +static gboolean uat_devicenet_record_update_cb(void* r, char** err) { uat_devicenet_record_t* rec = (uat_devicenet_record_t *)r; - if (rec->mac_id > 63) + if (rec->mac_id > 63) { *err = g_strdup_printf("MAC ID must be between 0-63"); + return FALSE; + } + return TRUE; } UAT_DEC_CB_DEF(uat_devicenet_records, mac_id, uat_devicenet_record_t) |