diff options
| author | Dario Lombardo <lomato@gmail.com> | 2020-04-13 23:39:32 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-04-14 06:23:00 +0000 |
| commit | c2d67c0928ed222f6f984b0cf09985fd8e1c6232 (patch) | |
| tree | 70f63968d10713b2cdcaf5bd000e9dce8eb3f7d4 /wiretap/candump.c | |
| parent | 9eeb1c80fb3b03127ad781a6471462db414d6d91 (diff) | |
wiretap: don't use memset where possible.
Change-Id: Id74764242ba13fb4ed58299a475096a64e5c6b5b
Reviewed-on: https://code.wireshark.org/review/36838
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/candump.c')
| -rw-r--r-- | wiretap/candump.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/wiretap/candump.c b/wiretap/candump.c index 3eb17dd2c2..0def7bcb50 100644 --- a/wiretap/candump.c +++ b/wiretap/candump.c @@ -57,9 +57,8 @@ candump_write_packet(wtap_rec *rec, Buffer *buf, const msg_t *msg) if (msg->is_fd) { - canfd_frame_t canfd_frame; + canfd_frame_t canfd_frame = {0}; - memset(&canfd_frame, 0, sizeof(canfd_frame)); canfd_frame.can_id = msg->id; canfd_frame.flags = msg->flags; canfd_frame.len = msg->data.length; @@ -69,9 +68,8 @@ candump_write_packet(wtap_rec *rec, Buffer *buf, const msg_t *msg) } else { - can_frame_t can_frame; + can_frame_t can_frame = {0}; - memset(&can_frame, 0, sizeof(can_frame)); can_frame.can_id = msg->id; can_frame.can_dlc = msg->data.length; memcpy(can_frame.data, msg->data.data, msg->data.length); @@ -91,7 +89,7 @@ candump_write_packet(wtap_rec *rec, Buffer *buf, const msg_t *msg) static gboolean candump_parse(FILE_T fh, msg_t *msg, gint64 *offset, int *err, char **err_info) { - candump_state_t state; + candump_state_t state = {0}; gboolean ok; gint64 seek_off; @@ -99,7 +97,6 @@ candump_parse(FILE_T fh, msg_t *msg, gint64 *offset, int *err, char **err_info) ws_debug_printf("%s: Trying candump file decoder\n", G_STRFUNC); #endif - memset(&state, 0, sizeof(state)); state.fh = fh; do |