diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-01-16 20:41:23 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-01-16 20:41:23 +0000 |
commit | 990b7be3db7db6efba337c07f112e3d805ddaacc (patch) | |
tree | 32e4d5672f0d3cd7b5eb84edc233af0d3446629f /asn1 | |
parent | 6d145f911b07c8404a12c2cfd9a1273f4d934ff6 (diff) |
- Removed some unused variables in asn1 dissectors
- Fixed last parameter to cry_cipher_open() in pkcs12
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24116 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ansi-tcap/packet-ansi_tcap-template.c | 2 | ||||
-rw-r--r-- | asn1/h450-ros/packet-h450-ros-template.c | 2 | ||||
-rw-r--r-- | asn1/h460/packet-h460-template.c | 2 | ||||
-rw-r--r-- | asn1/ldap/ldap.cnf | 1 | ||||
-rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 2 | ||||
-rw-r--r-- | asn1/rrc/packet-rrc-template.c | 7 | ||||
-rw-r--r-- | asn1/rtse/packet-rtse-template.c | 3 | ||||
-rw-r--r-- | asn1/x2ap/packet-x2ap-template.c | 1 |
8 files changed, 5 insertions, 15 deletions
diff --git a/asn1/ansi-tcap/packet-ansi_tcap-template.c b/asn1/ansi-tcap/packet-ansi_tcap-template.c index fc67787fad..c34938024b 100644 --- a/asn1/ansi-tcap/packet-ansi_tcap-template.c +++ b/asn1/ansi-tcap/packet-ansi_tcap-template.c @@ -75,8 +75,6 @@ static struct tcaphash_context_t * gp_tcap_context=NULL; #include "packet-ansi_tcap-ett.c" #define MAX_SSN 254 -static range_t *global_ssn_range; -static range_t *ssn_range; gboolean g_ansi_tcap_HandleSRT=FALSE; extern gboolean gtcap_PersistentSRT; diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c index 8b0f00e4d8..c492f0a735 100644 --- a/asn1/h450-ros/packet-h450-ros-template.c +++ b/asn1/h450-ros/packet-h450-ros-template.c @@ -54,8 +54,6 @@ int proto_h450_ros = -1; static dissector_handle_t data_handle = NULL; /* Gloabl variables */ -static rose_ctx_t *rose_ctx_tmp; - static guint32 problem_val; static gchar problem_str[64]; static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c index 597c191a04..48ed47271b 100644 --- a/asn1/h460/packet-h460-template.c +++ b/asn1/h460/packet-h460-template.c @@ -218,7 +218,7 @@ static h460_feature_t *find_ftr(const gchar *key) { /*--- dissect_h460_name -------------------------------------------*/ static int -dissect_h460_name(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { +dissect_h460_name(tvbuff_t *tvb _U_, packet_info *pinfo, proto_tree *tree) { int offset = 0; asn1_ctx_t *actx; h460_feature_t *ftr; diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index 986603ab61..58cc1b0a9b 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -42,7 +42,6 @@ ReplControlValue B "1.2.840.113556.1.4.841" "replControlValue" tvbuff_t *parameter_tvb; const gchar *name; - proto_item *item = NULL; #.FN_PARS LDAPOID VAL_PTR = ¶meter_tvb diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 24d4e617f6..41bf125869 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -288,7 +288,7 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t } /* now try an internal function */ - err = gcry_cipher_open(&cipher, algo, mode, NULL); + err = gcry_cipher_open(&cipher, algo, mode, 0); if (gcry_err_code (err)) return FALSE; diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index f824a4986a..2f36878228 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -81,7 +81,6 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ proto_item *rrc_item = NULL; proto_tree *rrc_tree = NULL; - int offset = 0; top_tree = tree; @@ -89,9 +88,9 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC"); - /* create the rrc protocol tree */ - rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, FALSE); - rrc_tree = proto_item_add_subtree(rrc_item, ett_rrc); + /* create the rrc protocol tree */ + rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, FALSE); + rrc_tree = proto_item_add_subtree(rrc_item, ett_rrc); } /*--- proto_register_rrc -------------------------------------------*/ diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index e0242f9b18..4ab3ea1e00 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -53,9 +53,6 @@ int proto_rtse = -1; static struct SESSION_DATA_STRUCTURE* session = NULL; static gboolean open_request=FALSE; -/* indirect_reference, used to pick up the signalling so we know what - kind of data is transferred in SES_DATA_TRANSFER_PDUs */ -static guint32 indir_ref=0; static guint32 app_proto=0; static proto_tree *top_tree=NULL; diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index ae9715c969..2aa236fc02 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -71,7 +71,6 @@ static int ett_x2ap = -1; /* Global variables */ static guint32 ProcedureCode; static guint32 ProtocolIE_ID; -static guint32 ddMode; static const gchar *ProcedureID; /* Dissector tables */ |