summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editcap.c7
-rw-r--r--epan/dissectors/packet-dcerpc-nt.c4
-rw-r--r--epan/ftypes/ftype-bytes.c4
-rw-r--r--epan/ftypes/ftype-integer.c4
-rw-r--r--epan/ftypes/ftype-pcre.c2
-rwxr-xr-xepan/wslua/make-taps.pl4
-rw-r--r--epan/wslua/wslua_capture_info.c4
-rw-r--r--epan/wslua/wslua_dissector.c2
-rw-r--r--epan/wslua/wslua_field.c2
-rw-r--r--epan/wslua/wslua_file.c2
-rw-r--r--epan/wslua/wslua_frame_info.c4
-rw-r--r--epan/wslua/wslua_proto.c4
-rw-r--r--mergecap.c7
-rw-r--r--ui/tap-sequence-analysis.c2
-rw-r--r--ui/voip_calls.c6
15 files changed, 34 insertions, 24 deletions
diff --git a/editcap.c b/editcap.c
index 225e9791df..bf2270fb4f 100644
--- a/editcap.c
+++ b/editcap.c
@@ -926,7 +926,12 @@ get_editcap_compiled_info(GString *str)
}
static void
-get_editcap_runtime_info(GString *str _U_)
+get_editcap_runtime_info(
+#if defined(HAVE_LIBZ) && !defined(_WIN32)
+ GString *str)
+#else
+ GString *str _U_)
+#endif
{
/* zlib */
#if defined(HAVE_LIBZ) && !defined(_WIN32)
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index ef7ac93d60..dc94b2a4e1 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -1204,7 +1204,7 @@ dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo,
* Helper routines for dissecting NDR strings
*/
void cb_wstr_postprocess(packet_info *pinfo, proto_tree *tree _U_,
- proto_item *item, dcerpc_info *di _U_, tvbuff_t *tvb,
+ proto_item *item, dcerpc_info *di, tvbuff_t *tvb,
int start_offset, int end_offset,
void *callback_args)
{
@@ -1265,7 +1265,7 @@ void cb_wstr_postprocess(packet_info *pinfo, proto_tree *tree _U_,
}
void cb_str_postprocess(packet_info *pinfo, proto_tree *tree _U_,
- proto_item *item, dcerpc_info *di _U_, tvbuff_t *tvb,
+ proto_item *item, dcerpc_info *di, tvbuff_t *tvb,
int start_offset, int end_offset,
void *callback_args)
{
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index 0733681dd2..ab6ded9dfe 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -89,7 +89,7 @@ bytes_repr_len(fvalue_t *fv, ftrepr_t rtype, int field_display _U_)
#define OID_REPR_LEN(fv) (1 + REL_OID_REPR_LEN(fv))
static int
-oid_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
+oid_repr_len(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_)
{
return OID_REPR_LEN(fv);
}
@@ -110,7 +110,7 @@ oid_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf)
}
static int
-rel_oid_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
+rel_oid_repr_len(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_)
{
return REL_OID_REPR_LEN(fv);
}
diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index b95d7b5d18..83345b92b6 100644
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -300,7 +300,7 @@ ipxnet_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
}
static void
-ipxnet_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf)
+ipxnet_to_repr(fvalue_t *fv, ftrepr_t rtype, int field_display _U_, char *buf)
{
uinteger_to_repr(fv, rtype, BASE_HEX, buf);
}
@@ -587,7 +587,7 @@ uinteger64_repr_len(fvalue_t *fv _U_, ftrepr_t rtype _U_, int field_display _U_)
}
static void
-uinteger64_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf)
+uinteger64_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display, char *buf)
{
if ((field_display == BASE_HEX) || (field_display == BASE_HEX_DEC))
{
diff --git a/epan/ftypes/ftype-pcre.c b/epan/ftypes/ftype-pcre.c
index 959215ac08..8ea48afa31 100644
--- a/epan/ftypes/ftype-pcre.c
+++ b/epan/ftypes/ftype-pcre.c
@@ -110,7 +110,7 @@ val_from_string(fvalue_t *fv, const char *pattern, gchar **err_msg)
* On failure, if err_msg is non-null, set *err_msg to point to a
* g_malloc()ed error message. */
static gboolean
-val_from_unparsed(fvalue_t *fv, const char *pattern, gboolean allow_partial_value _U_, gchar **err_msg)
+val_from_unparsed(fvalue_t *fv, const char *pattern, gboolean allow_partial_value, gchar **err_msg)
{
g_assert(! allow_partial_value);
diff --git a/epan/wslua/make-taps.pl b/epan/wslua/make-taps.pl
index cebb226e86..a017a8f79e 100755
--- a/epan/wslua/make-taps.pl
+++ b/epan/wslua/make-taps.pl
@@ -122,7 +122,7 @@ sub dotap {
$elems{$k} = $v;
}
- my $code = "static void wslua_${tname}_to_table(lua_State* L, const void* p) { const $sname* v _U_; v = (const $sname*)p; lua_newtable(L);\n";
+ my $code = "static void wslua_${tname}_to_table(lua_State* L, const void* p) { const $sname* v; v = (const $sname*)p; lua_newtable(L);\n";
my $doc = "Tap: $tname\n";
for my $n (sort keys %elems) {
@@ -187,7 +187,7 @@ print CFILE <<"TBLFTR";
{NULL,NULL}
};
-int wslua_set_tap_enums(lua_State* L _U_) {
+int wslua_set_tap_enums(lua_State* L) {
TBLFTR
diff --git a/epan/wslua/wslua_capture_info.c b/epan/wslua/wslua_capture_info.c
index ddba06d792..f123747a57 100644
--- a/epan/wslua/wslua_capture_info.c
+++ b/epan/wslua/wslua_capture_info.c
@@ -81,7 +81,7 @@ WSLUA_METAMETHOD CaptureInfo__tostring(lua_State* L) {
}
-static int CaptureInfo__gc(lua_State* L _U_) {
+static int CaptureInfo__gc(lua_State* L) {
CaptureInfo fc = toCaptureInfo(L,1);
if (fc)
g_free(fc);
@@ -468,7 +468,7 @@ static int CaptureInfoConst_set_private_table(lua_State* L) {
return set_wdh_priv_table_ref(L, fi->wdh);
}
-static int CaptureInfoConst__gc(lua_State* L _U_) {
+static int CaptureInfoConst__gc(lua_State* L) {
CaptureInfoConst fi = toCaptureInfoConst(L,1);
if (fi)
g_free(fi);
diff --git a/epan/wslua/wslua_dissector.c b/epan/wslua/wslua_dissector.c
index e0adf0f8a9..dbdf6e3956 100644
--- a/epan/wslua/wslua_dissector.c
+++ b/epan/wslua/wslua_dissector.c
@@ -662,7 +662,7 @@ WSLUA_METAMETHOD DissectorTable__tostring(lua_State* L) {
}
/* Gets registered as metamethod automatically by WSLUA_REGISTER_CLASS/META */
-static int DissectorTable__gc(lua_State* L _U_) {
+static int DissectorTable__gc(lua_State* L) {
DissectorTable dt = toDissectorTable(L,1);
if (dt->created && !dt->expired) {
diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c
index 598931a4ea..7a52585952 100644
--- a/epan/wslua/wslua_field.c
+++ b/epan/wslua/wslua_field.c
@@ -432,7 +432,7 @@ WSLUA_METAMETHOD FieldInfo__lt(lua_State* L) {
}
/* Gets registered as metamethod automatically by WSLUA_REGISTER_META */
-static int FieldInfo__gc(lua_State* L _U_) {
+static int FieldInfo__gc(lua_State* L) {
FieldInfo fi = toFieldInfo(L,1);
if (!fi) return 0;
diff --git a/epan/wslua/wslua_file.c b/epan/wslua/wslua_file.c
index 89a4c3d467..f1ad898169 100644
--- a/epan/wslua/wslua_file.c
+++ b/epan/wslua/wslua_file.c
@@ -461,7 +461,7 @@ WSLUA_METAMETHOD File__tostring(lua_State* L) {
}
/* We free the struct we malloc'ed, but not the FILE_T/dumper in it of course */
-static int File__gc(lua_State* L _U_) {
+static int File__gc(lua_State* L) {
File f = toFile(L,1);
if (f)
g_free(f);
diff --git a/epan/wslua/wslua_frame_info.c b/epan/wslua/wslua_frame_info.c
index 95f77844e5..ae6acc8016 100644
--- a/epan/wslua/wslua_frame_info.c
+++ b/epan/wslua/wslua_frame_info.c
@@ -109,7 +109,7 @@ WSLUA_METHOD FrameInfo_read_data(lua_State* L) {
}
/* free the struct we created, but not the phdr/buf it points to */
-static int FrameInfo__gc(lua_State* L _U_) {
+static int FrameInfo__gc(lua_State* L) {
FrameInfo fi = toFrameInfo(L,1);
if (fi)
g_free(fi);
@@ -319,7 +319,7 @@ WSLUA_METHOD FrameInfoConst_write_data(lua_State* L) {
}
/* free the struct we created, but not the wtap_pkthdr it points to */
-static int FrameInfoConst__gc(lua_State* L _U_) {
+static int FrameInfoConst__gc(lua_State* L) {
FrameInfoConst fi = toFrameInfoConst(L,1);
if (fi)
g_free(fi);
diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c
index 05131146b5..a8b73f4349 100644
--- a/epan/wslua/wslua_proto.c
+++ b/epan/wslua/wslua_proto.c
@@ -497,7 +497,7 @@ static int Proto_set_experts(lua_State* L) {
}
/* Gets registered as metamethod automatically by WSLUA_REGISTER_CLASS/META */
-static int Proto__gc(lua_State* L _U_) {
+static int Proto__gc(lua_State* L) {
/* Proto is registered twice, once in protocols_table_ref and once returned from Proto_new.
* It will not be freed unless deregistered.
*/
@@ -758,7 +758,7 @@ int Proto_commit(lua_State* L) {
static guint
wslua_dissect_tcp_get_pdu_len(packet_info *pinfo, tvbuff_t *tvb,
- int offset, void *data _U_)
+ int offset, void *data)
{
func_saver_t* fs = (func_saver_t*)data;
lua_State* L = fs->state;
diff --git a/mergecap.c b/mergecap.c
index e0e4048ccc..f6fad775e3 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -195,7 +195,12 @@ get_mergecap_compiled_info(GString *str)
}
static void
-get_mergecap_runtime_info(GString *str _U_)
+get_mergecap_runtime_info(
+#if defined(HAVE_LIBZ) && !defined(_WIN32)
+ GString *str)
+#else
+ GString *str _U_)
+#endif
{
/* zlib */
#if defined(HAVE_LIBZ) && !defined(_WIN32)
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c
index e419f4c9be..6e8770bc72 100644
--- a/ui/tap-sequence-analysis.c
+++ b/ui/tap-sequence-analysis.c
@@ -184,7 +184,7 @@ seq_analysis_frame_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U
/* whenever a TCP packet is seen by the tap listener */
/* Add a new tcp frame into the graph */
static gboolean
-seq_analysis_tcp_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *tcp_info)
+seq_analysis_tcp_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *tcp_info)
{
seq_analysis_info_t *sainfo = (seq_analysis_info_t *) ptr;
const struct tcpheader *tcph = (const struct tcpheader *)tcp_info;
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 568d74d573..55f54a542f 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -362,7 +362,7 @@ add_to_graph(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *
/****************************************************************************/
/* Append str to frame_label and comment in a graph item */
/* return 0 if the frame_num is not in the graph list */
-static int append_to_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_num, const gchar *new_frame_label, const gchar *new_comment)
+static int append_to_frame_graph(voip_calls_tapinfo_t *tapinfo, guint32 frame_num, const gchar *new_frame_label, const gchar *new_comment)
{
seq_analysis_item_t *gai=NULL;
gchar *frame_label = NULL;
@@ -391,7 +391,7 @@ static int append_to_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 fram
/****************************************************************************/
/* Change the frame_label and comment in a graph item if not NULL*/
/* return 0 if the frame_num is not in the graph list */
-static int change_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_num, const gchar *new_frame_label, const gchar *new_comment)
+static int change_frame_graph(voip_calls_tapinfo_t *tapinfo, guint32 frame_num, const gchar *new_frame_label, const gchar *new_comment)
{
seq_analysis_item_t *gai=NULL;
gchar *frame_label = NULL;
@@ -419,7 +419,7 @@ static int change_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_n
/****************************************************************************/
/* Change all the graph items with call_num to new_call_num */
-static guint change_call_num_graph(voip_calls_tapinfo_t *tapinfo _U_, guint16 call_num, guint16 new_call_num)
+static guint change_call_num_graph(voip_calls_tapinfo_t *tapinfo, guint16 call_num, guint16 new_call_num)
{
seq_analysis_item_t *gai;
GList *list;
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-17 11:35:05 +0000