Fix warnings/errors of type -Wused-but-marked-unused

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

7 files changed, 11 insertions, 11 deletions

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;