aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-03-04 21:22:34 +0100
committerAnders Broman <a.broman58@gmail.com>2016-03-06 14:34:33 +0000
commit327f7328326d86ec6dc0cb5174d16e8c5ca42763 (patch)
treeb41f3f4a958e9a10301f72e25e8b636451f3b70a
parentaea4b91b05f62992d963b0af0e961b37de3c739d (diff)
MAPI (dcerpc): fix no previous prototype for 'mapi_dissect_struct_request' / 'mapi_dissect_struct_EcDoRpc_MAPI_REQ' [-Wmissing-prototypes]
Change-Id: If5ff7835f931213f1b846776a3ea9dfa6a1952b1 Reviewed-on: https://code.wireshark.org/review/14352 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-dcerpc-mapi.c6
-rw-r--r--epan/dissectors/pidl/mapi/request.cnf.c10
2 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c
index e6d26090b3..629c663652 100644
--- a/epan/dissectors/packet-dcerpc-mapi.c
+++ b/epan/dissectors/packet-dcerpc-mapi.c
@@ -3988,7 +3988,7 @@ static int mapi_dissect_element_request_handles_cnf(tvbuff_t *tvb _U_, int offse
}
return offset;
}
-int
+static int
mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
{
proto_item *item = NULL;
@@ -4086,7 +4086,8 @@ static int mapi_dissect_element_EcDoRpc_request__(tvbuff_t *tvb _U_, int offset
}
return offset;
}
-int
+/*
+static int
mapi_dissect_struct_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
{
proto_item *item = NULL;
@@ -4098,6 +4099,7 @@ mapi_dissect_struct_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
offset = mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvb, offset, pinfo, tree, di, drep, hf_mapi_mapi_request_mapi_req, 0);
return offset;
}
+*/
/*************************/
/* EcDoRpc Function 0x2 */
static int
diff --git a/epan/dissectors/pidl/mapi/request.cnf.c b/epan/dissectors/pidl/mapi/request.cnf.c
index 0b063a7cfd..5baca16f26 100644
--- a/epan/dissectors/pidl/mapi/request.cnf.c
+++ b/epan/dissectors/pidl/mapi/request.cnf.c
@@ -7,7 +7,7 @@ MANUAL mapi_dissect_element_EcDoRpc_request__
#
NOEMIT request
ETT_FIELD ett_mapi_mapi_request
-MANUAL mapi_dissect_struct_request
+#MANUAL mapi_dissect_struct_request
HF_FIELD hf_mapi_mapi_request_mapi_req "Mapi Req" "mapi.mapi_request.mapi_req" FT_NONE BASE_NONE NULL 0 "" HFILL
#
@@ -52,7 +52,7 @@ HF_FIELD hf_mapi_EcDoRpc_mailbox "Mailbox" "mapi.EcDoRpc.mailbox" FT_STRING BASE
CODE START
-int
+static int
mapi_dissect_struct_EcDoRpc_MAPI_REQ(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
{
proto_item *item = NULL;
@@ -181,8 +181,8 @@ static int mapi_dissect_element_EcDoRpc_request__(tvbuff_t *tvb _U_, int offset
return offset;
}
-
-int
+/*
+static int
mapi_dissect_struct_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_, dcerpc_info* di _U_, guint8 *drep _U_, int hf_index _U_, guint32 param _U_)
{
proto_item *item = NULL;
@@ -197,7 +197,7 @@ mapi_dissect_struct_request(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinf
return offset;
}
-
+*/
/*************************/
/* EcDoRpc Function 0x2 */