diff options
author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:07:41 +0000 |
---|---|---|
committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:07:41 +0000 |
commit | 830dd8e8f05e39238b97857e161821a41ff985df (patch) | |
tree | 165a5bde8cb965aa95198889f0cac87eff3932a9 /asn1 | |
parent | 65c53fedb6c2a23295d280d8971f03c05343dc7d (diff) |
* Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards
svn path=/trunk/; revision=30126
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 116 | ||||
-rw-r--r-- | asn1/p7/p7.cnf | 8 |
2 files changed, 31 insertions, 93 deletions
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index 0b197e9cbb..9fb10255b7 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -31,174 +31,116 @@ UL-DCCH-Message @ul.dcch #.FN_HDR MasterInformationBlock -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock"); #.FN_HDR SystemInformation -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "SystemInformation"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation"); #.FN_HDR SystemInformationBlockType1 -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1"); #.FN_HDR Paging -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Paging"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "Paging"); #.FN_HDR RRCConnectionReestablishment -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishment"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishment"); #.FN_HDR RRCConnectionReestablishmentReject -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentReject"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentReject"); #.FN_HDR RRCConnectionReject -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject"); #.FN_HDR RRCConnectionSetup -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup"); #.FN_HDR CDMA2000-CSFBParametersResponse -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CDMA2000-CSFBParametersResponse"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "CDMA2000-CSFBParametersResponse"); #.FN_HDR DLInformationTransfer -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "DLInformationTransfer"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "DLInformationTransfer"); #.FN_HDR HandoverFromEUTRAPreparationRequest -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "HandoverFromEUTRAPreparationRequest"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromEUTRAPreparationRequest"); #.FN_HDR MobilityFromEUTRACommand -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "MobilityFromEUTRACommand"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "MobilityFromEUTRACommand"); #.FN_HDR RRCConnectionReconfiguration -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfiguration"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfiguration"); #.FN_HDR RRCConnectionRelease -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease"); #.FN_HDR SecurityModeCommand -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand"); #.FN_HDR UECapabilityEnquiry -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry"); #.FN_HDR RRCConnectionReestablishmentRequest -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentRequest"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentRequest"); #.FN_HDR RRCConnectionRequest -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest"); #.FN_HDR CDMA2000-CSFBParametersRequest -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CDMA2000-CSFBParametersRequest"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "CDMA2000-CSFBParametersRequest"); #.FN_HDR MeasurementReport -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport"); #.FN_HDR RRCConnectionReconfigurationComplete -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfigurationComplete"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfigurationComplete"); #.FN_HDR RRCConnectionReestablishmentComplete -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentComplete"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentComplete"); #.FN_HDR RRCConnectionSetupComplete -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete"); #.FN_HDR RRCStatus -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus"); #.FN_HDR SecurityModeComplete -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete"); #.FN_HDR SecurityModeFailure -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure"); #.FN_HDR UECapabilityInformation -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation"); #.FN_HDR ULHandoverPreparationTransfer -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "ULHandoverPreparationTransfer"); - } +col_append_str(actx->pinfo->cinfo, COL_INFO, "ULHandoverPreparationTransfer"); #.FN_HDR ULInformationTransfer -if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_fstr(actx->pinfo->cinfo, COL_INFO, "ULInformationTransfer"); - }
\ No newline at end of file +col_append_str(actx->pinfo->cinfo, COL_INFO, "ULInformationTransfer");
\ No newline at end of file diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf index d5a09d438d..91345f0b44 100644 --- a/asn1/p7/p7.cnf +++ b/asn1/p7/p7.cnf @@ -374,13 +374,9 @@ RTSE-apdus B "2.6.0.2.10""id-as-ms-rtse" #.FN_PARS SequenceNumber VAL_PTR = &seqno #.FN_BODY NumberRange - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (range="); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, " (range="); %(DEFAULT_BODY)s - if (check_col(actx->pinfo->cinfo, COL_INFO)) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, ")"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, ")"); #.FN_FTR NumberRange/from if (check_col(actx->pinfo->cinfo, COL_INFO)) { |