The attached patch gets rid of almost all remaining unused warnings in
the packet-dcerpc-XXX files by declaring the parameters as unused. Reason
for not removing them: Many are used as arguments to other functions at
least once and the remaining ones are prs_XXX functions, but some prs_XXX
functions are used as parameters too.
If this patch is applied and Guy's patch to the plugin-generator for idl
dissectors, the warning count should be sufficiently low to turn on
unused warnings for everyone.
Ciao
J�rg
--
Joerg Mayer <[EMAIL PROTECTED]>
I found out that "pro" means "instead of" (as in proconsul). Now I know
what proactive means.
Changelog: <[EMAIL PROTECTED]>
- packet-dcerpc-nt.c packet-dcerpc-samr.c packet-dcerpc-spoolss.c:
Mark all parameters as unused, when the function is used as
an argument to other functions or has twin functions that are
(prs_-family).
- packet-dcerpc-spoolss.c:
Declare functions defer_ptr and prs_referents static.
Index: ethereal/packet-dcerpc-nt.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-nt.c,v
retrieving revision 1.29
diff -u -r1.29 packet-dcerpc-nt.c
--- packet-dcerpc-nt.c 2002/04/30 11:03:08 1.29
+++ packet-dcerpc-nt.c 2002/05/04 02:20:24
@@ -51,7 +51,7 @@
/* Parse a 8-bit integer */
-int prs_uint8(tvbuff_t *tvb, int offset, packet_info *pinfo,
+int prs_uint8(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, guint8 *data, char *name)
{
guint8 i;
@@ -71,7 +71,7 @@
return offset;
}
-int prs_uint8s(tvbuff_t *tvb, int offset, packet_info *pinfo,
+int prs_uint8s(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, int count, int *data_offset, char *name)
{
/* No alignment required */
@@ -89,7 +89,7 @@
/* Parse a 16-bit integer */
-int prs_uint16(tvbuff_t *tvb, int offset, packet_info *pinfo,
+int prs_uint16(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, guint16 *data, char *name)
{
guint16 i;
@@ -110,7 +110,7 @@
/* Parse a number of uint16's */
-int prs_uint16s(tvbuff_t *tvb, int offset, packet_info *pinfo,
+int prs_uint16s(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, int count, int *data_offset, char *name)
{
offset = prs_align(offset, 2);
@@ -128,7 +128,7 @@
/* Parse a 32-bit integer */
-int prs_uint32(tvbuff_t *tvb, int offset, packet_info *pinfo,
+int prs_uint32(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, guint32 *data, char *name)
{
guint32 i;
@@ -150,7 +150,7 @@
/* Parse a number of 32-bit integers */
-int prs_uint32s(tvbuff_t *tvb, int offset, packet_info *pinfo,
+int prs_uint32s(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, int count, int *data_offset, char *name)
{
offset = prs_align(offset, 4);
@@ -253,7 +253,7 @@
/* Pop a pointer of a given name. Return it's value. */
-guint32 prs_pop_ptr(GList **ptr_list, char *name)
+guint32 prs_pop_ptr(GList **ptr_list, char *name _U_)
{
GList *elt;
struct ptr *p;
@@ -322,7 +322,7 @@
/* Parse a UNISTR2 structure */
int prs_UNISTR2(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, int flags, char **data, char *name)
+ proto_tree *tree, int flags, char **data, char *name _U_)
{
guint32 len = 0, unknown = 0, max_len = 0;
@@ -349,7 +349,7 @@
/* Parse a policy handle. */
-int prs_policy_hnd(tvbuff_t *tvb, int offset, packet_info *pinfo,
+int prs_policy_hnd(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, const guint8 **data)
{
const guint8 *data8;
@@ -631,7 +631,7 @@
int
dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep, int hf_index)
+ char *drep _U_, int hf_index)
{
dcerpc_info *di;
Index: ethereal/packet-dcerpc-samr.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-samr.c,v
retrieving revision 1.38
diff -u -r1.38 packet-dcerpc-samr.c
--- packet-dcerpc-samr.c 2002/04/30 11:03:07 1.38
+++ packet-dcerpc-samr.c 2002/05/04 02:20:24
@@ -1312,8 +1312,8 @@
static int
samr_dissect_CRYPT_PASSWORD(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree,
- char *drep)
+ packet_info *pinfo _U_, proto_tree *tree,
+ char *drep _U_)
{
proto_tree_add_item(tree, hf_samr_crypt_password, tvb, offset, 516,
FALSE);
@@ -1323,8 +1323,8 @@
static int
samr_dissect_CRYPT_HASH(tvbuff_t *tvb, int offset,
- packet_info *pinfo, proto_tree *tree,
- char *drep)
+ packet_info *pinfo _U_, proto_tree *tree,
+ char *drep _U_)
{
proto_tree_add_item(tree, hf_samr_crypt_hash, tvb, offset, 16,
FALSE);
Index: ethereal/packet-dcerpc-spoolss.c
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-spoolss.c,v
retrieving revision 1.25
diff -u -r1.25 packet-dcerpc-spoolss.c
--- packet-dcerpc-spoolss.c 2002/05/01 21:22:06 1.25
+++ packet-dcerpc-spoolss.c 2002/05/04 02:20:25
@@ -72,7 +72,7 @@
void **ptr_data;
};
-void defer_ptr(GList **list, prs_fn *fn, proto_tree *tree)
+static void defer_ptr(GList **list, prs_fn *fn, proto_tree *tree)
{
struct deferred_ptr *dr;
@@ -123,8 +123,8 @@
If there are any additional pointers in these structures they are pushed
onto parent_dp_list. */
-int prs_referents(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, GList **dp_list, GList **list,
+static int prs_referents(tvbuff_t *tvb, int offset, packet_info *pinfo,
+ proto_tree *tree _U_, GList **dp_list, GList **list,
void ***ptr_data)
{
struct deferred_ptr_state s;
@@ -239,7 +239,7 @@
static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -270,7 +270,7 @@
static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -351,7 +351,7 @@
static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -386,7 +386,7 @@
static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -422,7 +422,7 @@
static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -477,7 +477,7 @@
static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -513,7 +513,7 @@
static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -559,7 +559,7 @@
static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -583,7 +583,7 @@
static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -635,7 +635,7 @@
static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -655,7 +655,7 @@
/* Yet another way to represent a unicode string - sheesh. */
-static int prs_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo,
+static int prs_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
proto_tree *tree, void **data, char *name)
{
gint len = 0, remaining;
@@ -1147,7 +1147,7 @@
static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1193,7 +1193,7 @@
static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1364,7 +1364,7 @@
static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1417,7 +1417,7 @@
static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1441,7 +1441,7 @@
static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1474,7 +1474,7 @@
static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1583,7 +1583,7 @@
*/
static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1618,7 +1618,7 @@
}
static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1774,7 +1774,7 @@
*/
static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1808,7 +1808,7 @@
}
static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1884,7 +1884,7 @@
*/
static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1919,7 +1919,7 @@
}
static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -1984,7 +1984,7 @@
static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2007,7 +2007,7 @@
static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2080,7 +2080,7 @@
}
#endif
static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2129,7 +2129,7 @@
static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2158,7 +2158,7 @@
static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2214,7 +2214,7 @@
*/
static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2250,7 +2250,7 @@
}
static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2299,7 +2299,7 @@
#endif
static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
- char *drep)
+ char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2403,7 +2403,7 @@
*/
static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2438,7 +2438,7 @@
}
static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2461,7 +2461,7 @@
*/
static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2493,7 +2493,7 @@
}
static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2516,7 +2516,7 @@
*/
static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2557,7 +2557,7 @@
}
static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2580,7 +2580,7 @@
*/
static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2625,7 +2625,7 @@
}
static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2684,7 +2684,7 @@
INFO column. */
static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2747,7 +2747,7 @@
*/
static int SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
@@ -2786,7 +2786,7 @@
}
static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, char *drep)
+ proto_tree *tree, char *drep _U_)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
