Fix some warnings/errors of type

git/epan/dissectors/packet-a21.c:478:25: error: 'item' was marked unused but was used
      [-Werror,-Wused-but-marked-unused]
        proto_item_append_text(item, "%s", val_to_str_const(event_id, a21_event_vals, "Unknown"));
                               ^
Added manual change id because file-jpeg.c forced the use of commit -n

Change-Id: Iffff53d6253758c8454d9583f0a11f317c8390cb
Reviewed-on: https://code.wireshark.org/review/14666
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

6 files changed, 22 insertions, 8 deletions

diff --git a/wiretap/ber.c b/wiretap/ber.c
index b7467ce3da..4897447a04 100644
--- a/wiretap/ber.c
+++ b/wiretap/ber.c
@@ -85,7 +85,7 @@ static gboolean ber_read(wtap *wth, int *err, gchar **err_info, gint64 *data_off
   return ber_read_file(wth, wth->fh, &wth->phdr, wth->frame_buffer, err, err_info);
 }
 
-static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr _U_,
+static gboolean ber_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *phdr,
                               Buffer *buf, int *err, gchar **err_info)
 {
   /* there is only one packet */
diff --git a/wiretap/camins.c b/wiretap/camins.c
index 49863799dd..47a9f88c34 100644
--- a/wiretap/camins.c
+++ b/wiretap/camins.c
@@ -296,7 +296,7 @@ camins_seek_read(wtap *wth, gint64 seek_off,
 
 
 
-wtap_open_return_val camins_open(wtap *wth, int *err, gchar **err_info _U_)
+wtap_open_return_val camins_open(wtap *wth, int *err, gchar **err_info)
 {
     guint8  found_start_blocks = 0;
     guint8  count = 0;
diff --git a/wiretap/file_wrappers.c b/wiretap/file_wrappers.c
index 067be50659..777d683014 100644
--- a/wiretap/file_wrappers.c
+++ b/wiretap/file_wrappers.c
@@ -233,7 +233,12 @@ fast_seek_header(FILE_T file, gint64 in_pos, gint64 out_pos,
 }
 
 static void
-fast_seek_reset(FILE_T state _U_)
+fast_seek_reset(
+#ifdef HAVE_LIBZ
+    FILE_T state)
+#else
+    FILE_T state _U_)
+#endif
 {
 #ifdef HAVE_LIBZ
     if (state->compression == ZLIB && state->fast_seek_cur) {
diff --git a/wiretap/k12text.l b/wiretap/k12text.l
index 7601b94232..3ff7ca8610 100644
--- a/wiretap/k12text.l
+++ b/wiretap/k12text.l
@@ -373,7 +373,7 @@ static const struct { int e; const char* s; } encaps[] = {
 };
 
 static gboolean
-k12text_dump(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phdr,
+k12text_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 	     const guint8 *pd, int *err, gchar **err_info _U_) {
 #define K12BUF_SIZE 196808
 	char *buf;
diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c
index 870121a76e..551358170f 100644
--- a/wiretap/logcat_text.c
+++ b/wiretap/logcat_text.c
@@ -224,7 +224,7 @@ static gboolean logcat_text_read_packet(FILE_T fh, struct wtap_pkthdr *phdr,
 }
 
 static gboolean logcat_text_read(wtap *wth, int *err _U_ , gchar **err_info _U_,
-        gint64 *data_offset _U_) {
+        gint64 *data_offset) {
     *data_offset = file_tell(wth->fh);
 
     return logcat_text_read_packet(wth->fh, &wth->phdr, wth->frame_buffer,
@@ -232,7 +232,7 @@ static gboolean logcat_text_read(wtap *wth, int *err _U_ , gchar **err_info _U_,
 }
 
 static gboolean logcat_text_seek_read(wtap *wth, gint64 seek_off,
-        struct wtap_pkthdr *phdr, Buffer *buf, int *err _U_, gchar **err_info _U_) {
+        struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info _U_) {
     if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
         return FALSE;
 
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 8729177b0b..3ebbfcaf1c 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -2122,7 +2122,7 @@ pcapng_read_interface_statistics_block(FILE_T fh, pcapng_block_header_t *bh, pca
 }
 
 static gboolean
-pcapng_read_sysdig_event_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn _U_, wtapng_block_t *wblock, int *err, gchar **err_info)
+pcapng_read_sysdig_event_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, wtapng_block_t *wblock, int *err, gchar **err_info)
 {
     unsigned block_read;
     guint32 block_total_length;
@@ -2213,7 +2213,16 @@ pcapng_read_sysdig_event_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *p
 }
 
 static gboolean
-pcapng_read_unknown_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn _U_, wtapng_block_t *wblock _U_, int *err, gchar **err_info)
+pcapng_read_unknown_block(FILE_T fh, pcapng_block_header_t *bh,
+#
+#ifdef HAVE_PLUGINS
+    pcapng_t *pn,
+    wtapng_block_t *wblock,
+#else
+    pcapng_t *pn _U_,
+    wtapng_block_t *wblock _U_,
+#endif
+    int *err, gchar **err_info)
 {
     guint32 block_read;
     guint32 block_total_length;