diff options
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-cmp.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-goose.c | 11 | ||||
-rw-r--r-- | epan/dissectors/packet-iscsi.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-mms.c | 11 | ||||
-rw-r--r-- | epan/dissectors/packet-sv.c | 11 |
5 files changed, 21 insertions, 26 deletions
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 99770656ba..b5823b443a 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -49,7 +49,6 @@ #include "packet-tcp.h" #include "packet-http.h" #include <epan/prefs.h> -#include <epan/nstime.h> #define PNAME "Certificate Management Protocol" #define PSNAME "CMP" @@ -237,7 +236,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; /*--- End of included file: packet-cmp-hf.c ---*/ -#line 70 "../../asn1/cmp/packet-cmp-template.c" +#line 69 "../../asn1/cmp/packet-cmp-template.c" /* Initialize the subtree pointers */ static gint ett_cmp = -1; @@ -293,7 +292,7 @@ static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; /*--- End of included file: packet-cmp-ett.c ---*/ -#line 74 "../../asn1/cmp/packet-cmp-template.c" +#line 73 "../../asn1/cmp/packet-cmp-template.c" /*--- Included file: packet-cmp-fn.c ---*/ #line 1 "../../asn1/cmp/packet-cmp-fn.c" @@ -1453,7 +1452,7 @@ static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-cmp-fn.c ---*/ -#line 75 "../../asn1/cmp/packet-cmp-template.c" +#line 74 "../../asn1/cmp/packet-cmp-template.c" static int dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx) @@ -2343,7 +2342,7 @@ void proto_register_cmp(void) { NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 332 "../../asn1/cmp/packet-cmp-template.c" +#line 331 "../../asn1/cmp/packet-cmp-template.c" }; /* List of subtrees */ @@ -2401,7 +2400,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 338 "../../asn1/cmp/packet-cmp-template.c" +#line 337 "../../asn1/cmp/packet-cmp-template.c" }; module_t *cmp_module; @@ -2495,7 +2494,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 410 "../../asn1/cmp/packet-cmp-template.c" +#line 409 "../../asn1/cmp/packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index a17e644ce3..7cd1c67eda 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -38,7 +38,6 @@ #include <epan/asn1.h> #include <epan/etypes.h> #include <epan/expert.h> -#include <epan/nstime.h> #include "packet-ber.h" #include "packet-acse.h" @@ -120,7 +119,7 @@ static int hf_goose_mMSString = -1; /* MMSString */ static int hf_goose_utc_time = -1; /* UtcTime */ /*--- End of included file: packet-goose-hf.c ---*/ -#line 52 "../../asn1/goose/packet-goose-template.c" +#line 51 "../../asn1/goose/packet-goose-template.c" /* Initialize the subtree pointers */ static int ett_goose = -1; @@ -147,7 +146,7 @@ static gint ett_goose_SEQUENCE_OF_Data = -1; static gint ett_goose_Data = -1; /*--- End of included file: packet-goose-ett.c ---*/ -#line 57 "../../asn1/goose/packet-goose-template.c" +#line 56 "../../asn1/goose/packet-goose-template.c" /*--- Included file: packet-goose-fn.c ---*/ @@ -715,7 +714,7 @@ dissect_goose_GOOSEpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-goose-fn.c ---*/ -#line 59 "../../asn1/goose/packet-goose-template.c" +#line 58 "../../asn1/goose/packet-goose-template.c" /* * Dissect GOOSE PDUs inside a PPDU. @@ -1024,7 +1023,7 @@ void proto_register_goose(void) { "UtcTime", HFILL }}, /*--- End of included file: packet-goose-hfarr.c ---*/ -#line 127 "../../asn1/goose/packet-goose-template.c" +#line 126 "../../asn1/goose/packet-goose-template.c" }; /* List of subtrees */ @@ -1052,7 +1051,7 @@ void proto_register_goose(void) { &ett_goose_Data, /*--- End of included file: packet-goose-ettarr.c ---*/ -#line 133 "../../asn1/goose/packet-goose-template.c" +#line 132 "../../asn1/goose/packet-goose-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 5c01507896..c38b9432e0 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -44,7 +44,6 @@ #include <epan/prefs.h> #include <epan/conversation.h> #include "packet-scsi.h" -#include <epan/nstime.h> #include <epan/emem.h> #include <epan/range.h> #include <wsutil/crc32.h> diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 97e12b6332..df18a337be 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -38,7 +38,6 @@ #include <epan/packet.h> #include <epan/asn1.h> #include <epan/expert.h> -#include <epan/nstime.h> #include "packet-ber.h" #include "packet-acse.h" @@ -723,7 +722,7 @@ static int hf_mms_Transitions_idle_to_active = -1; static int hf_mms_Transitions_any_to_deleted = -1; /*--- End of included file: packet-mms-hf.c ---*/ -#line 47 "../../asn1/mms/packet-mms-template.c" +#line 46 "../../asn1/mms/packet-mms-template.c" /* Initialize the subtree pointers */ static gint ett_mms = -1; @@ -940,7 +939,7 @@ static gint ett_mms_DirectoryEntry = -1; static gint ett_mms_FileAttributes = -1; /*--- End of included file: packet-mms-ett.c ---*/ -#line 51 "../../asn1/mms/packet-mms-template.c" +#line 50 "../../asn1/mms/packet-mms-template.c" static expert_field ei_mms_mal_timeofday_encoding = EI_INIT; static expert_field ei_mms_mal_utctime_encoding = EI_INIT; @@ -7053,7 +7052,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, /*--- End of included file: packet-mms-fn.c ---*/ -#line 56 "../../asn1/mms/packet-mms-template.c" +#line 55 "../../asn1/mms/packet-mms-template.c" /* * Dissect MMS PDUs inside a PPDU. @@ -9761,7 +9760,7 @@ void proto_register_mms(void) { NULL, HFILL }}, /*--- End of included file: packet-mms-hfarr.c ---*/ -#line 95 "../../asn1/mms/packet-mms-template.c" +#line 94 "../../asn1/mms/packet-mms-template.c" }; /* List of subtrees */ @@ -9980,7 +9979,7 @@ void proto_register_mms(void) { &ett_mms_FileAttributes, /*--- End of included file: packet-mms-ettarr.c ---*/ -#line 101 "../../asn1/mms/packet-mms-template.c" +#line 100 "../../asn1/mms/packet-mms-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c index d25e4d00b9..41428bbcee 100644 --- a/epan/dissectors/packet-sv.c +++ b/epan/dissectors/packet-sv.c @@ -38,7 +38,6 @@ #include <epan/asn1.h> #include <epan/etypes.h> #include <epan/expert.h> -#include <epan/nstime.h> #include <stdio.h> #include <string.h> @@ -127,7 +126,7 @@ static int hf_sv_seqData = -1; /* Data */ static int hf_sv_smpMod = -1; /* T_smpMod */ /*--- End of included file: packet-sv-hf.c ---*/ -#line 105 "../../asn1/sv/packet-sv-template.c" +#line 104 "../../asn1/sv/packet-sv-template.c" /* Initialize the subtree pointers */ static int ett_sv = -1; @@ -143,7 +142,7 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1; static gint ett_sv_ASDU = -1; /*--- End of included file: packet-sv-ett.c ---*/ -#line 112 "../../asn1/sv/packet-sv-template.c" +#line 111 "../../asn1/sv/packet-sv-template.c" static expert_field ei_sv_mal_utctime = EI_INIT; @@ -450,7 +449,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-sv-fn.c ---*/ -#line 195 "../../asn1/sv/packet-sv-template.c" +#line 194 "../../asn1/sv/packet-sv-template.c" /* * Dissect SV PDUs inside a PPDU. @@ -624,7 +623,7 @@ void proto_register_sv(void) { NULL, HFILL }}, /*--- End of included file: packet-sv-hfarr.c ---*/ -#line 312 "../../asn1/sv/packet-sv-template.c" +#line 311 "../../asn1/sv/packet-sv-template.c" }; /* List of subtrees */ @@ -641,7 +640,7 @@ void proto_register_sv(void) { &ett_sv_ASDU, /*--- End of included file: packet-sv-ettarr.c ---*/ -#line 320 "../../asn1/sv/packet-sv-template.c" +#line 319 "../../asn1/sv/packet-sv-template.c" }; static ei_register_info ei[] = { |