From 9c26c32645fe64f0332e60deab1fccabbb836c2a Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Fri, 14 Jun 2013 13:20:41 +0000 Subject: Add parentheses around assignment used as truth value. svn path=/trunk/; revision=49929 --- asn1/p7/p7.cnf | 52 +++++++++--------- epan/dissectors/packet-p7.c | 126 ++++++++++++++++++++++---------------------- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf index 0fbece2c44..c4f8b00d62 100644 --- a/asn1/p7/p7.cnf +++ b/asn1/p7/p7.cnf @@ -41,11 +41,11 @@ SignatureStatus #.END # Ros OPERATION -#.CLASS ABSTRACT-OPERATION -&ArgumentType +#.CLASS ABSTRACT-OPERATION +&ArgumentType &argumentTypeOptional BooleanType &returnResult BooleanType -&ResultType +&ResultType &resultTypeOptional BooleanType &Errors ClassReference ERROR &Linked ClassReference OPERATION @@ -57,8 +57,8 @@ SignatureStatus #.END # ros ERROR -#.CLASS ABSTRACT-ERROR -&ParameterType +#.CLASS ABSTRACT-ERROR +&ParameterType ¶meterTypeOptional BooleanType &ErrorPriority _FixedTypeValueSetFieldSpec &errorCode TypeReference Code @@ -66,7 +66,7 @@ SignatureStatus #.CLASS MATCHING-RULE &ParentMatchingRules ClassReference MATCHING-RULE -&AssertionType +&AssertionType &uniqueMatchIndicator ClassReference ATTRIBUTE &id ObjectIdentifierType #.END @@ -177,7 +177,7 @@ const value_string p7_opr_code_string_vals[] = { /* P7 ERRORS */ static const value_string p7_err_code_string_vals[] = { #.TABLE_BODY ERROR - { %(&errorCode)s, "%(_ident)s" }, + { %(&errorCode)s, "%(_ident)s" }, #.TABLE_FTR { 0, NULL } }; @@ -187,8 +187,8 @@ static const value_string p7_err_code_string_vals[] = { #.TABLE11_HDR static const ros_opr_t p7_opr_tab[] = { #.TABLE11_BODY OPERATION - /* %(_name)s */ - { %(&operationCode)-25s, %(_argument_pdu)s, %(_result_pdu)s }, + /* %(_name)s */ + { %(&operationCode)-25s, %(_argument_pdu)s, %(_result_pdu)s }, #.TABLE11_FTR { 0, (new_dissector_t)(-1), (new_dissector_t)(-1) }, }; @@ -197,7 +197,7 @@ static const ros_opr_t p7_opr_tab[] = { #.TABLE21_HDR static const ros_err_t p7_err_tab[] = { #.TABLE21_BODY ERROR - /* %(_name)s*/ + /* %(_name)s*/ { %(&errorCode)s, %(_parameter_pdu)s }, #.TABLE21_FTR { 0, (new_dissector_t)(-1) }, @@ -300,46 +300,46 @@ ChangeCredentialsAlgorithms B "2.6.4.9.5" "id-ext-protected-change-credentials OriginatorToken B "2.6.4.9.3" "id-ext-originator-token" ProtectedChangeCredentials B "2.6.4.9.4" "id-ext-protected-change-credentials" -RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" +RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" #.FN_PARS AttributeType FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY Attribute/attribute-values/_item - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY AttributeValueAssertion/attribute-value - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY FilterItem/substrings/strings/_item/initial - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY FilterItem/substrings/strings/_item/any - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY FilterItem/substrings/strings/_item/final - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY MatchingRuleAssertion/match-value - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY Summary/present/_item/value - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY OrderedAttribute/attribute-values/_item/value - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_PARS AutoActionType FN_VARIANT = _str VAL_PTR = &object_identifier_id #.FN_BODY AutoActionRegistration/registration-parameter - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -357,23 +357,23 @@ RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" #.END #.FN_BODY AutoActionError/error-parameter - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY PAR-attribute-error/problems/_item/value - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY MSBindArgument/initiator-name char *ora = NULL; - + %(DEFAULT_BODY)s - if (ora = p1_get_last_oraddress()) { + if ((ora = p1_get_last_oraddress())) { col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (initiator=%%s)", ora); } - + #.FN_PARS SequenceNumber VAL_PTR = &seqno #.FN_BODY NumberRange @@ -386,7 +386,7 @@ RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" #.FN_FTR NumberRange/to col_append_fstr(actx->pinfo->cinfo, COL_INFO, " to %d", seqno); - + #.FN_PARS SummarizeResult/count VAL_PTR = &count #.FN_BODY SummarizeResult/count diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index f95460c25d..05e8cd5591 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -659,20 +659,20 @@ const value_string p7_opr_code_string_vals[] = { /* P7 ERRORS */ static const value_string p7_err_code_string_vals[] = { - { err_ros_bind, "ms_bind_error" }, - { err_attribute_error, "attribute_error" }, - { err_auto_action_request_error, "auto_action_request_error" }, - { err_delete_error, "delete_error" }, - { err_fetch_restriction_error, "fetch_restriction_error" }, - { err_invalid_parameters_error, "invalid_parameters_error" }, - { err_range_error, "range_error" }, - { err_sequence_number_error, "sequence_number_error" }, - { err_service_error, "service_error" }, - { err_message_group_error, "message_group_error" }, - { err_ms_extension_error, "ms_extension_error" }, - { err_register_ms_error, "register_ms_error" }, - { err_modify_error, "modify_error" }, - { err_entry_class_error, "entry_class_error" }, + { err_ros_bind, "ms_bind_error" }, + { err_attribute_error, "attribute_error" }, + { err_auto_action_request_error, "auto_action_request_error" }, + { err_delete_error, "delete_error" }, + { err_fetch_restriction_error, "fetch_restriction_error" }, + { err_invalid_parameters_error, "invalid_parameters_error" }, + { err_range_error, "range_error" }, + { err_sequence_number_error, "sequence_number_error" }, + { err_service_error, "service_error" }, + { err_message_group_error, "message_group_error" }, + { err_ms_extension_error, "ms_extension_error" }, + { err_register_ms_error, "register_ms_error" }, + { err_modify_error, "modify_error" }, + { err_entry_class_error, "entry_class_error" }, { 0, NULL } }; @@ -703,7 +703,7 @@ dissect_p7_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static int dissect_p7_AttributeItem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -761,7 +761,7 @@ dissect_p7_INTEGER_1_ub_per_auto_action(gboolean implicit_tag _U_, tvbuff_t *tvb static int dissect_p7_T_registration_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -800,7 +800,7 @@ dissect_p7_T_error_code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p7_T_error_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -943,14 +943,14 @@ dissect_p7_MessageGroupName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_p7_T_initiator_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { char *ora = NULL; - + offset = dissect_p1_ORAddressAndOrDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index); - if (ora = p1_get_last_oraddress()) { + if ((ora = p1_get_last_oraddress())) { col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (initiator=%s)", ora); } - + return offset; } @@ -1333,7 +1333,7 @@ dissect_p7_T_to_number(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset offset = dissect_p7_SequenceNumber(implicit_tag, tvb, offset, actx, tree, hf_index); col_append_fstr(actx->pinfo->cinfo, COL_INFO, " to %d", seqno); - + return offset; } @@ -1406,7 +1406,7 @@ dissect_p7_Range(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static int dissect_p7_T_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1432,7 +1432,7 @@ dissect_p7_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_p7_T_initial(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1443,7 +1443,7 @@ dissect_p7_T_initial(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_p7_T_any(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1454,7 +1454,7 @@ dissect_p7_T_any(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a static int dissect_p7_T_final(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1517,7 +1517,7 @@ dissect_p7_T_substrings(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset static int dissect_p7_T_match_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -1886,7 +1886,7 @@ dissect_p7_Span(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, as static int dissect_p7_SummaryPresentItemValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2602,7 +2602,7 @@ dissect_p7_T_entries(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U static int dissect_p7_OrderedAttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -2892,7 +2892,7 @@ dissect_p7_AttributeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_p7_T_attr_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - if(object_identifier_id) + if(object_identifier_id) call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -4088,26 +4088,26 @@ static void dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr #line 1 "../../asn1/p7/packet-p7-table11.c" static const ros_opr_t p7_opr_tab[] = { - /* ms-bind */ - { op_ros_bind , dissect_MSBindArgument_PDU, dissect_MSBindResult_PDU }, - /* summarize */ - { op_summarize , dissect_SummarizeArgument_PDU, dissect_SummarizeResult_PDU }, - /* list */ - { op_list , dissect_ListArgument_PDU, dissect_ListResult_PDU }, - /* fetch */ - { op_fetch , dissect_FetchArgument_PDU, dissect_FetchResult_PDU }, - /* delete */ - { op_delete , dissect_DeleteArgument_PDU, dissect_DeleteResult_PDU }, - /* register-MS */ - { op_register_ms , dissect_Register_MSArgument_PDU, dissect_Register_MSResult_PDU }, - /* alert */ - { op_alert , dissect_AlertArgument_PDU, dissect_AlertResult_PDU }, - /* modify */ - { op_modify , dissect_ModifyArgument_PDU, dissect_ModifyResult_PDU }, - /* ms-message-submission */ - { op_ms_message_submission , dissect_MSMessageSubmissionArgument_PDU, dissect_MSMessageSubmissionResult_PDU }, - /* ms-probe-submission */ - { op_ms_probe_submission , dissect_MSProbeSubmissionArgument_PDU, dissect_MSProbeSubmissionResult_PDU }, + /* ms-bind */ + { op_ros_bind , dissect_MSBindArgument_PDU, dissect_MSBindResult_PDU }, + /* summarize */ + { op_summarize , dissect_SummarizeArgument_PDU, dissect_SummarizeResult_PDU }, + /* list */ + { op_list , dissect_ListArgument_PDU, dissect_ListResult_PDU }, + /* fetch */ + { op_fetch , dissect_FetchArgument_PDU, dissect_FetchResult_PDU }, + /* delete */ + { op_delete , dissect_DeleteArgument_PDU, dissect_DeleteResult_PDU }, + /* register-MS */ + { op_register_ms , dissect_Register_MSArgument_PDU, dissect_Register_MSResult_PDU }, + /* alert */ + { op_alert , dissect_AlertArgument_PDU, dissect_AlertResult_PDU }, + /* modify */ + { op_modify , dissect_ModifyArgument_PDU, dissect_ModifyResult_PDU }, + /* ms-message-submission */ + { op_ms_message_submission , dissect_MSMessageSubmissionArgument_PDU, dissect_MSMessageSubmissionResult_PDU }, + /* ms-probe-submission */ + { op_ms_probe_submission , dissect_MSProbeSubmissionArgument_PDU, dissect_MSProbeSubmissionResult_PDU }, { 0, (new_dissector_t)(-1), (new_dissector_t)(-1) }, }; @@ -4119,33 +4119,33 @@ static const ros_opr_t p7_opr_tab[] = { #line 1 "../../asn1/p7/packet-p7-table21.c" static const ros_err_t p7_err_tab[] = { - /* ms-bind-error*/ + /* ms-bind-error*/ { err_ros_bind, dissect_PAR_ms_bind_error_PDU }, - /* attribute-error*/ + /* attribute-error*/ { err_attribute_error, dissect_PAR_attribute_error_PDU }, - /* auto-action-request-error*/ + /* auto-action-request-error*/ { err_auto_action_request_error, dissect_PAR_auto_action_request_error_PDU }, - /* delete-error*/ + /* delete-error*/ { err_delete_error, dissect_PAR_delete_error_PDU }, - /* fetch-restriction-error*/ + /* fetch-restriction-error*/ { err_fetch_restriction_error, dissect_PAR_fetch_restriction_error_PDU }, - /* invalid-parameters-error*/ + /* invalid-parameters-error*/ { err_invalid_parameters_error, dissect_PAR_invalid_parameters_error_PDU }, - /* range-error*/ + /* range-error*/ { err_range_error, dissect_PAR_range_error_PDU }, - /* sequence-number-error*/ + /* sequence-number-error*/ { err_sequence_number_error, dissect_PAR_sequence_number_error_PDU }, - /* service-error*/ + /* service-error*/ { err_service_error, dissect_ServiceErrorParameter_PDU }, - /* message-group-error*/ + /* message-group-error*/ { err_message_group_error, dissect_MessageGroupErrorParameter_PDU }, - /* ms-extension-error*/ + /* ms-extension-error*/ { err_ms_extension_error, dissect_MSExtensionErrorParameter_PDU }, - /* register-ms-error*/ + /* register-ms-error*/ { err_register_ms_error, dissect_PAR_register_ms_error_PDU }, - /* modify-error*/ + /* modify-error*/ { err_modify_error, dissect_ModifyErrorParameter_PDU }, - /* entry-class-error*/ + /* entry-class-error*/ { err_entry_class_error, dissect_EntryClassErrorParameter_PDU }, { 0, (new_dissector_t)(-1) }, }; -- cgit v1.2.3