Try to get rid of unused code warnings.

svn path=/trunk/; revision=26455
This commit is contained in:
Anders Broman 2008-10-14 19:07:26 +00:00
parent f9172ec5aa
commit 57660e3fb6
5 changed files with 27 additions and 138 deletions

View File

@ -90,8 +90,10 @@ static dissector_table_t s1ap_proc_sout_dissector_table;
static dissector_table_t s1ap_proc_uout_dissector_table;
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
/* Currently not used
static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
*/
static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
@ -103,7 +105,7 @@ static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto
{
return (dissector_try_port(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
}
/* Currently not used
static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
return (dissector_try_port(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
@ -113,6 +115,7 @@ static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pi
{
return (dissector_try_port(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
}
*/
static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{

View File

@ -32,6 +32,7 @@ PrivateIE-ID
SAEB-IE-ContainerPairList
UEPagingID
IMSI
Presence
#.END

View File

@ -11,6 +11,9 @@ ALIGNED
#.OMIT_ASSIGNMENT
# Get rid of unused code warnings
PrivateMessage
PrivateIE-Container
PrivateIE-Field
PrivateIE-ID
#.END
#.PDU
@ -25,7 +28,7 @@ ProtocolIE-ID
#.TYPE_RENAME
ProtocolIE-Field/value ProtocolIE_Field_value
PrivateIE-Field/value PrivateIE_Field_value
#PrivateIE-Field/value PrivateIE_Field_value
InitiatingMessage/value InitiatingMessage_value
SuccessfulOutcome/value SuccessfulOutcome_value
UnsuccessfulOutcome/value UnsuccessfulOutcome_value
@ -33,12 +36,12 @@ UnsuccessfulOutcome/value UnsuccessfulOutcome_value
#.FIELD_RENAME
ProtocolExtensionField/id extension_id
PrivateIE-Field/id private_id
#PrivateIE-Field/id private_id
InitiatingMessage/value initiatingMessage_value
ProtocolIE-Field/value protocolIE_Field_value
SuccessfulOutcome/value successfulOutcome_value
PrivateIE-Field/value privateIE_Field_value
#PrivateIE-Field/value privateIE_Field_value
#.OMIT_ASSIGNMENT
Presence

View File

@ -699,8 +699,10 @@ static dissector_table_t s1ap_proc_sout_dissector_table;
static dissector_table_t s1ap_proc_uout_dissector_table;
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
/* Currently not used
static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
*/
static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_InitiatingMessageValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_SuccessfulOutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
@ -773,7 +775,7 @@ dissect_s1ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, &ProcedureCode, FALSE);
#line 77 "s1ap.cnf"
#line 78 "s1ap.cnf"
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
val_to_str(ProcedureCode, s1ap_ProcedureCode_vals,
@ -900,7 +902,7 @@ dissect_s1ap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 65535U, &ProtocolIE_ID, FALSE);
#line 60 "s1ap.cnf"
#line 61 "s1ap.cnf"
if (tree) {
proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(s1ap_ProtocolIE_ID_vals), "unknown (%d)"));
}
@ -980,7 +982,7 @@ static const per_sequence_t ProtocolIE_ContainerList_sequence_of[1] = {
static int
dissect_s1ap_ProtocolIE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 99 "s1ap.cnf"
#line 100 "s1ap.cnf"
static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = {
{ "lowerBound", ASN1_PAR_INTEGER },
{ "upperBound", ASN1_PAR_INTEGER },
@ -1135,7 +1137,7 @@ dissect_s1ap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
static int
dissect_s1ap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 161 "s1ap.cnf"
#line 162 "s1ap.cnf"
tvbuff_t *parameter_tvb=NULL;
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@ -1667,7 +1669,7 @@ dissect_s1ap_ENB_UE_S1AP_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
static int
dissect_s1ap_ENBname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 172 "s1ap.cnf"
#line 173 "s1ap.cnf"
tvbuff_t *parameter_tvb=NULL;
int length;
int p_offset;
@ -1970,16 +1972,6 @@ dissect_s1ap_HandoverType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
}
static int
dissect_s1ap_IMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
3, 8, FALSE, NULL);
return offset;
}
static const value_string s1ap_InterfaceType_vals[] = {
{ 0, "s1" },
{ 1, "x2" },
@ -2718,7 +2710,7 @@ dissect_s1ap_UERadioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
static int
dissect_s1ap_SAEB_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 126 "s1ap.cnf"
#line 127 "s1ap.cnf"
asn1_stack_frame_push(actx, "ProtocolIE-ContainerList");
asn1_param_push_integer(actx, 1);
asn1_param_push_integer(actx, maxNrOfSAEBs);
@ -5432,13 +5424,13 @@ static int dissect_S1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
/*--- End of included file: packet-s1ap-fn.c ---*/
#line 101 "packet-s1ap-template.c"
#line 103 "packet-s1ap-template.c"
static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
return (dissector_try_port(s1ap_ies_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
}
/* Currently not used
static int dissect_ProtocolIEFieldPairFirstValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
return (dissector_try_port(s1ap_ies_p1_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
@ -5448,6 +5440,7 @@ static int dissect_ProtocolIEFieldPairSecondValue(tvbuff_t *tvb, packet_info *pi
{
return (dissector_try_port(s1ap_ies_p2_dissector_table, ProtocolIE_ID, tvb, pinfo, tree)) ? tvb_length(tvb) : 0;
}
*/
static int dissect_ProtocolExtensionFieldExtensionValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
@ -5661,7 +5654,7 @@ proto_reg_handoff_s1ap(void)
/*--- End of included file: packet-s1ap-dis-tab.c ---*/
#line 172 "packet-s1ap-template.c"
#line 175 "packet-s1ap-template.c"
}
/*--- proto_register_s1ap -------------------------------------------*/
@ -6792,7 +6785,7 @@ void proto_register_s1ap(void) {
"s1ap.UnsuccessfulOutcome_value", HFILL }},
/*--- End of included file: packet-s1ap-hfarr.c ---*/
#line 182 "packet-s1ap-template.c"
#line 185 "packet-s1ap-template.c"
};
/* List of subtrees */
@ -6955,7 +6948,7 @@ void proto_register_s1ap(void) {
&ett_s1ap_UnsuccessfulOutcome,
/*--- End of included file: packet-s1ap-ettarr.c ---*/
#line 188 "packet-s1ap-template.c"
#line 191 "packet-s1ap-template.c"
};
module_t *s1ap_module;

View File

@ -198,8 +198,6 @@ static int hf_x2ap_ResourceStatusUpdate_PDU = -1; /* ResourceStatusUpdate */
static int hf_x2ap_CellMeasurementResult_List_PDU = -1; /* CellMeasurementResult_List */
static int hf_x2ap_CellMeasurementResult_Item_PDU = -1; /* CellMeasurementResult_Item */
static int hf_x2ap_X2AP_PDU_PDU = -1; /* X2AP_PDU */
static int hf_x2ap_local = -1; /* INTEGER_0_maxPrivateIEs */
static int hf_x2ap_global = -1; /* OBJECT_IDENTIFIER */
static int hf_x2ap_ProtocolIE_Container_item = -1; /* ProtocolIE_Field */
static int hf_x2ap_id = -1; /* ProtocolIE_ID */
static int hf_x2ap_criticality = -1; /* Criticality */
@ -207,9 +205,6 @@ static int hf_x2ap_protocolIE_Field_value = -1; /* ProtocolIE_Field_value */
static int hf_x2ap_ProtocolExtensionContainer_item = -1; /* ProtocolExtensionField */
static int hf_x2ap_extension_id = -1; /* ProtocolIE_ID */
static int hf_x2ap_extensionValue = -1; /* T_extensionValue */
static int hf_x2ap_PrivateIE_Container_item = -1; /* PrivateIE_Field */
static int hf_x2ap_private_id = -1; /* PrivateIE_ID */
static int hf_x2ap_privateIE_Field_value = -1; /* PrivateIE_Field_value */
static int hf_x2ap_BroadcastPLMNs_Item_item = -1; /* PLMN_Identity */
static int hf_x2ap_radioNetwork = -1; /* CauseRadioNetwork */
static int hf_x2ap_transport = -1; /* CauseTransport */
@ -337,13 +332,10 @@ static int ett_x2ap = -1;
/*--- Included file: packet-x2ap-ett.c ---*/
#line 1 "packet-x2ap-ett.c"
static gint ett_x2ap_PrivateIE_ID = -1;
static gint ett_x2ap_ProtocolIE_Container = -1;
static gint ett_x2ap_ProtocolIE_Field = -1;
static gint ett_x2ap_ProtocolExtensionContainer = -1;
static gint ett_x2ap_ProtocolExtensionField = -1;
static gint ett_x2ap_PrivateIE_Container = -1;
static gint ett_x2ap_PrivateIE_Field = -1;
static gint ett_x2ap_BroadcastPLMNs_Item = -1;
static gint ett_x2ap_Cause = -1;
static gint ett_x2ap_COUNTvalue = -1;
@ -465,47 +457,6 @@ dissect_x2ap_Criticality(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
}
static int
dissect_x2ap_INTEGER_0_maxPrivateIEs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, maxPrivateIEs, NULL, FALSE);
return offset;
}
static int
dissect_x2ap_OBJECT_IDENTIFIER(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_object_identifier(tvb, offset, actx, tree, hf_index, NULL);
return offset;
}
static const value_string x2ap_PrivateIE_ID_vals[] = {
{ 0, "local" },
{ 1, "global" },
{ 0, NULL }
};
static const per_choice_t PrivateIE_ID_choice[] = {
{ 0, &hf_x2ap_local , ASN1_NO_EXTENSIONS , dissect_x2ap_INTEGER_0_maxPrivateIEs },
{ 1, &hf_x2ap_global , ASN1_NO_EXTENSIONS , dissect_x2ap_OBJECT_IDENTIFIER },
{ 0, NULL, 0, NULL }
};
static int
dissect_x2ap_PrivateIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
ett_x2ap_PrivateIE_ID, PrivateIE_ID_choice,
NULL);
return offset;
}
static const value_string x2ap_ProcedureCode_vals[] = {
{ X2AP_ID_HANDOVERPREPARATION, "id-handoverPreparation" },
{ X2AP_ID_HANDOVERCANCEL, "id-handoverCancel" },
@ -524,13 +475,13 @@ static const value_string x2ap_ProcedureCode_vals[] = {
static int
dissect_x2ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 66 "x2ap.cnf"
#line 69 "x2ap.cnf"
ProcedureCode = 0xFFFF;
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
0U, 255U, &ProcedureCode, FALSE);
#line 59 "x2ap.cnf"
#line 62 "x2ap.cnf"
if (check_col(actx->pinfo->cinfo, COL_INFO))
col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
val_to_str(ProcedureCode, x2ap_ProcedureCode_vals,
@ -695,45 +646,6 @@ dissect_x2ap_ProtocolExtensionContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_
static int
dissect_x2ap_PrivateIE_Field_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, NULL);
return offset;
}
static const per_sequence_t PrivateIE_Field_sequence[] = {
{ &hf_x2ap_private_id , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_ID },
{ &hf_x2ap_criticality , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_Criticality },
{ &hf_x2ap_privateIE_Field_value, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Field_value },
{ NULL, 0, 0, NULL }
};
static int
dissect_x2ap_PrivateIE_Field(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
ett_x2ap_PrivateIE_Field, PrivateIE_Field_sequence);
return offset;
}
static const per_sequence_t PrivateIE_Container_sequence_of[1] = {
{ &hf_x2ap_PrivateIE_Container_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_x2ap_PrivateIE_Field },
};
static int
dissect_x2ap_PrivateIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
ett_x2ap_PrivateIE_Container, PrivateIE_Container_sequence_of,
1, maxPrivateIEs);
return offset;
}
static int
dissect_x2ap_AllocationAndRetentionPriority(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
@ -3308,14 +3220,6 @@ void proto_register_x2ap(void) {
{ "X2AP-PDU", "x2ap.X2AP_PDU",
FT_UINT32, BASE_DEC, VALS(x2ap_X2AP_PDU_vals), 0,
"x2ap.X2AP_PDU", HFILL }},
{ &hf_x2ap_local,
{ "local", "x2ap.local",
FT_UINT32, BASE_DEC, NULL, 0,
"x2ap.INTEGER_0_maxPrivateIEs", HFILL }},
{ &hf_x2ap_global,
{ "global", "x2ap.global",
FT_OID, BASE_NONE, NULL, 0,
"x2ap.OBJECT_IDENTIFIER", HFILL }},
{ &hf_x2ap_ProtocolIE_Container_item,
{ "Item", "x2ap.ProtocolIE_Container_item",
FT_NONE, BASE_NONE, NULL, 0,
@ -3344,18 +3248,6 @@ void proto_register_x2ap(void) {
{ "extensionValue", "x2ap.extensionValue",
FT_NONE, BASE_NONE, NULL, 0,
"x2ap.T_extensionValue", HFILL }},
{ &hf_x2ap_PrivateIE_Container_item,
{ "Item", "x2ap.PrivateIE_Container_item",
FT_NONE, BASE_NONE, NULL, 0,
"x2ap.PrivateIE_Field", HFILL }},
{ &hf_x2ap_private_id,
{ "id", "x2ap.id",
FT_UINT32, BASE_DEC, VALS(x2ap_PrivateIE_ID_vals), 0,
"x2ap.PrivateIE_ID", HFILL }},
{ &hf_x2ap_privateIE_Field_value,
{ "value", "x2ap.value",
FT_NONE, BASE_NONE, NULL, 0,
"x2ap.PrivateIE_Field_value", HFILL }},
{ &hf_x2ap_BroadcastPLMNs_Item_item,
{ "Item", "x2ap.BroadcastPLMNs_Item_item",
FT_BYTES, BASE_HEX, NULL, 0,
@ -3835,13 +3727,10 @@ void proto_register_x2ap(void) {
/*--- Included file: packet-x2ap-ettarr.c ---*/
#line 1 "packet-x2ap-ettarr.c"
&ett_x2ap_PrivateIE_ID,
&ett_x2ap_ProtocolIE_Container,
&ett_x2ap_ProtocolIE_Field,
&ett_x2ap_ProtocolExtensionContainer,
&ett_x2ap_ProtocolExtensionField,
&ett_x2ap_PrivateIE_Container,
&ett_x2ap_PrivateIE_Field,
&ett_x2ap_BroadcastPLMNs_Item,
&ett_x2ap_Cause,
&ett_x2ap_COUNTvalue,