aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/opcua
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2011-03-23 08:03:02 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2011-03-23 08:03:02 +0000
commitcb56e8455673ee820c7562cd327a827ee6673d15 (patch)
treeec067835633fe2e18f4774d775f0dd048302c0f6 /plugins/opcua
parent888880eb25ba8dc80dc02c6ec61de73abccbfe91 (diff)
Removed unused parameter to parseServiceNodeId.
Coverity 596. svn path=/trunk/; revision=36283
Diffstat (limited to 'plugins/opcua')
-rw-r--r--plugins/opcua/opcua_application_layer.c4
-rw-r--r--plugins/opcua/opcua_application_layer.h2
-rw-r--r--plugins/opcua/opcua_transport_layer.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/plugins/opcua/opcua_application_layer.c b/plugins/opcua/opcua_application_layer.c
index 1d701274bb..5d08b633d0 100644
--- a/plugins/opcua/opcua_application_layer.c
+++ b/plugins/opcua/opcua_application_layer.c
@@ -72,14 +72,12 @@ void registerApplicationLayerTypes(int proto)
/** Parses an OpcUa Service NodeId and returns the service type.
* In this cases the NodeId is always from type numeric and NSId = 0.
*/
-int parseServiceNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldName)
+int parseServiceNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
{
gint iOffset = *pOffset;
guint8 EncodingMask;
guint32 Numeric = 0;
- szFieldName = 0; /* avoid warning */
-
EncodingMask = tvb_get_guint8(tvb, iOffset);
proto_tree_add_item(tree, hf_opcua_nodeid_encodingmask, tvb, iOffset, 1, TRUE);
iOffset++;
diff --git a/plugins/opcua/opcua_application_layer.h b/plugins/opcua/opcua_application_layer.h
index 13a52e07b1..066a353f97 100644
--- a/plugins/opcua/opcua_application_layer.h
+++ b/plugins/opcua/opcua_application_layer.h
@@ -24,4 +24,4 @@
void registerApplicationLayerTypes(int proto);
/* Ua type parsers */
-int parseServiceNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldName);
+int parseServiceNodeId(proto_tree *tree, tvbuff_t *tvb, gint *pOffset);
diff --git a/plugins/opcua/opcua_transport_layer.c b/plugins/opcua/opcua_transport_layer.c
index 426f6835fc..2340db6e28 100644
--- a/plugins/opcua/opcua_transport_layer.c
+++ b/plugins/opcua/opcua_transport_layer.c
@@ -188,7 +188,7 @@ int parseMessage(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
/* add nodeid subtree */
ti = proto_tree_add_text(encobj_tree, tvb, 0, -1, "TypeId : ExpandedNodeId");
nodeid_tree = proto_item_add_subtree(ti, ett_opcua_nodeid);
- ServiceId = parseServiceNodeId(nodeid_tree, tvb, pOffset, "NodeId");
+ ServiceId = parseServiceNodeId(nodeid_tree, tvb, pOffset);
dispatchService(encobj_tree, tvb, pOffset, ServiceId);
return ServiceId;
@@ -218,7 +218,7 @@ int parseOpenSecureChannel(proto_tree *tree, tvbuff_t *tvb, gint *pOffset)
/* add nodeid subtree */
ti = proto_tree_add_text(encobj_tree, tvb, 0, -1, "TypeId : ExpandedNodeId");
nodeid_tree = proto_item_add_subtree(ti, ett_opcua_nodeid);
- ServiceId = parseServiceNodeId(nodeid_tree, tvb, pOffset, "NodeId");
+ ServiceId = parseServiceNodeId(nodeid_tree, tvb, pOffset);
dispatchService(encobj_tree, tvb, pOffset, ServiceId);
return -1;