diff options
| author | Gerald Combs <gerald@zing.org> | 2015-02-15 17:58:12 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-18 00:05:38 +0000 |
| commit | 3f765b3ef94fd6044279d47d0b30b46c344e5943 (patch) | |
| tree | 1218985b912e24bc88d72617d61a7491911ee092 /asn1/lte-rrc | |
| parent | be5e595da7beb355d385c6a9d96fdd1dad569e61 (diff) | |
| download | wireshark-3f765b3ef94fd6044279d47d0b30b46c344e5943.tar.gz | |
Add a CF_FUNC macro for casting BASE_CUSTOM functions.
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid
the following warning:
warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic]
We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be
more consistent with the other macros in proto.h. Update each instance
of BASE_CUSTOM to use CF_FUNC.
Adjust a dummy variable name generated by asn2wrs.py that was triggering
an invalid error in checkhf.pl.
Fix an encoding arguement in packet-elasticsearch.c found by
fix-encoding-args.pl.
Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22
Reviewed-on: https://code.wireshark.org/review/7150
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'asn1/lte-rrc')
| -rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index 86a52f9f92..fa493100c2 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -742,7 +742,7 @@ SystemInformationBlockType16-r11/timeInfo-r11/dayLightSavingTime-r11 TYPE=FT_UIN proto_item_append_text(actx->created_item, "s"); #.TYPE_ATTR -SystemInformationBlockType16-r11/timeInfo-r11/localTimeOffset-r11 DISPLAY=BASE_CUSTOM STRINGS=<e_rrc_localTimeOffset_fmt +SystemInformationBlockType16-r11/timeInfo-r11/localTimeOffset-r11 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_localTimeOffset_fmt) #.FN_BODY SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 VAL_PTR=&timeInfo guint64 timeInfo; @@ -793,7 +793,7 @@ SystemInformationBlockType1/cellSelectionInfo/q-RxLevMinOffset STRINGS=VALS(lte_ proto_item_append_text(actx->created_item, "dB"); #.TYPE_ATTR -RLF-Report-r9/eag_1/timeConnFailure-r10 DISPLAY=BASE_CUSTOM STRINGS=<e_rrc_timeConnFailure_r10_fmt +RLF-Report-r9/eag_1/timeConnFailure-r10 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_timeConnFailure_r10_fmt) #.FN_BODY LogMeasInfo-r10/relativeTimeStamp-r10 %(DEFAULT_BODY)s @@ -1058,7 +1058,7 @@ RSRQ-Range DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRQ_Range_vals_ext RSRQ-Range-v12xy DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRQ_Range_vals_ext #.TYPE_ATTR -MeasResultForECID-r9/ue-RxTxTimeDiffResult-r9 DISPLAY=BASE_CUSTOM STRINGS=<e_rrc_ue_RxTxTimeDiffResult_fmt +MeasResultForECID-r9/ue-RxTxTimeDiffResult-r9 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(lte_rrc_ue_RxTxTimeDiffResult_fmt) #.FN_BODY SoundingRS-UL-ConfigDedicated/setup/duration actx->created_item = proto_tree_add_bits_item(tree, hf_index, tvb, offset, 1, ENC_BIG_ENDIAN); |