Revert "PIDL: Remove _U_ and remove unused-parameter via pragma"

This reverts commit db4f7fcdeac833f24807994b372d1e42479754bf.

That doesn't work with the compiler being used on the OS X buildbot; that compiler is probably some version of llvm-gcc, which might be based on an older version of GCC without support for that pragma, or might not support it properly courtesy of the GCC front end and the LLVM back end not quite fitting together

Change-Id: I6cd5f1322b4872ef0c4eb5695f021cec00ba85b7
Reviewed-on: https://code.wireshark.org/review/15246
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 36 insertions, 38 deletions

diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c
index 56fb3d9930..ff9c3cb0f8 100644
--- a/epan/dissectors/packet-dcerpc-wzcsvc.c
+++ b/epan/dissectors/packet-dcerpc-wzcsvc.c
@@ -14,8 +14,6 @@
 #include <string.h>
 #include <epan/packet.h>
 
-DIAG_OFF(unused-parameter)
-
 #include "packet-dcerpc.h"
 #include "packet-dcerpc-nt.h"
 #include "packet-windows-common.h"
@@ -46,14 +44,14 @@ static guint16 ver_dcerpc_wzcsvc = 1;
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EnumInterfaces_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EnumInterfaces_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EnumInterfaces";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EnumInterfaces_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EnumInterfaces_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EnumInterfaces";
 	return offset;
@@ -64,14 +62,14 @@ wzcsvc_dissect_EnumInterfaces_request(tvbuff_t *tvb, int offset, packet_info *pi
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_QueryInterface_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_QueryInterface_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="QueryInterface";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_QueryInterface_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_QueryInterface_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="QueryInterface";
 	return offset;
@@ -82,14 +80,14 @@ wzcsvc_dissect_QueryInterface_request(tvbuff_t *tvb, int offset, packet_info *pi
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_SetInterface_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_SetInterface_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="SetInterface";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_SetInterface_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_SetInterface_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="SetInterface";
 	return offset;
@@ -100,14 +98,14 @@ wzcsvc_dissect_SetInterface_request(tvbuff_t *tvb, int offset, packet_info *pinf
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_RefreshInterface_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_RefreshInterface_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="RefreshInterface";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_RefreshInterface_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_RefreshInterface_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="RefreshInterface";
 	return offset;
@@ -118,14 +116,14 @@ wzcsvc_dissect_RefreshInterface_request(tvbuff_t *tvb, int offset, packet_info *
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_QueryContext_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_QueryContext_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="QueryContext";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_QueryContext_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_QueryContext_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="QueryContext";
 	return offset;
@@ -136,14 +134,14 @@ wzcsvc_dissect_QueryContext_request(tvbuff_t *tvb, int offset, packet_info *pinf
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_SetContext_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_SetContext_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="SetContext";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_SetContext_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_SetContext_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="SetContext";
 	return offset;
@@ -154,14 +152,14 @@ wzcsvc_dissect_SetContext_request(tvbuff_t *tvb, int offset, packet_info *pinfo,
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EapolUIResponse_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolUIResponse_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolUIResponse";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EapolUIResponse_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolUIResponse_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolUIResponse";
 	return offset;
@@ -172,14 +170,14 @@ wzcsvc_dissect_EapolUIResponse_request(tvbuff_t *tvb, int offset, packet_info *p
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EapolGetCustomAuthData_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolGetCustomAuthData_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolGetCustomAuthData";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EapolGetCustomAuthData_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolGetCustomAuthData_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolGetCustomAuthData";
 	return offset;
@@ -190,14 +188,14 @@ wzcsvc_dissect_EapolGetCustomAuthData_request(tvbuff_t *tvb, int offset, packet_
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EapolSetCustomAuthData_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolSetCustomAuthData_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolSetCustomAuthData";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EapolSetCustomAuthData_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolSetCustomAuthData_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolSetCustomAuthData";
 	return offset;
@@ -208,14 +206,14 @@ wzcsvc_dissect_EapolSetCustomAuthData_request(tvbuff_t *tvb, int offset, packet_
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EapolGetInterfaceParams_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolGetInterfaceParams_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolGetInterfaceParams";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EapolGetInterfaceParams_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolGetInterfaceParams_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolGetInterfaceParams";
 	return offset;
@@ -226,14 +224,14 @@ wzcsvc_dissect_EapolGetInterfaceParams_request(tvbuff_t *tvb, int offset, packet
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EapolSetInterfaceParams_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolSetInterfaceParams_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolSetInterfaceParams";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EapolSetInterfaceParams_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolSetInterfaceParams_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolSetInterfaceParams";
 	return offset;
@@ -244,14 +242,14 @@ wzcsvc_dissect_EapolSetInterfaceParams_request(tvbuff_t *tvb, int offset, packet
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EapolReAuthenticateInterface_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolReAuthenticateInterface_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolReAuthenticateInterface";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EapolReAuthenticateInterface_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolReAuthenticateInterface_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolReAuthenticateInterface";
 	return offset;
@@ -262,14 +260,14 @@ wzcsvc_dissect_EapolReAuthenticateInterface_request(tvbuff_t *tvb, int offset, p
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EapolQueryInterfaceState_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolQueryInterfaceState_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolQueryInterfaceState";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EapolQueryInterfaceState_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EapolQueryInterfaceState_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EapolQueryInterfaceState";
 	return offset;
@@ -280,14 +278,14 @@ wzcsvc_dissect_EapolQueryInterfaceState_request(tvbuff_t *tvb, int offset, packe
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_OpenWZCDbLogSession_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_OpenWZCDbLogSession_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="OpenWZCDbLogSession";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_OpenWZCDbLogSession_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_OpenWZCDbLogSession_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="OpenWZCDbLogSession";
 	return offset;
@@ -298,14 +296,14 @@ wzcsvc_dissect_OpenWZCDbLogSession_request(tvbuff_t *tvb, int offset, packet_inf
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_CloseWZCDbLogSession_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_CloseWZCDbLogSession_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="CloseWZCDbLogSession";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_CloseWZCDbLogSession_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_CloseWZCDbLogSession_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="CloseWZCDbLogSession";
 	return offset;
@@ -316,14 +314,14 @@ wzcsvc_dissect_CloseWZCDbLogSession_request(tvbuff_t *tvb, int offset, packet_in
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_EnumWZCDbLogRecords_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EnumWZCDbLogRecords_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EnumWZCDbLogRecords";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_EnumWZCDbLogRecords_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_EnumWZCDbLogRecords_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="EnumWZCDbLogRecords";
 	return offset;
@@ -334,14 +332,14 @@ wzcsvc_dissect_EnumWZCDbLogRecords_request(tvbuff_t *tvb, int offset, packet_inf
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_FlushWZCdbLog_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_FlushWZCdbLog_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="FlushWZCdbLog";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_FlushWZCdbLog_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_FlushWZCdbLog_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="FlushWZCdbLog";
 	return offset;
@@ -352,14 +350,14 @@ wzcsvc_dissect_FlushWZCdbLog_request(tvbuff_t *tvb, int offset, packet_info *pin
 /* IDL: ); */
 
 static int
-wzcsvc_dissect_GetWZCDbLogRecord_response(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_GetWZCDbLogRecord_response(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="GetWZCDbLogRecord";
 	return offset;
 }
 
 static int
-wzcsvc_dissect_GetWZCDbLogRecord_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep)
+wzcsvc_dissect_GetWZCDbLogRecord_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, dcerpc_info* di _U_, guint8 *drep _U_)
 {
 	di->dcerpc_procedure_name="GetWZCDbLogRecord";
 	return offset;