osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Joerg Mayer 2016-03-28 13:37:24 +02:00 committed by Jörg Mayer
parent 1aaaac5e2e
commit c0e48778b7
12 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
capinfos.c
View File

@ -1384,7 +1384,12 @@ get_capinfos_compiled_info(GString *str)
}
static void
get_capinfos_runtime_info(GString *str _U_)
get_capinfos_runtime_info(
#if defined(HAVE_LIBZ) && !defined(_WIN32)
GString *str)
#else
GString *str _U_)
#endif
{
/* zlib */
#if defined(HAVE_LIBZ) && !defined(_WIN32)

7
captype.c
View File

@ -104,7 +104,12 @@ get_captype_compiled_info(GString *str)
}
static void
get_captype_runtime_info(GString *str _U_)
get_captype_runtime_info(
#if defined(HAVE_LIBZ) && !defined(_WIN32)
GString *str)
#else
GString *str _U_)
#endif
{
/* zlib */
#if defined(HAVE_LIBZ) && !defined(_WIN32)

2
epan/dissectors/file-elf.c
View File

@ -962,7 +962,7 @@ dissect_eh_frame_hdr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *segment_
static gint
dissect_eh_frame(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *segment_tree,
dissect_eh_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *segment_tree,
gint offset, gint segment_size, gint register_size _U_, guint machine_encoding)
{
proto_tree *cfi_tree = NULL;

2
epan/dissectors/file-jpeg.c
View File

@ -484,7 +484,7 @@ process_sos_header(proto_tree *tree, tvbuff_t *tvb, guint32 len _U_,
* Process a Comment header (with length).
*/
static void
process_comment_header(proto_tree *tree, tvbuff_t *tvb, guint32 len _U_,
process_comment_header(proto_tree *tree, tvbuff_t *tvb, guint32 len,
guint16 marker, const char *marker_name)
{
proto_item *ti;

2
epan/dissectors/file-mp4.c
View File

@ -491,7 +491,7 @@ dissect_mp4_url_body(tvbuff_t *tvb, gint offset, gint len,
static gint
dissect_mp4_stsd_body(tvbuff_t *tvb, gint offset, gint len,
packet_info *pinfo _U_, proto_tree *tree)
packet_info *pinfo, proto_tree *tree)
{
guint32 entry_cnt, i;
gint ret;

2
wiretap/ber.c
View File

@ -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 */

2
wiretap/camins.c
View File

@ -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;

7
wiretap/file_wrappers.c
View File

@ -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) {

2
wiretap/k12text.l
View File

@ -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;

4
wiretap/logcat_text.c
View File

@ -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;

13
wiretap/pcapng.c
View File

@ -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;

2
wsutil/ws_version_info.c
View File

@ -126,7 +126,7 @@ get_compiled_version_info(void (*prepend_info)(GString *),
* Get the CPU info, and append it to the GString
*/
static void
get_cpu_info(GString *str _U_)
get_cpu_info(GString *str)
{
guint32 CPUInfo[4];
char CPUBrandString[0x40];