diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-03-15 14:31:14 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-03-15 17:52:16 +0000 |
commit | d6548f9301f6fb077a9aedb5154b3b10b1b9beb1 (patch) | |
tree | 344a343eaa1328185f63a1764b04001d9e5ae653 /asn1 | |
parent | 830684fc0d6cc94aa7d892c965b722eb306b59a6 (diff) |
Remove unused const variables errors seen with recent Clang version
Fixes bug 9886
Change-Id: I8624ef1c5874aea5521d21c998510fc29c838936
Reviewed-on: https://code.wireshark.org/review/657
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/acse/acse.cnf | 3 | ||||
-rw-r--r-- | asn1/ansi_tcap/ansi_tcap.cnf | 3 | ||||
-rw-r--r-- | asn1/camel/camel.cnf | 4 | ||||
-rw-r--r-- | asn1/cmip/cmip.cnf | 3 | ||||
-rw-r--r-- | asn1/dap/dap.cnf | 3 | ||||
-rw-r--r-- | asn1/disp/disp.cnf | 6 | ||||
-rw-r--r-- | asn1/dop/dop.cnf | 7 | ||||
-rw-r--r-- | asn1/dsp/dsp.cnf | 21 | ||||
-rw-r--r-- | asn1/ftam/ftam.cnf | 3 | ||||
-rw-r--r-- | asn1/goose/goose.cnf | 3 | ||||
-rw-r--r-- | asn1/gsm_map/gsm_map.cnf | 7 | ||||
-rw-r--r-- | asn1/gsm_map/packet-gsm_map-template.c | 6 | ||||
-rw-r--r-- | asn1/inap/inap.cnf | 3 | ||||
-rw-r--r-- | asn1/ocsp/ocsp.cnf | 3 | ||||
-rw-r--r-- | asn1/p772/p772.cnf | 3 | ||||
-rw-r--r-- | asn1/rtse/rtse.cnf | 3 | ||||
-rw-r--r-- | asn1/spnego/spnego.cnf | 3 | ||||
-rw-r--r-- | asn1/sv/sv.cnf | 3 |
18 files changed, 79 insertions, 8 deletions
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf index e23a811768..e1e9ebbe18 100644 --- a/asn1/acse/acse.cnf +++ b/asn1/acse/acse.cnf @@ -7,6 +7,9 @@ Application-context-name #.END +#.NO_EMIT ONLY_VALS +ACSE-apdu + #.EXPORTS EXTERNALt AE-title diff --git a/asn1/ansi_tcap/ansi_tcap.cnf b/asn1/ansi_tcap/ansi_tcap.cnf index 5a33c987be..8c34bd64b6 100644 --- a/asn1/ansi_tcap/ansi_tcap.cnf +++ b/asn1/ansi_tcap/ansi_tcap.cnf @@ -1,6 +1,9 @@ # tcap.cnf # tcap conformation file +#.NO_EMIT ONLY_VALS +PackageType + #.OMIT_ASSIGNMENT # Removed as they are giving 'defined but not used' warnings currently. Priority diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 4c8a5d66b8..6e078cc0f9 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -45,7 +45,9 @@ OPERATION.&ResultType CAP-GPRS-ReferenceNumber B "0.4.0.0.1.1.5.2" "id-CAP-GPRS-ReferenceNumber" CAP-U-ABORT-REASON B "0.4.0.0.1.1.2.2" "id-CAP-U-ABORT-Reason" -#.NO_EMIT +#.NO_EMIT ONLY_VALS +CAMEL-AChBillingChargingCharacteristicsV2 +ROS #.TYPE_RENAME ReturnResult/result/result ResultArgument diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 801dd296bb..076535e23f 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -13,6 +13,9 @@ Bind Unbind #.END +#.NO_EMIT ONLY_VALS +LinkedReplyArgument + #.TYPE_RENAME Invoke/argument InvokeArgument diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index 2511eb6568..beb03f0dac 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -16,6 +16,9 @@ Time TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(d DAP-InvokeIDSet #.END +#.NO_EMIT ONLY_VALS +Name + #.MODULE_IMPORT AttributeCertificateDefinitions x509af BasicAccessControl crmf diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf index b650ca4695..407e678b02 100644 --- a/asn1/disp/disp.cnf +++ b/asn1/disp/disp.cnf @@ -13,6 +13,12 @@ OperationalBindingManagement dop #.EXPORTS AgreementID +#.NO_EMIT ONLY_VALS +CoordinateShadowUpdateArgument +RequestShadowUpdateArgument +UpdateShadowArgument +ShadowError + #.TYPE_RENAME CoordinateShadowUpdateArgumentData/updateStrategy/standard StandardUpdate diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index dc4db0fd03..e6629be715 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -13,6 +13,13 @@ DSEType SupplierAndConsumers OperationalBindingID +#.NO_EMIT ONLY_VALS +EstablishOperationalBindingArgument +ModifyOperationalBindingArgument +ModifyOperationalBindingResult +TerminateOperationalBindingArgument +TerminateOperationalBindingResult + #.TYPE_RENAME EstablishOperationalBindingArgumentData/initiator EstablishArgumentInitiator ModifyOperationalBindingArgumentData/initiator ModifyArgumentInitiator diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf index d79eb6e0c4..c10743b340 100644 --- a/asn1/dsp/dsp.cnf +++ b/asn1/dsp/dsp.cnf @@ -15,8 +15,27 @@ Exclusions MasterAndShadowAccessPoints OperationProgress ReferenceType -#.TYPE_RENAME +#.NO_EMIT ONLY_VALS +ChainedReadArgument +ChainedReadResult +ChainedCompareArgument +ChainedCompareResult +ChainedListArgument +ChainedListResult +ChainedSearchArgument +ChainedSearchResult +ChainedAddEntryArgument +ChainedAddEntryResult +ChainedRemoveEntryArgument +ChainedRemoveEntryResult +ChainedModifyEntryArgument +ChainedModifyEntryResult +ChainedModifyDNArgument +ChainedModifyDNResult +DSAReferral + +#.TYPE_RENAME MasterOrShadowAccessPoint/category APCategory #.FIELD_RENAME diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf index f3282b5036..5c1157f499 100644 --- a/asn1/ftam/ftam.cnf +++ b/asn1/ftam/ftam.cnf @@ -22,7 +22,8 @@ Other-Pattern #.PDU -#.NO_EMIT +#.NO_EMIT ONLY_VALS +PDU #.TYPE_RENAME F-OPEN-request/recovery-mode T_request_recovery_mode diff --git a/asn1/goose/goose.cnf b/asn1/goose/goose.cnf index 9b4874fcea..5117414e7d 100644 --- a/asn1/goose/goose.cnf +++ b/asn1/goose/goose.cnf @@ -7,7 +7,8 @@ #.PDU -#.NO_EMIT +#.NO_EMIT ONLY_VALS +GOOSEpdu #.TYPE_RENAME diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index cb938b918f..07dd16d329 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -42,6 +42,13 @@ Remote-Operations-Information-Objects ROS #.NO_EMIT SubscriberData +#.NO_EMIT ONLY_VALS +CallBarredParam +PW-RegistrationFailureCause +SystemFailureParam +ExtensionType +NumberPorted/_untag + #.OMIT_ASSIGNMENT Code Priority diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 2eb7322f6e..69e1b5165f 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -506,6 +506,7 @@ other values reserved for future use */ /* TS 23 032 Table 2a: Coding of Type of Shape */ +#if 0 static const value_string type_of_shape_vals[] = { { ELLIPSOID_POINT, "Ellipsoid Point"}, { ELLIPSOID_POINT_WITH_UNCERT_CIRC, "Ellipsoid point with uncertainty Circle"}, @@ -529,6 +530,7 @@ static const value_string dir_of_alt_vals[] = { { 1, "Altitude expresses depth"}, { 0, NULL } }; +#endif static const value_string gsm_map_cbs_data_coding_scheme_coding_grp_vals[] = { { 0, "Coding Group 0(Language using the GSM 7 bit default alphabet)" }, @@ -855,10 +857,14 @@ const value_string gsm_map_opr_code_strings[] = { #include "packet-gsm_map-table.c" { 0, NULL } }; + +#if 0 static const value_string gsm_map_err_code_string_vals[] = { #include "packet-gsm_map-table.c" { 0, NULL } }; +#endif + static const true_false_string gsm_map_extension_value = { "No Extension", "Extension" diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf index 6b7cbd147a..6cb607ff5a 100644 --- a/asn1/inap/inap.cnf +++ b/asn1/inap/inap.cnf @@ -17,7 +17,8 @@ MiscCallInfo RedirectionInformation ServiceKey -#.NO_EMIT +#.NO_EMIT ONLY_VALS +ROS #.OMIT_ASSIGNMENT # Removed as they are giving 'defined but not used' warnings currently. diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf index 1c6a2fbf4a..5b6831a298 100644 --- a/asn1/ocsp/ocsp.cnf +++ b/asn1/ocsp/ocsp.cnf @@ -29,7 +29,8 @@ NULL B "1.3.6.1.5.5.7.48.1.5" "id-pkix-ocsp-nocheck" ArchiveCutoff B "1.3.6.1.5.5.7.48.1.6" "id-pkix-ocsp-archive-cutoff" ServiceLocator B "1.3.6.1.5.5.7.48.1.7" "id-pkix-ocsp-service-locator" -#.NO_EMIT +#.NO_EMIT ONLY_VALS +Version #.TYPE_RENAME diff --git a/asn1/p772/p772.cnf b/asn1/p772/p772.cnf index 069329400d..d2da78e3b6 100644 --- a/asn1/p772/p772.cnf +++ b/asn1/p772/p772.cnf @@ -28,6 +28,9 @@ ChangeAutoForwardingArgument SubscriptionErrorParameter SubscriptionProblem +#.NO_EMIT ONLY_VALS +InformationObject + #.TYPE_RENAME AddressListDesignator/type AddressListType OtherRecipientDesignator/type OtherRecipientType diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf index b76612df1b..a911ffd579 100644 --- a/asn1/rtse/rtse.cnf +++ b/asn1/rtse/rtse.cnf @@ -4,6 +4,9 @@ RTOACapdu RTORJapdu RTABapdu +#.NO_EMIT ONLY_VALS +RTSE-apdus + #.FN_BODY RTORJapdu/userDataRJ struct SESSION_DATA_STRUCTURE* session = (struct SESSION_DATA_STRUCTURE*)actx->private_data; const char *oid = NULL; diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index bd48e63bf8..a4fcc0b388 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -5,7 +5,8 @@ #.PDU -#.NO_EMIT +#.NO_EMIT ONLY_VALS +NegotiationToken #.TYPE_RENAME NegTokenInit/mechListMIC T_NegTokenInit_mechListMIC diff --git a/asn1/sv/sv.cnf b/asn1/sv/sv.cnf index 6f6e1fcd64..cfcdc63fc3 100644 --- a/asn1/sv/sv.cnf +++ b/asn1/sv/sv.cnf @@ -7,7 +7,8 @@ #.PDU -#.NO_EMIT +#.NO_EMIT ONLY_VALS +SampledValues #.TYPE_RENAME |