Skip to content

Commit d0defdf

Browse files
committed
Fix some MSVC 14.0 warnings
The warnings were: util-print.c(518): warning C4028: formal parameter 3 different from declaration util-print.c(579): warning C4028: formal parameter 3 different from declaration util-print.c(589): warning C4028: formal parameter 3 different from declaration util-print.c(601): warning C4028: formal parameter 4 different from declaration util-print.c(634): warning C4028: formal parameter 1 different from declaration It is a follow-up to 857656d.
1 parent 2fd7b16 commit d0defdf

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

netdissect.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ struct tok {
153153
};
154154

155155
/* tok2str is deprecated */
156-
extern const char *tok2str(const struct tok *, const char *, u_int);
157-
extern char *bittok2str(const struct tok *, const char *, u_int);
158-
extern char *bittok2str_nosep(const struct tok *, const char *, u_int);
156+
extern const char *tok2str(const struct tok *, const char *, const u_int);
157+
extern char *bittok2str(const struct tok *, const char *, const u_int);
158+
extern char *bittok2str_nosep(const struct tok *, const char *, const u_int);
159159

160160
/* Initialize netdissect. */
161161
extern int nd_init(char *, size_t);
@@ -501,7 +501,7 @@ extern int unaligned_memcmp(const void *, const void *, size_t);
501501
#define PLURAL_SUFFIX(n) \
502502
(((n) != 1) ? "s" : "")
503503

504-
extern const char *tok2strary_internal(const char **, int, const char *, int);
504+
extern const char *tok2strary_internal(const char **, int, const char *, const int);
505505
#define tok2strary(a,f,i) tok2strary_internal(a, sizeof(a)/sizeof(a[0]),f,i)
506506

507507
struct uint_tokary
@@ -794,7 +794,7 @@ extern void nd_print_protocol(netdissect_options *);
794794
extern void nd_print_protocol_caps(netdissect_options *);
795795
extern void nd_print_invalid(netdissect_options *);
796796

797-
extern int mask2plen(uint32_t);
797+
extern int mask2plen(const uint32_t);
798798
extern int mask62plen(const u_char *);
799799

800800
extern const char *dnnum_string(netdissect_options *, u_short);

0 commit comments

Comments
 (0)