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/visual.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/visual.c')
| -rw-r--r-- | wiretap/visual.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/wiretap/visual.c b/wiretap/visual.c index 1c5e9aac8b..c3d80ad255 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -627,7 +627,7 @@ static gboolean visual_dump(wtap_dumper *wdh, const wtap_rec *rec, { const union wtap_pseudo_header *pseudo_header = &rec->rec_header.packet_header.pseudo_header; struct visual_write_info * visual = (struct visual_write_info *)wdh->priv; - struct visual_pkt_hdr vpkt_hdr; + struct visual_pkt_hdr vpkt_hdr = {0}; size_t hdr_size = sizeof vpkt_hdr; guint delta_msec; guint32 packet_status; @@ -658,9 +658,6 @@ static gboolean visual_dump(wtap_dumper *wdh, const wtap_rec *rec, if (visual == 0) return FALSE; - /* Zero out unused and reserved fields in the packet header. */ - memset(&vpkt_hdr, 0, hdr_size); - /* Visual UpTime capture files have a capture start time in the file header. Each packet has a capture time (in msec) relative to the file start time. Use the time of the first packet as the @@ -760,7 +757,7 @@ static gboolean visual_dump_finish(wtap_dumper *wdh, int *err) { struct visual_write_info * visual = (struct visual_write_info *)wdh->priv; size_t n_to_write; - struct visual_file_hdr vfile_hdr; + struct visual_file_hdr vfile_hdr = {0}; const char *magicp; size_t magic_size; @@ -792,8 +789,6 @@ static gboolean visual_dump_finish(wtap_dumper *wdh, int *err) return FALSE; } - /* Initialize the file header with zeroes for the reserved fields. */ - memset(&vfile_hdr, '\0', sizeof vfile_hdr); vfile_hdr.num_pkts = GUINT32_TO_LE(visual->index_table_index); vfile_hdr.start_time = GUINT32_TO_LE(visual->start_time); vfile_hdr.max_length = GUINT16_TO_LE(65535); |