diff options
| author | Evan Huus <eapache@gmail.com> | 2015-11-16 16:02:43 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-11-17 04:18:37 +0000 |
| commit | c3025544b63c456ba1da066e22c80b9018a64fbb (patch) | |
| tree | 1964c282903f6bb4c625a955b88fbd7f0f1e63c2 /wiretap | |
| parent | 9a7973770e19dca8ee455d60efb0b46c3bafef98 (diff) | |
Misc minor issues caught by cppcheck
All trivial (unused variables, duplicate `break`s, etc).
Change-Id: Idbfffae4f6c0b0119a90ae5849de2ed7a1180c9b
Reviewed-on: https://code.wireshark.org/review/11886
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/eyesdn.c | 2 | ||||
| -rw-r--r-- | wiretap/ngsniffer.c | 2 | ||||
| -rw-r--r-- | wiretap/pcapng.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c index 494e99f7e1..5ab651a3a4 100644 --- a/wiretap/eyesdn.c +++ b/wiretap/eyesdn.c @@ -92,7 +92,7 @@ static gboolean esc_read(FILE_T fh, guint8 *buf, int len, int *err, gchar **err_ /* Magic text to check for eyesdn-ness of file */ static const unsigned char eyesdn_hdr_magic[] = { 'E', 'y', 'e', 'S', 'D', 'N'}; -#define EYESDN_HDR_MAGIC_SIZE (sizeof(eyesdn_hdr_magic) / sizeof(eyesdn_hdr_magic[0])) +#define EYESDN_HDR_MAGIC_SIZE sizeof(eyesdn_hdr_magic) /* Size of a record header */ #define EYESDN_HDR_LENGTH 12 diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 79fd2971e2..b69ac087a8 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -2381,7 +2381,6 @@ ng_read_bytes_or_eof(wtap *wth, void *buffer, unsigned int nbytes, gboolean is_r ngsniffer_t *ngsniffer; FILE_T infile; ngsniffer_comp_stream_t *comp_stream; - gint64 copied_bytes = 0; /* bytes already copied */ unsigned char *outbuffer = (unsigned char *)buffer; /* where to write next decompressed data */ blob_info_t *blob; unsigned int bytes_to_copy; @@ -2477,7 +2476,6 @@ ng_read_bytes_or_eof(wtap *wth, void *buffer, unsigned int nbytes, gboolean is_r memcpy(outbuffer, &comp_stream->buf[comp_stream->nextout], bytes_to_copy); nbytes -= bytes_to_copy; - copied_bytes += bytes_to_copy; outbuffer += bytes_to_copy; comp_stream->nextout += bytes_to_copy; comp_stream->uncomp_offset += bytes_to_copy; diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index fbd51d3d07..146af3ba0a 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -1909,7 +1909,6 @@ read_options: pcapng_debug("pcapng_read_name_resolution_block: opt_comment length %u seems strange", oh.option_length); } break; - break; default: #ifdef HAVE_PLUGINS /* |