From fa7ea2ea34cd9cfae562ae28fef7b02b6862b7fd Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Sat, 12 Nov 2011 12:37:38 +0000 Subject: fix [-Wunused-but-set-variable] svn path=/trunk/; revision=39803 --- epan/dissectors/packet-h248.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'epan/dissectors/packet-h248.c') diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index dac1262baa..5974dd3731 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1222,14 +1222,12 @@ extern void h248_param_PkgdName(proto_tree* tree, tvbuff_t* tvb, packet_info* pi tvbuff_t *new_tvb = NULL; proto_tree *package_tree=NULL; guint16 name_major, name_minor; - int old_offset; const h248_package_t* pkg = NULL; guint i; int offset = 0; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - old_offset=offset; offset = dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, offset, hfid , &new_tvb); if (new_tvb) { @@ -1376,11 +1374,9 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse tvbuff_t *new_tvb = NULL; proto_tree *package_tree=NULL; guint16 name_major, name_minor; - int old_offset; const h248_package_t* pkg = NULL; guint i; - old_offset=offset; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); if (new_tvb) { @@ -1436,12 +1432,10 @@ static int dissect_h248_EventName(gboolean implicit_tag, tvbuff_t *tvb, int offs tvbuff_t *new_tvb; proto_tree *package_tree=NULL; guint16 name_major, name_minor; - int old_offset; const h248_package_t* pkg = NULL; const h248_pkg_evt_t* evt = NULL; guint i; - old_offset=offset; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); if (new_tvb) { @@ -1515,12 +1509,10 @@ static int dissect_h248_SignalName(gboolean implicit_tag , tvbuff_t *tvb, int of tvbuff_t *new_tvb; proto_tree *package_tree=NULL; guint16 name_major, name_minor; - int old_offset; const h248_package_t* pkg = NULL; const h248_pkg_sig_t* sig; guint i; - old_offset=offset; offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &new_tvb); if (new_tvb) { @@ -1595,12 +1587,11 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int guint32 len; guint16 name_major; guint16 name_minor; - int old_offset, end_offset; + int end_offset; tvbuff_t *next_tvb; const h248_package_t* pkg; const h248_pkg_param_t* prop; - old_offset=offset; offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag); offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); end_offset=offset+len; @@ -1679,13 +1670,12 @@ static int dissect_h248_SigParameterName(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_h248_SigParamValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) { tvbuff_t *next_tvb; - int old_offset, end_offset; + int end_offset; gint8 class; gboolean pc, ind; gint32 tag; guint32 len; - old_offset=offset; offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag); offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); end_offset=offset+len; @@ -1754,13 +1744,12 @@ static int dissect_h248_EventParameterName(gboolean implicit_tag _U_, tvbuff_t * static int dissect_h248_EventParamValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index _U_) { tvbuff_t *next_tvb; - int old_offset, end_offset; + int end_offset; gint8 class; gboolean pc, ind; gint32 tag; guint32 len; - old_offset=offset; offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag); offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); end_offset=offset+len; @@ -5352,7 +5341,7 @@ dissect_h248_SigParameterV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of /*--- End of included file: packet-h248-fn.c ---*/ -#line 1339 "../../asn1/h248/packet-h248-template.c" +#line 1328 "../../asn1/h248/packet-h248-template.c" static void dissect_h248_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_tpkt_encap(tvb, pinfo, tree, h248_desegment, h248_handle); @@ -6745,7 +6734,7 @@ void proto_register_h248(void) { NULL, HFILL }}, /*--- End of included file: packet-h248-hfarr.c ---*/ -#line 1479 "../../asn1/h248/packet-h248-template.c" +#line 1468 "../../asn1/h248/packet-h248-template.c" GCP_HF_ARR_ELEMS("h248",h248_arrel) @@ -6914,7 +6903,7 @@ void proto_register_h248(void) { &ett_h248_SigParameterV1, /*--- End of included file: packet-h248-ettarr.c ---*/ -#line 1497 "../../asn1/h248/packet-h248-template.c" +#line 1486 "../../asn1/h248/packet-h248-template.c" }; module_t *h248_module; -- cgit v1.2.3