diff options
126 files changed, 390 insertions, 632 deletions
diff --git a/asn1/HI2Operations/packet-HI2Operations-template.c b/asn1/HI2Operations/packet-HI2Operations-template.c index eda376fb3b..e5d7502300 100644 --- a/asn1/HI2Operations/packet-HI2Operations-template.c +++ b/asn1/HI2Operations/packet-HI2Operations-template.c @@ -33,8 +33,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #define PNAME "HI2Operations" diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c index f15092a178..58866fa39c 100644 --- a/asn1/acp133/packet-acp133-template.c +++ b/asn1/acp133/packet-acp133-template.c @@ -32,8 +32,6 @@ #include <epan/asn1.h> #include <epan/oids.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509af.h" diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index ffdfa4e4c6..dd2e8a2b37 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -94,8 +94,6 @@ #include <epan/tap.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-ansi_map.h" #include "packet-ansi_a.h" diff --git a/asn1/charging_ase/packet-charging_ase-template.c b/asn1/charging_ase/packet-charging_ase-template.c index 6e9d70688e..54e3ea913c 100644 --- a/asn1/charging_ase/packet-charging_ase-template.c +++ b/asn1/charging_ase/packet-charging_ase-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-charging_ase.h" diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index fa95e52234..ace3b1c9fd 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-x509if.h" diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c index 2552f842e7..70d439473a 100644 --- a/asn1/cmp/packet-cmp-template.c +++ b/asn1/cmp/packet-cmp-template.c @@ -33,8 +33,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/oids.h> #include <epan/asn1.h> #include "packet-ber.h" diff --git a/asn1/crmf/packet-crmf-template.c b/asn1/crmf/packet-crmf-template.c index ecb1bc3501..e4ea0acc98 100644 --- a/asn1/crmf/packet-crmf-template.c +++ b/asn1/crmf/packet-crmf-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-crmf.h" #include "packet-cms.h" diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c index f1d36a5ce6..b6dde63064 100644 --- a/asn1/dap/packet-dap-template.c +++ b/asn1/dap/packet-dap-template.c @@ -33,8 +33,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index 3810ee9906..280395006f 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -33,8 +33,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 98cc168759..ba40557254 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -34,8 +34,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c index 3efdf1c7b3..2b48984c52 100644 --- a/asn1/dsp/packet-dsp-template.c +++ b/asn1/dsp/packet-dsp-template.c @@ -33,8 +33,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" diff --git a/asn1/ess/packet-ess-template.c b/asn1/ess/packet-ess-template.c index 3241bd79cd..e434a97b18 100644 --- a/asn1/ess/packet-ess-template.c +++ b/asn1/ess/packet-ess-template.c @@ -32,8 +32,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-ess.h" #include "packet-cms.h" diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index d669ccc3e7..da5d803a45 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -37,8 +37,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ftam.h" diff --git a/asn1/gnm/packet-gnm-template.c b/asn1/gnm/packet-gnm-template.c index 5750e46d10..5745c1b2a1 100644 --- a/asn1/gnm/packet-gnm-template.c +++ b/asn1/gnm/packet-gnm-template.c @@ -35,7 +35,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> #include "packet-ber.h" #include "packet-cmip.h" #include "packet-gnm.h" diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c index ee98e4708f..bbce687b39 100644 --- a/asn1/goose/packet-goose-template.c +++ b/asn1/goose/packet-goose-template.c @@ -34,8 +34,6 @@ #include <epan/expert.h> #include <epan/nstime.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c index 50e55e2b6f..27bc1bd04e 100644 --- a/asn1/h235/packet-h235-template.c +++ b/asn1/h235/packet-h235-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #include "packet-h235.h" #include "packet-h225.h" diff --git a/asn1/h282/packet-h282-template.c b/asn1/h282/packet-h282-template.c index ec9207c172..f038cc30ee 100644 --- a/asn1/h282/packet-h282-template.c +++ b/asn1/h282/packet-h282-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #define PNAME "H.282 Remote Device Control" diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c index 69e973266d..0a5b46582f 100644 --- a/asn1/h283/packet-h283-template.c +++ b/asn1/h283/packet-h283-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #define PNAME "H.283 Logical Channel Transport" diff --git a/asn1/h323/packet-h323-template.c b/asn1/h323/packet-h323-template.c index c4364b9d4b..a1755ed281 100644 --- a/asn1/h323/packet-h323-template.c +++ b/asn1/h323/packet-h323-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #include "packet-h225.h" #include "packet-h323.h" diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c index 8f0ec385a3..c0b2398317 100644 --- a/asn1/h450-ros/packet-h450-ros-template.c +++ b/asn1/h450-ros/packet-h450-ros-template.c @@ -27,8 +27,6 @@ # include "config.h" #endif -#include <string.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/asn1.h> diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c index d1a46ee300..241e7c8fb5 100644 --- a/asn1/h450/packet-h450-template.c +++ b/asn1/h450/packet-h450-template.c @@ -35,7 +35,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <epan/asn1.h> #include "packet-per.h" diff --git a/asn1/h501/packet-h501-template.c b/asn1/h501/packet-h501-template.c index 17ed76e4d2..39ca317a57 100644 --- a/asn1/h501/packet-h501-template.c +++ b/asn1/h501/packet-h501-template.c @@ -33,8 +33,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-tpkt.h" #include "packet-per.h" #include "packet-h225.h" diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 639c4f3dec..6a1717d183 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -36,8 +36,6 @@ #include <epan/expert.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-inap.h" #include "packet-q931.h" diff --git a/asn1/logotypecertextn/packet-logotypecertextn-template.c b/asn1/logotypecertextn/packet-logotypecertextn-template.c index 1506a45cdd..bc5330c056 100644 --- a/asn1/logotypecertextn/packet-logotypecertextn-template.c +++ b/asn1/logotypecertextn/packet-logotypecertextn-template.c @@ -30,8 +30,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include "packet-ber.h" #include "packet-logotypecertextn.h" #include "packet-x509af.h" diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index f9bcc2d34b..ac58462cd0 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -34,8 +34,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-per.h" #include "packet-rrc.h" diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c index 8a0ed6c450..58fcd8d478 100644 --- a/asn1/mms/packet-mms-template.c +++ b/asn1/mms/packet-mms-template.c @@ -34,8 +34,6 @@ #include <epan/expert.h> #include <epan/nstime.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-mms.h" diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index a8582f5db7..649d3bde4e 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -26,8 +26,6 @@ # include "config.h" #endif -#include <string.h> - #include <glib.h> #include <epan/packet.h> diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index 19b662e429..4313952a01 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -27,8 +27,6 @@ # include "config.h" #endif -#include <string.h> - #include <glib.h> #include <epan/packet.h> diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 32a51f131e..1bd8f57060 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -30,7 +30,6 @@ #endif #include <glib.h> -#include <string.h> #include <epan/packet.h> #include <epan/sctpppids.h> diff --git a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c index 3d9ec76657..72709d001c 100644 --- a/asn1/ns_cert_exts/packet-ns_cert_exts-template.c +++ b/asn1/ns_cert_exts/packet-ns_cert_exts-template.c @@ -30,8 +30,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include "packet-ber.h" #define PNAME "NetScape Certificate Extensions" diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c index 14e0f20fb1..0fa32c5f48 100644 --- a/asn1/ocsp/packet-ocsp-template.c +++ b/asn1/ocsp/packet-ocsp-template.c @@ -30,7 +30,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <asn1.h> #include "packet-ber.h" diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c index 5d36f4f257..aebb0bb6a7 100644 --- a/asn1/p7/packet-p7-template.c +++ b/asn1/p7/packet-p7-template.c @@ -33,9 +33,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <stdio.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c index f536de2ebb..91252424d9 100644 --- a/asn1/pcap/packet-pcap-template.c +++ b/asn1/pcap/packet-pcap-template.c @@ -36,7 +36,6 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include <string.h> #include <epan/strutil.h> #include <epan/asn1.h> diff --git a/asn1/pkcs1/packet-pkcs1-template.c b/asn1/pkcs1/packet-pkcs1-template.c index c7396918b4..c110bb27b1 100644 --- a/asn1/pkcs1/packet-pkcs1-template.c +++ b/asn1/pkcs1/packet-pkcs1-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkcs1.h" #include "packet-x509af.h" diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index e2a8bca2c9..c42983f077 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -33,9 +33,6 @@ #include <epan/asn1.h> #include <epan/prefs.h> -#include <stdio.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkcs12.h" #include "packet-x509af.h" diff --git a/asn1/pkinit/packet-pkinit-template.c b/asn1/pkinit/packet-pkinit-template.c index 8698497450..104b091e2b 100644 --- a/asn1/pkinit/packet-pkinit-template.c +++ b/asn1/pkinit/packet-pkinit-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkinit.h" #include "packet-cms.h" diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c index 1b38406118..0aca5ca649 100644 --- a/asn1/pkix1explicit/packet-pkix1explicit-template.c +++ b/asn1/pkix1explicit/packet-pkix1explicit-template.c @@ -34,8 +34,6 @@ #include <epan/oids.h> #include <epan/afn.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkix1explicit.h" #include "packet-x509af.h" diff --git a/asn1/pkix1implicit/packet-pkix1implicit-template.c b/asn1/pkix1implicit/packet-pkix1implicit-template.c index d484c656a4..77857018d2 100644 --- a/asn1/pkix1implicit/packet-pkix1implicit-template.c +++ b/asn1/pkix1implicit/packet-pkix1implicit-template.c @@ -29,8 +29,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-ber.h" #include "packet-pkix1implicit.h" diff --git a/asn1/pkixproxy/packet-pkixproxy-template.c b/asn1/pkixproxy/packet-pkixproxy-template.c index aa7076ba0c..0931a6ebbd 100644 --- a/asn1/pkixproxy/packet-pkixproxy-template.c +++ b/asn1/pkixproxy/packet-pkixproxy-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkixproxy.h" diff --git a/asn1/pkixqualified/packet-pkixqualified-template.c b/asn1/pkixqualified/packet-pkixqualified-template.c index 63996b55bb..70dd91bd87 100644 --- a/asn1/pkixqualified/packet-pkixqualified-template.c +++ b/asn1/pkixqualified/packet-pkixqualified-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkixqualified.h" #include "packet-x509af.h" diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c index 2157f672ee..4ba7262f44 100644 --- a/asn1/pkixtsp/packet-pkixtsp-template.c +++ b/asn1/pkixtsp/packet-pkixtsp-template.c @@ -30,8 +30,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-ber.h" #include "packet-pkixtsp.h" diff --git a/asn1/q932-ros/packet-q932-ros-template.c b/asn1/q932-ros/packet-q932-ros-template.c index ddec1cbe12..79fbbb6fe1 100644 --- a/asn1/q932-ros/packet-q932-ros-template.c +++ b/asn1/q932-ros/packet-q932-ros-template.c @@ -27,8 +27,6 @@ # include "config.h" #endif -#include <string.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/asn1.h> diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 960696adcf..dc3afb6f54 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -32,7 +32,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <epan/emem.h> #include <epan/strutil.h> #include <epan/asn1.h> diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index 87dd5ec600..43507f36d6 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -35,8 +35,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-per.h" diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index 1f47dc3fa6..d010a0a410 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -34,8 +34,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pres.h" #include "packet-ros.h" diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index dda9f0c10d..047e46527d 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -35,8 +35,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-per.h" #include "packet-rrc.h" diff --git a/asn1/rrlp/packet-rrlp-template.c b/asn1/rrlp/packet-rrlp-template.c index 47ef491984..1b2626e7a1 100644 --- a/asn1/rrlp/packet-rrlp-template.c +++ b/asn1/rrlp/packet-rrlp-template.c @@ -34,8 +34,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-per.h" #include "packet-gsm_a_common.h" diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 94eb584b20..c4d5f9bb41 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -35,8 +35,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pres.h" #include "packet-acse.h" diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 5b60103d9e..8af8ff04dd 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -34,7 +34,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <ctype.h> #include <epan/strutil.h> #include <epan/asn1.h> diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c index a8f19f0412..cffc9449cc 100644 --- a/asn1/s4406/packet-s4406-template.c +++ b/asn1/s4406/packet-s4406-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509if.h" diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c index 02da9a3e4d..204fa1ccf5 100644 --- a/asn1/sabp/packet-sabp-template.c +++ b/asn1/sabp/packet-sabp-template.c @@ -32,8 +32,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-tcp.h" diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c index 677d036a48..9f507961fa 100644 --- a/asn1/smrse/packet-smrse-template.c +++ b/asn1/smrse/packet-smrse-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-smrse.h" diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 670126184c..62f017a2ae 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -50,8 +50,6 @@ # include "config.h" #endif -#include <stdio.h> -#include <string.h> #include <ctype.h> #include <glib.h> diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index db297821e2..7c5c5b86ab 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -31,8 +31,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-ber.h" diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c index 6adbce3147..9d3c9150b7 100644 --- a/asn1/ulp/packet-ulp-template.c +++ b/asn1/ulp/packet-ulp-template.c @@ -35,8 +35,6 @@ #include <epan/prefs.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #include "packet-tcp.h" #include "packet-gsm_map.h" diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c index c84da3060a..1392b56efa 100644 --- a/asn1/wlancertextn/packet-wlancertextn-template.c +++ b/asn1/wlancertextn/packet-wlancertextn-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-wlancertextn.h" #include "packet-x509af.h" diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index cde8a7db05..d86dd8c2b0 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -35,8 +35,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include <epan/prefs.h> #include <epan/sctpppids.h> diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c index 9c3ae29f88..b337016bde 100644 --- a/asn1/x411/packet-x411-template.c +++ b/asn1/x411/packet-x411-template.c @@ -34,8 +34,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c index 8f8b1468b7..64c5458c3b 100644 --- a/asn1/x420/packet-x420-template.c +++ b/asn1/x420/packet-x420-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index b6036c2a1a..4cdf7c2b4b 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509af.h" #include "packet-x509ce.h" diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index e7dc96d2de..5d253e3932 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -31,8 +31,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509ce.h" #include "packet-x509af.h" diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c index daf44c3bd3..2c38b0b909 100644 --- a/asn1/x509if/packet-x509if-template.c +++ b/asn1/x509if/packet-x509if-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-dap.h" #include "packet-x509if.h" diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 30b2571ef5..04a497f147 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -32,8 +32,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x411.h" #include "packet-x509sat.h" diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c index a1fc9b8051..1ec5321413 100644 --- a/epan/dissectors/packet-HI2Operations.c +++ b/epan/dissectors/packet-HI2Operations.c @@ -41,8 +41,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #define PNAME "HI2Operations" @@ -370,7 +368,7 @@ static int hf_HI2Operations_cI = -1; /* CellIdType */ static int hf_HI2Operations_ssi = -1; /* SSIType */ /*--- End of included file: packet-HI2Operations-hf.c ---*/ -#line 47 "packet-HI2Operations-template.c" +#line 45 "packet-HI2Operations-template.c" /* Initialize the subtree pointers */ @@ -480,7 +478,7 @@ static gint ett_HI2Operations_TETRACGIType = -1; static gint ett_HI2Operations_TSIType = -1; /*--- End of included file: packet-HI2Operations-ett.c ---*/ -#line 50 "packet-HI2Operations-template.c" +#line 48 "packet-HI2Operations-template.c" /*--- Included file: packet-HI2Operations-fn.c ---*/ @@ -3769,7 +3767,7 @@ static void dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-HI2Operations-fn.c ---*/ -#line 52 "packet-HI2Operations-template.c" +#line 50 "packet-HI2Operations-template.c" /*--- proto_register_HI2Operations ----------------------------------------------*/ @@ -5038,7 +5036,7 @@ void proto_register_HI2Operations(void) { "HI2Operations.SSIType", HFILL }}, /*--- End of included file: packet-HI2Operations-hfarr.c ---*/ -#line 60 "packet-HI2Operations-template.c" +#line 58 "packet-HI2Operations-template.c" }; /* List of subtrees */ @@ -5150,7 +5148,7 @@ void proto_register_HI2Operations(void) { &ett_HI2Operations_TSIType, /*--- End of included file: packet-HI2Operations-ettarr.c ---*/ -#line 65 "packet-HI2Operations-template.c" +#line 63 "packet-HI2Operations-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c index 655429ffa1..4d94e642af 100644 --- a/epan/dissectors/packet-acp133.c +++ b/epan/dissectors/packet-acp133.c @@ -40,8 +40,6 @@ #include <epan/asn1.h> #include <epan/oids.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509af.h" @@ -142,7 +140,7 @@ static int hf_acp133_OnSupported_acp127_pn = -1; static int hf_acp133_OnSupported_acp127_tn = -1; /*--- End of included file: packet-acp133-hf.c ---*/ -#line 55 "packet-acp133-template.c" +#line 53 "packet-acp133-template.c" /* Initialize the subtree pointers */ static gint ett_acp133 = -1; @@ -170,7 +168,7 @@ static gint ett_acp133_Capability = -1; static gint ett_acp133_SET_OF_ExtendedContentType = -1; /*--- End of included file: packet-acp133-ett.c ---*/ -#line 59 "packet-acp133-template.c" +#line 57 "packet-acp133-template.c" /*--- Included file: packet-acp133-fn.c ---*/ @@ -1018,7 +1016,7 @@ static void dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-acp133-fn.c ---*/ -#line 61 "packet-acp133-template.c" +#line 59 "packet-acp133-template.c" /*--- proto_register_acp133 -------------------------------------------*/ @@ -1340,7 +1338,7 @@ void proto_register_acp133(void) { NULL, HFILL }}, /*--- End of included file: packet-acp133-hfarr.c ---*/ -#line 70 "packet-acp133-template.c" +#line 68 "packet-acp133-template.c" }; /* List of subtrees */ @@ -1370,7 +1368,7 @@ void proto_register_acp133(void) { &ett_acp133_SET_OF_ExtendedContentType, /*--- End of included file: packet-acp133-ettarr.c ---*/ -#line 76 "packet-acp133-template.c" +#line 74 "packet-acp133-template.c" }; /* Register protocol */ @@ -1431,7 +1429,7 @@ void proto_reg_handoff_acp133(void) { /*--- End of included file: packet-acp133-dis-tab.c ---*/ -#line 92 "packet-acp133-template.c" +#line 90 "packet-acp133-template.c" /* X.402 Object Classes */ oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0"); diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index a08b22ece8..ee01b4f853 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -102,8 +102,6 @@ #include <epan/tap.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-ansi_map.h" #include "packet-ansi_a.h" @@ -878,7 +876,7 @@ static int hf_ansi_map_interSystemSMSDeliveryPointToPointRes = -1; /* InterSyst static int hf_ansi_map_qualificationRequest2Res = -1; /* QualificationRequest2Res */ /*--- End of included file: packet-ansi_map-hf.c ---*/ -#line 322 "packet-ansi_map-template.c" +#line 320 "packet-ansi_map-template.c" /* Initialize the subtree pointers */ static gint ett_ansi_map = -1; @@ -1138,7 +1136,7 @@ static gint ett_ansi_map_InvokeData = -1; static gint ett_ansi_map_ReturnData = -1; /*--- End of included file: packet-ansi_map-ett.c ---*/ -#line 354 "packet-ansi_map-template.c" +#line 352 "packet-ansi_map-template.c" /* Global variables */ static dissector_table_t is637_tele_id_dissector_table; /* IS-637 Teleservice ID */ @@ -15500,7 +15498,7 @@ dissect_ansi_map_ReturnData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of /*--- End of included file: packet-ansi_map-fn.c ---*/ -#line 3633 "packet-ansi_map-template.c" +#line 3631 "packet-ansi_map-template.c" /* * 6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301 @@ -19342,7 +19340,7 @@ void proto_register_ansi_map(void) { "ansi_map.QualificationRequest2Res", HFILL }}, /*--- End of included file: packet-ansi_map-hfarr.c ---*/ -#line 5282 "packet-ansi_map-template.c" +#line 5280 "packet-ansi_map-template.c" }; /* List of subtrees */ @@ -19603,7 +19601,7 @@ void proto_register_ansi_map(void) { &ett_ansi_map_ReturnData, /*--- End of included file: packet-ansi_map-ettarr.c ---*/ -#line 5315 "packet-ansi_map-template.c" +#line 5313 "packet-ansi_map-template.c" }; diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c index 94051b71af..9ea3176adf 100644 --- a/epan/dissectors/packet-charging_ase.c +++ b/epan/dissectors/packet-charging_ase.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-charging_ase.h" @@ -118,7 +116,7 @@ static int hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff = -1; static int hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff = -1; /*--- End of included file: packet-charging_ase-hf.c ---*/ -#line 47 "packet-charging_ase-template.c" +#line 45 "packet-charging_ase-template.c" static int ett_charging_ase = -1; @@ -156,7 +154,7 @@ static gint ett_charging_ase_T_tariffControlIndicators_01 = -1; static gint ett_charging_ase_ChargingReferenceIdentification = -1; /*--- End of included file: packet-charging_ase-ett.c ---*/ -#line 50 "packet-charging_ase-template.c" +#line 48 "packet-charging_ase-template.c" static dissector_handle_t charging_ase_handle; @@ -842,7 +840,7 @@ int dissect_charging_ase_ChargingMessageType_PDU(tvbuff_t *tvb _U_, packet_info /*--- End of included file: packet-charging_ase-fn.c ---*/ -#line 54 "packet-charging_ase-template.c" +#line 52 "packet-charging_ase-template.c" static void dissect_charging_ase(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -1114,7 +1112,7 @@ proto_register_charging_ase(void) NULL, HFILL }}, /*--- End of included file: packet-charging_ase-hfarr.c ---*/ -#line 77 "packet-charging_ase-template.c" +#line 75 "packet-charging_ase-template.c" }; /* List of subtrees */ @@ -1155,7 +1153,7 @@ proto_register_charging_ase(void) &ett_charging_ase_ChargingReferenceIdentification, /*--- End of included file: packet-charging_ase-ettarr.c ---*/ -#line 83 "packet-charging_ase-template.c" +#line 81 "packet-charging_ase-template.c" }; proto_charging_ase = proto_register_protocol(PNAME, PSNAME, PFNAME); diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index a374d5e1aa..9d1a5e44b2 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-x509if.h" @@ -346,7 +344,7 @@ static int hf_cmip_T_daysOfWeek_friday = -1; static int hf_cmip_T_daysOfWeek_saturday = -1; /*--- End of included file: packet-cmip-hf.c ---*/ -#line 61 "packet-cmip-template.c" +#line 59 "packet-cmip-template.c" /* Initialize the subtree pointers */ static gint ett_cmip = -1; @@ -476,7 +474,7 @@ static gint ett_cmip_T_modificationList = -1; static gint ett_cmip_T_modificationList_item = -1; /*--- End of included file: packet-cmip-ett.c ---*/ -#line 65 "packet-cmip-template.c" +#line 63 "packet-cmip-template.c" static guint32 opcode; @@ -532,7 +530,7 @@ static const value_string cmip_error_code_vals[] = { /*--- End of included file: packet-cmip-table.c ---*/ -#line 69 "packet-cmip-template.c" +#line 67 "packet-cmip-template.c" static int opcode_type; #define OPCODE_INVOKE 1 @@ -643,7 +641,7 @@ static const char *objectclass_identifier_id; #define noInvokeId NULL /*--- End of included file: packet-cmip-val.h ---*/ -#line 91 "packet-cmip-template.c" +#line 89 "packet-cmip-template.c" /*--- Included file: packet-cmip-fn.c ---*/ #line 1 "packet-cmip-fn.c" @@ -4366,7 +4364,7 @@ static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-cmip-fn.c ---*/ -#line 92 "packet-cmip-template.c" +#line 90 "packet-cmip-template.c" @@ -5565,7 +5563,7 @@ void proto_register_cmip(void) { NULL, HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 186 "packet-cmip-template.c" +#line 184 "packet-cmip-template.c" }; /* List of subtrees */ @@ -5697,7 +5695,7 @@ void proto_register_cmip(void) { &ett_cmip_T_modificationList_item, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 192 "packet-cmip-template.c" +#line 190 "packet-cmip-template.c" }; /* Register protocol */ @@ -5782,7 +5780,7 @@ void proto_register_cmip(void) { /*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 201 "packet-cmip-template.c" +#line 199 "packet-cmip-template.c" oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); } diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index 44ad480ce4..07a540e80c 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -41,8 +41,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/oids.h> #include <epan/asn1.h> #include "packet-ber.h" @@ -241,7 +239,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1; static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1; /*--- End of included file: packet-cmp-hf.c ---*/ -#line 74 "packet-cmp-template.c" +#line 72 "packet-cmp-template.c" /* Initialize the subtree pointers */ static gint ett_cmp = -1; @@ -297,7 +295,7 @@ static gint ett_cmp_PollRepContent = -1; static gint ett_cmp_PollRepContent_item = -1; /*--- End of included file: packet-cmp-ett.c ---*/ -#line 78 "packet-cmp-template.c" +#line 76 "packet-cmp-template.c" static const char *object_identifier_id; @@ -1461,7 +1459,7 @@ static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-cmp-fn.c ---*/ -#line 83 "packet-cmp-template.c" +#line 81 "packet-cmp-template.c" static int dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx) @@ -2351,7 +2349,7 @@ void proto_register_cmp(void) { NULL, HFILL }}, /*--- End of included file: packet-cmp-hfarr.c ---*/ -#line 340 "packet-cmp-template.c" +#line 338 "packet-cmp-template.c" }; /* List of subtrees */ @@ -2409,7 +2407,7 @@ void proto_register_cmp(void) { &ett_cmp_PollRepContent_item, /*--- End of included file: packet-cmp-ettarr.c ---*/ -#line 346 "packet-cmp-template.c" +#line 344 "packet-cmp-template.c" }; module_t *cmp_module; @@ -2503,7 +2501,7 @@ void proto_reg_handoff_cmp(void) { /*--- End of included file: packet-cmp-dis-tab.c ---*/ -#line 418 "packet-cmp-template.c" +#line 416 "packet-cmp-template.c" inited = TRUE; } diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c index 9905839397..7099d19acd 100644 --- a/epan/dissectors/packet-crmf.c +++ b/epan/dissectors/packet-crmf.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-crmf.h" #include "packet-cms.h" @@ -135,7 +133,7 @@ static int hf_crmf_attributes = -1; /* Attributes */ static int hf_crmf_Attributes_item = -1; /* Attribute */ /*--- End of included file: packet-crmf-hf.c ---*/ -#line 50 "packet-crmf-template.c" +#line 48 "packet-crmf-template.c" /* Initialize the subtree pointers */ @@ -169,7 +167,7 @@ static gint ett_crmf_PrivateKeyInfo = -1; static gint ett_crmf_Attributes = -1; /*--- End of included file: packet-crmf-ett.c ---*/ -#line 53 "packet-crmf-template.c" +#line 51 "packet-crmf-template.c" static const char *object_identifier_id; @@ -865,7 +863,7 @@ static void dissect_EncKeyWithID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-crmf-fn.c ---*/ -#line 57 "packet-crmf-template.c" +#line 55 "packet-crmf-template.c" /*--- proto_register_crmf ----------------------------------------------*/ @@ -1186,7 +1184,7 @@ void proto_register_crmf(void) { "pkix1explicit.Attribute", HFILL }}, /*--- End of included file: packet-crmf-hfarr.c ---*/ -#line 69 "packet-crmf-template.c" +#line 67 "packet-crmf-template.c" }; /* List of subtrees */ @@ -1222,7 +1220,7 @@ void proto_register_crmf(void) { &ett_crmf_Attributes, /*--- End of included file: packet-crmf-ettarr.c ---*/ -#line 74 "packet-crmf-template.c" +#line 72 "packet-crmf-template.c" }; /* Register protocol */ @@ -1249,6 +1247,6 @@ void proto_reg_handoff_crmf(void) { /*--- End of included file: packet-crmf-dis-tab.c ---*/ -#line 89 "packet-crmf-template.c" +#line 87 "packet-crmf-template.c" } diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c index 3d01e9c2a3..f00cd81e31 100644 --- a/epan/dissectors/packet-dap.c +++ b/epan/dissectors/packet-dap.c @@ -41,8 +41,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" @@ -482,7 +480,7 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1; static int hf_dap_SearchControlOptions_searchFamily = -1; /*--- End of included file: packet-dap-hf.c ---*/ -#line 68 "packet-dap-template.c" +#line 66 "packet-dap-template.c" /* Initialize the subtree pointers */ static gint ett_dap = -1; @@ -661,7 +659,7 @@ static gint ett_dap_UpdateError = -1; static gint ett_dap_T_signedUpdateError = -1; /*--- End of included file: packet-dap-ett.c ---*/ -#line 72 "packet-dap-template.c" +#line 70 "packet-dap-template.c" /*--- Included file: packet-dap-val.h ---*/ @@ -686,7 +684,7 @@ static gint ett_dap_T_signedUpdateError = -1; #define id_errcode_dsaReferral 9 /*--- End of included file: packet-dap-val.h ---*/ -#line 74 "packet-dap-template.c" +#line 72 "packet-dap-template.c" /*--- Included file: packet-dap-table.c ---*/ @@ -724,7 +722,7 @@ static const value_string dap_err_code_string_vals[] = { /*--- End of included file: packet-dap-table.c ---*/ -#line 76 "packet-dap-template.c" +#line 74 "packet-dap-template.c" /*--- Included file: packet-dap-fn.c ---*/ @@ -4779,7 +4777,7 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-dap-fn.c ---*/ -#line 78 "packet-dap-template.c" +#line 76 "packet-dap-template.c" /*--- Included file: packet-dap-table11.c ---*/ @@ -4811,7 +4809,7 @@ static const ros_opr_t dap_opr_tab[] = { /*--- End of included file: packet-dap-table11.c ---*/ -#line 80 "packet-dap-template.c" +#line 78 "packet-dap-template.c" /*--- Included file: packet-dap-table21.c ---*/ #line 1 "packet-dap-table21.c" @@ -4840,7 +4838,7 @@ static const ros_err_t dap_err_tab[] = { /*--- End of included file: packet-dap-table21.c ---*/ -#line 81 "packet-dap-template.c" +#line 79 "packet-dap-template.c" static const ros_info_t dap_ros_info = { "DAP", @@ -6480,7 +6478,7 @@ void proto_register_dap(void) { NULL, HFILL }}, /*--- End of included file: packet-dap-hfarr.c ---*/ -#line 100 "packet-dap-template.c" +#line 98 "packet-dap-template.c" }; /* List of subtrees */ @@ -6661,7 +6659,7 @@ void proto_register_dap(void) { &ett_dap_T_signedUpdateError, /*--- End of included file: packet-dap-ettarr.c ---*/ -#line 106 "packet-dap-template.c" +#line 104 "packet-dap-template.c" }; module_t *dap_module; diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index ac9aa436b7..f7b4aa8633 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -41,8 +41,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" @@ -187,7 +185,7 @@ static int hf_disp_signedShadowError = -1; /* T_signedShadowError */ static int hf_disp_shadowError = -1; /* ShadowErrorData */ /*--- End of included file: packet-disp-hf.c ---*/ -#line 71 "packet-disp-template.c" +#line 69 "packet-disp-template.c" /* Initialize the subtree pointers */ static gint ett_disp = -1; @@ -250,7 +248,7 @@ static gint ett_disp_ShadowError = -1; static gint ett_disp_T_signedShadowError = -1; /*--- End of included file: packet-disp-ett.c ---*/ -#line 75 "packet-disp-template.c" +#line 73 "packet-disp-template.c" /*--- Included file: packet-disp-fn.c ---*/ @@ -1500,7 +1498,7 @@ static void dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-disp-fn.c ---*/ -#line 77 "packet-disp-template.c" +#line 75 "packet-disp-template.c" /* * Dissect DISP PDUs inside a ROS PDUs @@ -2061,7 +2059,7 @@ void proto_register_disp(void) { "disp.ShadowErrorData", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 205 "packet-disp-template.c" +#line 203 "packet-disp-template.c" }; /* List of subtrees */ @@ -2126,7 +2124,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 211 "packet-disp-template.c" +#line 209 "packet-disp-template.c" }; module_t *disp_module; @@ -2165,7 +2163,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 239 "packet-disp-template.c" +#line 237 "packet-disp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index d8c9248025..6efc4fd8d2 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -42,8 +42,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" @@ -270,7 +268,7 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1; static int hf_dop_GrantsAndDenials_denyInvoke = -1; /*--- End of included file: packet-dop-hf.c ---*/ -#line 70 "packet-dop-template.c" +#line 68 "packet-dop-template.c" /* Initialize the subtree pointers */ static gint ett_dop = -1; @@ -347,7 +345,7 @@ static gint ett_dop_T_basicLevels = -1; static gint ett_dop_GrantsAndDenials = -1; /*--- End of included file: packet-dop-ett.c ---*/ -#line 75 "packet-dop-template.c" +#line 73 "packet-dop-template.c" /* Dissector table */ static dissector_table_t dop_dissector_table; @@ -2046,7 +2044,7 @@ static void dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-dop-fn.c ---*/ -#line 88 "packet-dop-template.c" +#line 86 "packet-dop-template.c" static int call_dop_oid_callback(char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *col_info) @@ -2966,7 +2964,7 @@ void proto_register_dop(void) { NULL, HFILL }}, /*--- End of included file: packet-dop-hfarr.c ---*/ -#line 243 "packet-dop-template.c" +#line 241 "packet-dop-template.c" }; /* List of subtrees */ @@ -3045,7 +3043,7 @@ void proto_register_dop(void) { &ett_dop_GrantsAndDenials, /*--- End of included file: packet-dop-ettarr.c ---*/ -#line 250 "packet-dop-template.c" +#line 248 "packet-dop-template.c" }; module_t *dop_module; @@ -3101,7 +3099,7 @@ void proto_reg_handoff_dop(void) { /*--- End of included file: packet-dop-dis-tab.c ---*/ -#line 283 "packet-dop-template.c" +#line 281 "packet-dop-template.c" /* APPLICATION CONTEXT */ oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3"); diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index eca35ebf18..4bd440509d 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -41,8 +41,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" @@ -211,7 +209,7 @@ static int hf_dsp_signed = -1; /* BOOLEAN */ static int hf_dsp_other = -1; /* EXTERNAL */ /*--- End of included file: packet-dsp-hf.c ---*/ -#line 65 "packet-dsp-template.c" +#line 63 "packet-dsp-template.c" /* Initialize the subtree pointers */ static gint ett_dsp = -1; @@ -291,7 +289,7 @@ static gint ett_dsp_AuthenticationLevel = -1; static gint ett_dsp_T_basicLevels = -1; /*--- End of included file: packet-dsp-ett.c ---*/ -#line 69 "packet-dsp-template.c" +#line 67 "packet-dsp-template.c" /*--- Included file: packet-dsp-fn.c ---*/ @@ -1789,7 +1787,7 @@ static void dissect_DitBridgeKnowledge_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-dsp-fn.c ---*/ -#line 71 "packet-dsp-template.c" +#line 69 "packet-dsp-template.c" /* * Dissect X518 PDUs inside a ROS PDUs @@ -2547,7 +2545,7 @@ void proto_register_dsp(void) { "dsp.EXTERNAL", HFILL }}, /*--- End of included file: packet-dsp-hfarr.c ---*/ -#line 276 "packet-dsp-template.c" +#line 274 "packet-dsp-template.c" }; /* List of subtrees */ @@ -2629,7 +2627,7 @@ void proto_register_dsp(void) { &ett_dsp_T_basicLevels, /*--- End of included file: packet-dsp-ettarr.c ---*/ -#line 282 "packet-dsp-template.c" +#line 280 "packet-dsp-template.c" }; module_t *dsp_module; @@ -2670,7 +2668,7 @@ void proto_reg_handoff_dsp(void) { /*--- End of included file: packet-dsp-dis-tab.c ---*/ -#line 312 "packet-dsp-template.c" +#line 310 "packet-dsp-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index cab67d8387..b9964336d4 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -40,8 +40,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-ess.h" #include "packet-cms.h" @@ -126,7 +124,7 @@ static int hf_ess_issuer = -1; /* GeneralNames */ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ /*--- End of included file: packet-ess-hf.c ---*/ -#line 51 "packet-ess-template.c" +#line 49 "packet-ess-template.c" /*--- Included file: packet-ess-val.h ---*/ @@ -150,7 +148,7 @@ static int hf_ess_serialNumber = -1; /* CertificateSerialNumber */ #define id_sha256 "2.16.840.1.101.3.4.2.1" /*--- End of included file: packet-ess-val.h ---*/ -#line 53 "packet-ess-template.c" +#line 51 "packet-ess-template.c" /* Initialize the subtree pointers */ @@ -189,7 +187,7 @@ static gint ett_ess_ESSCertID = -1; static gint ett_ess_IssuerSerial = -1; /*--- End of included file: packet-ess-ett.c ---*/ -#line 56 "packet-ess-template.c" +#line 54 "packet-ess-template.c" static const char *object_identifier_id; @@ -957,7 +955,7 @@ static void dissect_SigningCertificateV2_PDU(tvbuff_t *tvb _U_, packet_info *pin /*--- End of included file: packet-ess-fn.c ---*/ -#line 60 "packet-ess-template.c" +#line 58 "packet-ess-template.c" /*--- proto_register_ess ----------------------------------------------*/ @@ -1237,7 +1235,7 @@ void proto_register_ess(void) { "x509af.CertificateSerialNumber", HFILL }}, /*--- End of included file: packet-ess-hfarr.c ---*/ -#line 71 "packet-ess-template.c" +#line 69 "packet-ess-template.c" }; /* List of subtrees */ @@ -1278,7 +1276,7 @@ void proto_register_ess(void) { &ett_ess_IssuerSerial, /*--- End of included file: packet-ess-ettarr.c ---*/ -#line 76 "packet-ess-template.c" +#line 74 "packet-ess-template.c" }; /* Register protocol */ @@ -1315,6 +1313,6 @@ void proto_reg_handoff_ess(void) { /*--- End of included file: packet-ess-dis-tab.c ---*/ -#line 91 "packet-ess-template.c" +#line 89 "packet-ess-template.c" } diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index a627bc0c7a..1cb4147f2b 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -45,8 +45,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ftam.h" @@ -484,7 +482,7 @@ static int hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS = -1; static int hf_ftam_Attribute_Names_read_private_use = -1; /*--- End of included file: packet-ftam-hf.c ---*/ -#line 60 "packet-ftam-template.c" +#line 58 "packet-ftam-template.c" /* Initialize the subtree pointers */ static gint ett_ftam = -1; @@ -655,7 +653,7 @@ static gint ett_ftam_Attribute_Names = -1; static gint ett_ftam_AE_title = -1; /*--- End of included file: packet-ftam-ett.c ---*/ -#line 64 "packet-ftam-template.c" +#line 62 "packet-ftam-template.c" /*--- Included file: packet-ftam-fn.c ---*/ @@ -4747,7 +4745,7 @@ dissect_ftam_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /*--- End of included file: packet-ftam-fn.c ---*/ -#line 66 "packet-ftam-template.c" +#line 64 "packet-ftam-template.c" /* * Dissect FTAM unstructured text @@ -6472,7 +6470,7 @@ void proto_register_ftam(void) { NULL, HFILL }}, /*--- End of included file: packet-ftam-hfarr.c ---*/ -#line 130 "packet-ftam-template.c" +#line 128 "packet-ftam-template.c" }; /* List of subtrees */ @@ -6645,7 +6643,7 @@ void proto_register_ftam(void) { &ett_ftam_AE_title, /*--- End of included file: packet-ftam-ettarr.c ---*/ -#line 136 "packet-ftam-template.c" +#line 134 "packet-ftam-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c index 7a2903108d..e3bc8ba5b2 100644 --- a/epan/dissectors/packet-gnm.c +++ b/epan/dissectors/packet-gnm.c @@ -43,7 +43,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> #include "packet-ber.h" #include "packet-cmip.h" #include "packet-gnm.h" @@ -228,7 +227,7 @@ static int hf_gnm_TransmissionCharacteristics_dCME = -1; static int hf_gnm_TransmissionCharacteristics_echoControl = -1; /*--- End of included file: packet-gnm-hf.c ---*/ -#line 51 "packet-gnm-template.c" +#line 50 "packet-gnm-template.c" /* Initialize the subtree pointers */ @@ -302,7 +301,7 @@ static gint ett_gnm_TpsInGtpList = -1; static gint ett_gnm_TransmissionCharacteristics = -1; /*--- End of included file: packet-gnm-ett.c ---*/ -#line 54 "packet-gnm-template.c" +#line 53 "packet-gnm-template.c" /*--- Included file: packet-gnm-fn.c ---*/ @@ -2030,7 +2029,7 @@ static void dissect_Version_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-gnm-fn.c ---*/ -#line 56 "packet-gnm-template.c" +#line 55 "packet-gnm-template.c" @@ -2730,7 +2729,7 @@ void proto_register_gnm(void) { NULL, HFILL }}, /*--- End of included file: packet-gnm-hfarr.c ---*/ -#line 83 "packet-gnm-template.c" +#line 82 "packet-gnm-template.c" }; /* List of subtrees */ @@ -2806,7 +2805,7 @@ void proto_register_gnm(void) { &ett_gnm_TransmissionCharacteristics, /*--- End of included file: packet-gnm-ettarr.c ---*/ -#line 88 "packet-gnm-template.c" +#line 87 "packet-gnm-template.c" }; /* Register protocol */ @@ -2895,7 +2894,7 @@ void proto_reg_handoff_gnm(void) { /*--- End of included file: packet-gnm-dis-tab.c ---*/ -#line 103 "packet-gnm-template.c" +#line 102 "packet-gnm-template.c" /* Wrapper to call CMIP */ register_ber_oid_dissector("0.0.13.3100.0.7.9", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientConnection(9)"); register_ber_oid_dissector("0.0.13.3100.0.7.10", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientTrail(10)"); diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c index 2d08f089f6..2dc77b4620 100644 --- a/epan/dissectors/packet-goose.c +++ b/epan/dissectors/packet-goose.c @@ -42,8 +42,6 @@ #include <epan/expert.h> #include <epan/nstime.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" @@ -119,7 +117,7 @@ static int hf_goose_bcd = -1; /* INTEGER */ static int hf_goose_booleanArray = -1; /* BIT_STRING */ /*--- End of included file: packet-goose-hf.c ---*/ -#line 54 "packet-goose-template.c" +#line 52 "packet-goose-template.c" /* Initialize the subtree pointers */ static int ett_goose = -1; @@ -146,7 +144,7 @@ static gint ett_goose_SEQUENCE_OF_Data = -1; static gint ett_goose_Data = -1; /*--- End of included file: packet-goose-ett.c ---*/ -#line 59 "packet-goose-template.c" +#line 57 "packet-goose-template.c" /*--- Included file: packet-goose-fn.c ---*/ @@ -688,7 +686,7 @@ dissect_goose_GOOSEpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-goose-fn.c ---*/ -#line 61 "packet-goose-template.c" +#line 59 "packet-goose-template.c" /* * Dissect GOOSE PDUs inside a PPDU. @@ -991,7 +989,7 @@ void proto_register_goose(void) { "goose.BIT_STRING", HFILL }}, /*--- End of included file: packet-goose-hfarr.c ---*/ -#line 135 "packet-goose-template.c" +#line 133 "packet-goose-template.c" }; /* List of subtrees */ @@ -1019,7 +1017,7 @@ void proto_register_goose(void) { &ett_goose_Data, /*--- End of included file: packet-goose-ettarr.c ---*/ -#line 141 "packet-goose-template.c" +#line 139 "packet-goose-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c index 48953f94e1..44fb5c077b 100644 --- a/epan/dissectors/packet-h235.c +++ b/epan/dissectors/packet-h235.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #include "packet-h235.h" #include "packet-h225.h" @@ -166,7 +164,7 @@ static int hf_h235_fecBeforeSrtp = -1; /* NULL */ static int hf_h235_fecAfterSrtp = -1; /* NULL */ /*--- End of included file: packet-h235-hf.c ---*/ -#line 56 "packet-h235-template.c" +#line 54 "packet-h235-template.c" /* Initialize the subtree pointers */ @@ -206,7 +204,7 @@ static gint ett_h235_SEQUENCE_OF_GenericData = -1; static gint ett_h235_FecOrder = -1; /*--- End of included file: packet-h235-ett.c ---*/ -#line 59 "packet-h235-template.c" +#line 57 "packet-h235-template.c" static int @@ -1052,7 +1050,7 @@ static int dissect_SrtpCryptoCapability_PDU(tvbuff_t *tvb _U_, packet_info *pinf /*--- End of included file: packet-h235-fn.c ---*/ -#line 68 "packet-h235-template.c" +#line 66 "packet-h235-template.c" /*--- proto_register_h235 ----------------------------------------------*/ @@ -1469,7 +1467,7 @@ void proto_register_h235(void) { "h235.NULL", HFILL }}, /*--- End of included file: packet-h235-hfarr.c ---*/ -#line 76 "packet-h235-template.c" +#line 74 "packet-h235-template.c" }; /* List of subtrees */ @@ -1511,7 +1509,7 @@ void proto_register_h235(void) { &ett_h235_FecOrder, /*--- End of included file: packet-h235-ettarr.c ---*/ -#line 81 "packet-h235-template.c" +#line 79 "packet-h235-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c index a5d804210a..e299706bdb 100644 --- a/epan/dissectors/packet-h282.c +++ b/epan/dissectors/packet-h282.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #define PNAME "H.282 Remote Device Control" @@ -488,7 +486,7 @@ static int hf_h282_deviceEventNotifyIndication = -1; /* DeviceEventNotifyIndica static int hf_h282_nonStandardIndication = -1; /* NonStandardPDU */ /*--- End of included file: packet-h282-hf.c ---*/ -#line 46 "packet-h282-template.c" +#line 44 "packet-h282-template.c" /* Initialize the subtree pointers */ static int ett_h282 = -1; @@ -640,7 +638,7 @@ static gint ett_h282_ResponsePDU = -1; static gint ett_h282_IndicationPDU = -1; /*--- End of included file: packet-h282-ett.c ---*/ -#line 50 "packet-h282-template.c" +#line 48 "packet-h282-template.c" /* Dissectors */ @@ -4399,7 +4397,7 @@ static int dissect_RDCPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h282-fn.c ---*/ -#line 56 "packet-h282-template.c" +#line 54 "packet-h282-template.c" static int dissect_h282(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -6157,7 +6155,7 @@ void proto_register_h282(void) { "h282.NonStandardPDU", HFILL }}, /*--- End of included file: packet-h282-hfarr.c ---*/ -#line 77 "packet-h282-template.c" +#line 75 "packet-h282-template.c" }; /* List of subtrees */ @@ -6311,7 +6309,7 @@ void proto_register_h282(void) { &ett_h282_IndicationPDU, /*--- End of included file: packet-h282-ettarr.c ---*/ -#line 83 "packet-h282-template.c" +#line 81 "packet-h282-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c index 9acf91ac3f..76419c7ffc 100644 --- a/epan/dissectors/packet-h283.c +++ b/epan/dissectors/packet-h283.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #define PNAME "H.283 Logical Channel Transport" @@ -87,7 +85,7 @@ static int hf_h283_deviceListResp = -1; /* T_deviceListResp */ static int hf_h283_deviceChange = -1; /* NULL */ /*--- End of included file: packet-h283-hf.c ---*/ -#line 46 "packet-h283-template.c" +#line 44 "packet-h283-template.c" /* Initialize the subtree pointers */ static int ett_h283 = -1; @@ -110,7 +108,7 @@ static gint ett_h283_LCTIndication = -1; static gint ett_h283_NonStandardMessage = -1; /*--- End of included file: packet-h283-ett.c ---*/ -#line 50 "packet-h283-template.c" +#line 48 "packet-h283-template.c" /* Subdissectors */ static dissector_handle_t rdc_pdu_handle; @@ -568,7 +566,7 @@ static int dissect_LCTPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t /*--- End of included file: packet-h283-fn.c ---*/ -#line 59 "packet-h283-template.c" +#line 57 "packet-h283-template.c" static int dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -724,7 +722,7 @@ void proto_register_h283(void) { "h283.NULL", HFILL }}, /*--- End of included file: packet-h283-hfarr.c ---*/ -#line 82 "packet-h283-template.c" +#line 80 "packet-h283-template.c" }; /* List of subtrees */ @@ -749,7 +747,7 @@ void proto_register_h283(void) { &ett_h283_NonStandardMessage, /*--- End of included file: packet-h283-ettarr.c ---*/ -#line 88 "packet-h283-template.c" +#line 86 "packet-h283-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c index 988999162d..cd7d58e789 100644 --- a/epan/dissectors/packet-h323.c +++ b/epan/dissectors/packet-h323.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #include "packet-h225.h" #include "packet-h323.h" @@ -132,7 +130,7 @@ static int hf_h323_timeToLive = -1; /* TimeToLive */ static int hf_h323_includeFastStart = -1; /* NULL */ /*--- End of included file: packet-h323-hf.c ---*/ -#line 95 "packet-h323-template.c" +#line 93 "packet-h323-template.c" /* Initialize the subtree pointers */ @@ -153,7 +151,7 @@ static gint ett_h323_T_fastStart = -1; static gint ett_h323_StatusInquiry_RD = -1; /*--- End of included file: packet-h323-ett.c ---*/ -#line 98 "packet-h323-template.c" +#line 96 "packet-h323-template.c" /*--- Included file: packet-h323-fn.c ---*/ @@ -444,7 +442,7 @@ static int dissect_RobustnessData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h323-fn.c ---*/ -#line 100 "packet-h323-template.c" +#line 98 "packet-h323-template.c" /*--- proto_register_h323 ----------------------------------------------*/ void proto_register_h323(void) { @@ -568,7 +566,7 @@ void proto_register_h323(void) { "h323.NULL", HFILL }}, /*--- End of included file: packet-h323-hfarr.c ---*/ -#line 107 "packet-h323-template.c" +#line 105 "packet-h323-template.c" }; /* List of subtrees */ @@ -591,7 +589,7 @@ void proto_register_h323(void) { &ett_h323_StatusInquiry_RD, /*--- End of included file: packet-h323-ettarr.c ---*/ -#line 112 "packet-h323-template.c" +#line 110 "packet-h323-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index 1496aff104..8d3570e7ba 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -35,8 +35,6 @@ # include "config.h" #endif -#include <string.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/asn1.h> @@ -75,7 +73,7 @@ static int hf_h450_ros_returnResultProblem = -1; /* ReturnResultProblem */ static int hf_h450_ros_returnErrorProblem = -1; /* ReturnErrorProblem */ /*--- End of included file: packet-h450-ros-hf.c ---*/ -#line 46 "packet-h450-ros-template.c" +#line 44 "packet-h450-ros-template.c" /* Initialize the subtree pointers */ @@ -91,7 +89,7 @@ static gint ett_h450_ros_Reject = -1; static gint ett_h450_ros_T_problem = -1; /*--- End of included file: packet-h450-ros-ett.c ---*/ -#line 49 "packet-h450-ros-template.c" +#line 47 "packet-h450-ros-template.c" /* Preferences */ @@ -579,7 +577,7 @@ dissect_h450_ros_ROS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr /*--- End of included file: packet-h450-ros-fn.c ---*/ -#line 76 "packet-h450-ros-template.c" +#line 74 "packet-h450-ros-template.c" /*--- proto_register_h450_ros -----------------------------------------------*/ void proto_register_h450_ros(void) { @@ -671,7 +669,7 @@ void proto_register_h450_ros(void) { "h450_ros.ReturnErrorProblem", HFILL }}, /*--- End of included file: packet-h450-ros-hfarr.c ---*/ -#line 83 "packet-h450-ros-template.c" +#line 81 "packet-h450-ros-template.c" }; /* List of subtrees */ @@ -689,7 +687,7 @@ void proto_register_h450_ros(void) { &ett_h450_ros_T_problem, /*--- End of included file: packet-h450-ros-ettarr.c ---*/ -#line 88 "packet-h450-ros-template.c" +#line 86 "packet-h450-ros-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c index 6c62f89aa3..1e5b3b6155 100644 --- a/epan/dissectors/packet-h450.c +++ b/epan/dissectors/packet-h450.c @@ -43,7 +43,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <epan/asn1.h> #include "packet-per.h" @@ -448,7 +447,7 @@ static int hf_h450_12_ssMWICallbackCall = -1; /* NULL */ static int hf_h450_12_ssCISilentMonitorPermitted = -1; /* NULL */ /*--- End of included file: packet-h450-hf.c ---*/ -#line 55 "packet-h450-template.c" +#line 54 "packet-h450-template.c" /* Initialize the subtree pointers */ @@ -626,7 +625,7 @@ static gint ett_h450_12_FeatureValues = -1; static gint ett_h450_12_FeatureControl = -1; /*--- End of included file: packet-h450-ett.c ---*/ -#line 58 "packet-h450-template.c" +#line 57 "packet-h450-template.c" static const value_string h450_str_operation[] = { @@ -729,7 +728,7 @@ static const value_string h450_str_operation[] = { { 85, "cmnInform" }, /*--- End of included file: packet-h450-table10.c ---*/ -#line 61 "packet-h450-template.c" +#line 60 "packet-h450-template.c" { 0, NULL} }; @@ -817,7 +816,7 @@ static const value_string h450_str_error[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table20.c ---*/ -#line 66 "packet-h450-template.c" +#line 65 "packet-h450-template.c" { 0, NULL} }; @@ -4482,7 +4481,7 @@ static int dissect_h450_12_CmnArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-h450-fn.c ---*/ -#line 75 "packet-h450-template.c" +#line 74 "packet-h450-template.c" typedef struct _h450_op_t { gint32 opcode; @@ -4591,7 +4590,7 @@ static const h450_op_t h450_op_tab[] = { /* cmnInform */ { 85, dissect_h450_12_CmnArg_PDU, NULL }, /*--- End of included file: packet-h450-table11.c ---*/ -#line 84 "packet-h450-template.c" +#line 83 "packet-h450-template.c" }; typedef struct _h450_err_t { @@ -4683,7 +4682,7 @@ static const h450_err_t h450_err_tab[] = { /* Unknown or empty loop list ERROR */ /*--- End of included file: packet-h450-table21.c ---*/ -#line 93 "packet-h450-template.c" +#line 92 "packet-h450-template.c" }; static const h450_op_t *get_op(gint32 opcode) { @@ -6276,7 +6275,7 @@ void proto_register_h450(void) { "h450_12.NULL", HFILL }}, /*--- End of included file: packet-h450-hfarr.c ---*/ -#line 253 "packet-h450-template.c" +#line 252 "packet-h450-template.c" }; /* List of subtrees */ @@ -6456,7 +6455,7 @@ void proto_register_h450(void) { &ett_h450_12_FeatureControl, /*--- End of included file: packet-h450-ettarr.c ---*/ -#line 258 "packet-h450-template.c" +#line 257 "packet-h450-template.c" }; diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c index ae9b254a0c..ea4d0582b9 100644 --- a/epan/dissectors/packet-h501.c +++ b/epan/dissectors/packet-h501.c @@ -41,8 +41,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-tpkt.h" #include "packet-per.h" #include "packet-h225.h" @@ -309,7 +307,7 @@ static int hf_h501_releaseCompleteReason = -1; /* ReleaseCompleteReason */ static int hf_h501_causeIE = -1; /* INTEGER_1_65535 */ /*--- End of included file: packet-h501-hf.c ---*/ -#line 50 "packet-h501-template.c" +#line 48 "packet-h501-template.c" /* Initialize the subtree pointers */ static int ett_h501 = -1; @@ -417,7 +415,7 @@ static gint ett_h501_Role = -1; static gint ett_h501_TerminationCause = -1; /*--- End of included file: packet-h501-ett.c ---*/ -#line 54 "packet-h501-template.c" +#line 52 "packet-h501-template.c" /* Dissectors */ static dissector_handle_t h501_pdu_handle; @@ -2519,7 +2517,7 @@ static int dissect_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-h501-fn.c ---*/ -#line 66 "packet-h501-template.c" +#line 64 "packet-h501-template.c" static int dissect_h501_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -3560,7 +3558,7 @@ void proto_register_h501(void) { "h501.INTEGER_1_65535", HFILL }}, /*--- End of included file: packet-h501-hfarr.c ---*/ -#line 102 "packet-h501-template.c" +#line 100 "packet-h501-template.c" }; /* List of subtrees */ @@ -3670,7 +3668,7 @@ void proto_register_h501(void) { &ett_h501_TerminationCause, /*--- End of included file: packet-h501-ettarr.c ---*/ -#line 108 "packet-h501-template.c" +#line 106 "packet-h501-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 138a3b84de..e671bf904e 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -44,8 +44,6 @@ #include <epan/expert.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-inap.h" #include "packet-q931.h" @@ -461,7 +459,7 @@ static int proto_inap = -1; #define noInvokeId NULL /*--- End of included file: packet-inap-val.h ---*/ -#line 59 "packet-inap-template.c" +#line 57 "packet-inap-template.c" /*--- Included file: packet-inap-hf.c ---*/ @@ -1027,7 +1025,7 @@ static int hf_inap_present = -1; /* INTEGER */ static int hf_inap_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-inap-hf.c ---*/ -#line 61 "packet-inap-template.c" +#line 59 "packet-inap-template.c" #define MAX_SSN 254 static range_t *global_ssn_range; @@ -1289,7 +1287,7 @@ static gint ett_inap_T_problem_01 = -1; static gint ett_inap_InvokeId = -1; /*--- End of included file: packet-inap-ett.c ---*/ -#line 82 "packet-inap-template.c" +#line 80 "packet-inap-template.c" /*--- Included file: packet-inap-table.c ---*/ @@ -1415,7 +1413,7 @@ static const value_string inap_err_code_string_vals[] = { /*--- End of included file: packet-inap-table.c ---*/ -#line 84 "packet-inap-template.c" +#line 82 "packet-inap-template.c" const value_string inap_general_problem_strings[] = { {0,"General Problem Unrecognized Component"}, @@ -8966,7 +8964,7 @@ static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-inap-fn.c ---*/ -#line 98 "packet-inap-template.c" +#line 96 "packet-inap-template.c" /* TC-Invokable OPERATION ::= {activateServiceFiltering | activityTest | analysedInformation | @@ -9322,7 +9320,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a /*--- End of included file: packet-inap-table2.c ---*/ -#line 119 "packet-inap-template.c" +#line 117 "packet-inap-template.c" static guint8 inap_pdu_type = 0; @@ -11639,7 +11637,7 @@ void proto_register_inap(void) { "inap.InvokeId_present", HFILL }}, /*--- End of included file: packet-inap-hfarr.c ---*/ -#line 195 "packet-inap-template.c" +#line 193 "packet-inap-template.c" }; @@ -11893,7 +11891,7 @@ void proto_register_inap(void) { &ett_inap_InvokeId, /*--- End of included file: packet-inap-ettarr.c ---*/ -#line 208 "packet-inap-template.c" +#line 206 "packet-inap-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c index 6784664fcb..953619b808 100644 --- a/epan/dissectors/packet-logotypecertextn.c +++ b/epan/dissectors/packet-logotypecertextn.c @@ -38,8 +38,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include "packet-ber.h" #include "packet-logotypecertextn.h" #include "packet-x509af.h" @@ -96,7 +94,7 @@ static int hf_logotypecertextn_hashAlg = -1; /* AlgorithmIdentifier */ static int hf_logotypecertextn_hashValue = -1; /* OCTET_STRING */ /*--- End of included file: packet-logotypecertextn-hf.c ---*/ -#line 46 "packet-logotypecertextn-template.c" +#line 44 "packet-logotypecertextn-template.c" /* Initialize the subtree pointers */ @@ -123,7 +121,7 @@ static gint ett_logotypecertextn_T_refStructURI = -1; static gint ett_logotypecertextn_HashAlgAndValue = -1; /*--- End of included file: packet-logotypecertextn-ett.c ---*/ -#line 49 "packet-logotypecertextn-template.c" +#line 47 "packet-logotypecertextn-template.c" @@ -520,7 +518,7 @@ static void dissect_LogotypeExtn_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-logotypecertextn-fn.c ---*/ -#line 52 "packet-logotypecertextn-template.c" +#line 50 "packet-logotypecertextn-template.c" /*--- proto_register_logotypecertextn ----------------------------------------------*/ @@ -697,7 +695,7 @@ void proto_register_logotypecertextn(void) { "logotypecertextn.OCTET_STRING", HFILL }}, /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/ -#line 60 "packet-logotypecertextn-template.c" +#line 58 "packet-logotypecertextn-template.c" }; /* List of subtrees */ @@ -726,7 +724,7 @@ void proto_register_logotypecertextn(void) { &ett_logotypecertextn_HashAlgAndValue, /*--- End of included file: packet-logotypecertextn-ettarr.c ---*/ -#line 65 "packet-logotypecertextn-template.c" +#line 63 "packet-logotypecertextn-template.c" }; /* Register protocol */ @@ -750,6 +748,6 @@ void proto_reg_handoff_logotypecertextn(void) { /*--- End of included file: packet-logotypecertextn-dis-tab.c ---*/ -#line 80 "packet-logotypecertextn-template.c" +#line 78 "packet-logotypecertextn-template.c" } diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c index c9568be09a..77fdcf88cc 100644 --- a/epan/dissectors/packet-lte-rrc.c +++ b/epan/dissectors/packet-lte-rrc.c @@ -42,8 +42,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-per.h" #include "packet-rrc.h" @@ -92,7 +90,7 @@ static guint32 lte_rrc_rat_type_value = -1; #define maxReestabInfo 32 /*--- End of included file: packet-lte-rrc-val.h ---*/ -#line 54 "packet-lte-rrc-template.c" +#line 52 "packet-lte-rrc-template.c" /* Initialize the protocol and registered fields */ static int proto_lte_rrc = -1; @@ -1244,7 +1242,7 @@ static int hf_lte_rrc_key_eNodeB_Star = -1; /* Key_eNodeB_Star */ static int hf_lte_rrc_ue_InactiveTime = -1; /* T_ue_InactiveTime */ /*--- End of included file: packet-lte-rrc-hf.c ---*/ -#line 59 "packet-lte-rrc-template.c" +#line 57 "packet-lte-rrc-template.c" /* Initialize the subtree pointers */ static int ett_lte_rrc = -1; @@ -1860,7 +1858,7 @@ static gint ett_lte_rrc_AdditionalReestabInfo = -1; static gint ett_lte_rrc_RRM_Config = -1; /*--- End of included file: packet-lte-rrc-ett.c ---*/ -#line 64 "packet-lte-rrc-template.c" +#line 62 "packet-lte-rrc-template.c" /* Forward declarations */ static int dissect_DL_DCCH_Message_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_); @@ -17531,7 +17529,7 @@ static int dissect_UERadioAccessCapabilityInformation_PDU(tvbuff_t *tvb _U_, pac /*--- End of included file: packet-lte-rrc-fn.c ---*/ -#line 70 "packet-lte-rrc-template.c" +#line 68 "packet-lte-rrc-template.c" static void dissect_lte_rrc_DL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -22129,7 +22127,7 @@ void proto_register_lte_rrc(void) { "lte_rrc.T_ue_InactiveTime", HFILL }}, /*--- End of included file: packet-lte-rrc-hfarr.c ---*/ -#line 95 "packet-lte-rrc-template.c" +#line 93 "packet-lte-rrc-template.c" }; /* List of subtrees */ @@ -22746,7 +22744,7 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_RRM_Config, /*--- End of included file: packet-lte-rrc-ettarr.c ---*/ -#line 101 "packet-lte-rrc-template.c" +#line 99 "packet-lte-rrc-template.c" }; @@ -22774,7 +22772,7 @@ void proto_register_lte_rrc(void) { /*--- End of included file: packet-lte-rrc-dis-reg.c ---*/ -#line 113 "packet-lte-rrc-template.c" +#line 111 "packet-lte-rrc-template.c" } diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 7950abbb4f..fd5ca19d4c 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -42,8 +42,6 @@ #include <epan/expert.h> #include <epan/nstime.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-mms.h" @@ -727,7 +725,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 51 "packet-mms-template.c" +#line 49 "packet-mms-template.c" /* Initialize the subtree pointers */ static gint ett_mms = -1; @@ -944,7 +942,7 @@ static gint ett_mms_DirectoryEntry = -1; static gint ett_mms_FileAttributes = -1; /*--- End of included file: packet-mms-ett.c ---*/ -#line 55 "packet-mms-template.c" +#line 53 "packet-mms-template.c" /*--- Included file: packet-mms-fn.c ---*/ @@ -7056,7 +7054,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, /*--- End of included file: packet-mms-fn.c ---*/ -#line 57 "packet-mms-template.c" +#line 55 "packet-mms-template.c" /* * Dissect MMS PDUs inside a PPDU. @@ -9765,7 +9763,7 @@ void proto_register_mms(void) { NULL, HFILL }}, /*--- End of included file: packet-mms-hfarr.c ---*/ -#line 97 "packet-mms-template.c" +#line 95 "packet-mms-template.c" }; /* List of subtrees */ @@ -9984,7 +9982,7 @@ void proto_register_mms(void) { &ett_mms_FileAttributes, /*--- End of included file: packet-mms-ettarr.c ---*/ -#line 103 "packet-mms-template.c" +#line 101 "packet-mms-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 8e7b65f0ed..f6f93d8980 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -34,8 +34,6 @@ # include "config.h" #endif -#include <string.h> - #include <glib.h> #include <epan/packet.h> @@ -72,7 +70,7 @@ static int hf_mpeg_audio_track = -1; /* INTEGER_0_255 */ static int hf_mpeg_audio_genre = -1; /* T_genre */ /*--- End of included file: packet-mpeg-audio-hf.c ---*/ -#line 41 "packet-mpeg-audio-template.c" +#line 39 "packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-ett.c ---*/ #line 1 "packet-mpeg-audio-ett.c" @@ -80,7 +78,7 @@ static gint ett_mpeg_audio_Audio = -1; static gint ett_mpeg_audio_ID3v1 = -1; /*--- End of included file: packet-mpeg-audio-ett.c ---*/ -#line 42 "packet-mpeg-audio-template.c" +#line 40 "packet-mpeg-audio-template.c" /*--- Included file: packet-mpeg-audio-fn.c ---*/ #line 1 "packet-mpeg-audio-fn.c" @@ -451,7 +449,7 @@ dissect_mpeg_audio_ID3v1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /*--- End of included file: packet-mpeg-audio-fn.c ---*/ -#line 43 "packet-mpeg-audio-template.c" +#line 41 "packet-mpeg-audio-template.c" static int proto_mpeg_audio = -1; @@ -662,7 +660,7 @@ proto_register_mpeg_audio(void) "mpeg_audio.T_genre", HFILL }}, /*--- End of included file: packet-mpeg-audio-hfarr.c ---*/ -#line 161 "packet-mpeg-audio-template.c" +#line 159 "packet-mpeg-audio-template.c" { &hf_mpeg_audio_data, { "Data", "mpeg.audio.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -686,7 +684,7 @@ proto_register_mpeg_audio(void) &ett_mpeg_audio_ID3v1, /*--- End of included file: packet-mpeg-audio-ettarr.c ---*/ -#line 178 "packet-mpeg-audio-template.c" +#line 176 "packet-mpeg-audio-template.c" }; proto_mpeg_audio = proto_register_protocol( diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 9b87526021..08be1cdee8 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -35,8 +35,6 @@ # include "config.h" #endif -#include <string.h> - #include <glib.h> #include <epan/packet.h> @@ -99,7 +97,7 @@ static int hf_mpeg_pes_frame_type = -1; /* T_frame_type */ static int hf_mpeg_pes_vbv_delay = -1; /* BIT_STRING_SIZE_16 */ /*--- End of included file: packet-mpeg-pes-hf.c ---*/ -#line 40 "packet-mpeg-pes-template.c" +#line 38 "packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-ett.c ---*/ #line 1 "packet-mpeg-pes-ett.c" @@ -111,7 +109,7 @@ static gint ett_mpeg_pes_Group_of_pictures = -1; static gint ett_mpeg_pes_Picture = -1; /*--- End of included file: packet-mpeg-pes-ett.c ---*/ -#line 41 "packet-mpeg-pes-template.c" +#line 39 "packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-fn.c ---*/ #line 1 "packet-mpeg-pes-fn.c" @@ -479,7 +477,7 @@ dissect_mpeg_pes_Picture(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /*--- End of included file: packet-mpeg-pes-fn.c ---*/ -#line 42 "packet-mpeg-pes-template.c" +#line 40 "packet-mpeg-pes-template.c" static int proto_mpeg = -1; static int proto_mpeg_pes = -1; @@ -1226,7 +1224,7 @@ proto_register_mpeg_pes(void) "mpeg_pes.BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 584 "packet-mpeg-pes-template.c" +#line 582 "packet-mpeg-pes-template.c" { &hf_mpeg_pes_pack_header, { "Pack header", "mpeg-pes.pack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1344,7 +1342,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 691 "packet-mpeg-pes-template.c" +#line 689 "packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, &ett_mpeg_pes_trick_mode diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 09efbcfeee..156f001406 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -38,7 +38,6 @@ #endif #include <glib.h> -#include <string.h> #include <epan/packet.h> #include <epan/sctpppids.h> @@ -1274,7 +1273,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-nbap-val.h ---*/ -#line 51 "packet-nbap-template.c" +#line 50 "packet-nbap-template.c" /* Initialize the protocol and registered fields */ static int proto_nbap = -1; @@ -4525,7 +4524,7 @@ static int hf_nbap_RACH_SubChannelNumbers_subCh1 = -1; static int hf_nbap_RACH_SubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-nbap-hf.c ---*/ -#line 58 "packet-nbap-template.c" +#line 57 "packet-nbap-template.c" /* Initialize the subtree pointers */ static int ett_nbap = -1; @@ -6142,7 +6141,7 @@ static gint ett_nbap_UnsuccessfulOutcome = -1; static gint ett_nbap_Outcome = -1; /*--- End of included file: packet-nbap-ett.c ---*/ -#line 64 "packet-nbap-template.c" +#line 63 "packet-nbap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -51677,7 +51676,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-nbap-fn.c ---*/ -#line 85 "packet-nbap-template.c" +#line 84 "packet-nbap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -64695,7 +64694,7 @@ void proto_register_nbap(void) { NULL, HFILL }}, /*--- End of included file: packet-nbap-hfarr.c ---*/ -#line 146 "packet-nbap-template.c" +#line 145 "packet-nbap-template.c" }; /* List of subtrees */ @@ -66313,7 +66312,7 @@ void proto_register_nbap(void) { &ett_nbap_Outcome, /*--- End of included file: packet-nbap-ettarr.c ---*/ -#line 153 "packet-nbap-template.c" +#line 152 "packet-nbap-template.c" }; @@ -67418,7 +67417,7 @@ proto_reg_handoff_nbap(void) /*--- End of included file: packet-nbap-dis-tab.c ---*/ -#line 186 "packet-nbap-template.c" +#line 185 "packet-nbap-template.c" } diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c index 654bb09feb..af2f430a9a 100644 --- a/epan/dissectors/packet-ns_cert_exts.c +++ b/epan/dissectors/packet-ns_cert_exts.c @@ -38,8 +38,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include "packet-ber.h" #define PNAME "NetScape Certificate Extensions" @@ -69,7 +67,7 @@ static int hf_ns_cert_exts_CertType_smime_ca = -1; static int hf_ns_cert_exts_CertType_object_signing_ca = -1; /*--- End of included file: packet-ns_cert_exts-hf.c ---*/ -#line 44 "packet-ns_cert_exts-template.c" +#line 42 "packet-ns_cert_exts-template.c" /* Initialize the subtree pointers */ @@ -78,7 +76,7 @@ static int hf_ns_cert_exts_CertType_object_signing_ca = -1; static gint ett_ns_cert_exts_CertType = -1; /*--- End of included file: packet-ns_cert_exts-ett.c ---*/ -#line 47 "packet-ns_cert_exts-template.c" +#line 45 "packet-ns_cert_exts-template.c" /*--- Included file: packet-ns_cert_exts-fn.c ---*/ @@ -226,7 +224,7 @@ static void dissect_CertType_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-ns_cert_exts-fn.c ---*/ -#line 49 "packet-ns_cert_exts-template.c" +#line 47 "packet-ns_cert_exts-template.c" /*--- proto_register_ns_cert_exts -------------------------------------------*/ @@ -299,7 +297,7 @@ void proto_register_ns_cert_exts(void) { NULL, HFILL }}, /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/ -#line 57 "packet-ns_cert_exts-template.c" +#line 55 "packet-ns_cert_exts-template.c" }; /* List of subtrees */ @@ -310,7 +308,7 @@ void proto_register_ns_cert_exts(void) { &ett_ns_cert_exts_CertType, /*--- End of included file: packet-ns_cert_exts-ettarr.c ---*/ -#line 62 "packet-ns_cert_exts-template.c" +#line 60 "packet-ns_cert_exts-template.c" }; /* Register protocol */ @@ -339,6 +337,6 @@ void proto_reg_handoff_ns_cert_exts(void) { /*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/ -#line 77 "packet-ns_cert_exts-template.c" +#line 75 "packet-ns_cert_exts-template.c" } diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 5889d5535e..606f2b5b66 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -38,7 +38,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <asn1.h> #include "packet-ber.h" @@ -111,7 +110,7 @@ static int hf_ocsp_crlNum = -1; /* INTEGER */ static int hf_ocsp_crlTime = -1; /* GeneralizedTime */ /*--- End of included file: packet-ocsp-hf.c ---*/ -#line 51 "packet-ocsp-template.c" +#line 50 "packet-ocsp-template.c" /* Initialize the subtree pointers */ static gint ett_ocsp = -1; @@ -139,7 +138,7 @@ static gint ett_ocsp_ServiceLocator = -1; static gint ett_ocsp_CrlID = -1; /*--- End of included file: packet-ocsp-ett.c ---*/ -#line 55 "packet-ocsp-template.c" +#line 54 "packet-ocsp-template.c" static const char *responseType_id; @@ -649,7 +648,7 @@ static void dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr /*--- End of included file: packet-ocsp-fn.c ---*/ -#line 60 "packet-ocsp-template.c" +#line 59 "packet-ocsp-template.c" static int @@ -913,7 +912,7 @@ void proto_register_ocsp(void) { "ocsp.GeneralizedTime", HFILL }}, /*--- End of included file: packet-ocsp-hfarr.c ---*/ -#line 115 "packet-ocsp-template.c" +#line 114 "packet-ocsp-template.c" }; /* List of subtrees */ @@ -943,7 +942,7 @@ void proto_register_ocsp(void) { &ett_ocsp_CrlID, /*--- End of included file: packet-ocsp-ettarr.c ---*/ -#line 121 "packet-ocsp-template.c" +#line 120 "packet-ocsp-template.c" }; /* Register protocol */ @@ -978,6 +977,6 @@ void proto_reg_handoff_ocsp(void) { /*--- End of included file: packet-ocsp-dis-tab.c ---*/ -#line 144 "packet-ocsp-template.c" +#line 143 "packet-ocsp-template.c" } diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index e5b360e85f..88bb1a716c 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -41,9 +41,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <stdio.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" @@ -126,7 +123,7 @@ static int proto_p7 = -1; #define ub_ua_restrictions 16 /*--- End of included file: packet-p7-val.h ---*/ -#line 63 "packet-p7-template.c" +#line 60 "packet-p7-template.c" /*--- Included file: packet-p7-hf.c ---*/ @@ -498,7 +495,7 @@ static int hf_p7_T_entry_class_problem_entry_class_not_subscribed = -1; static int hf_p7_T_entry_class_problem_inappropriate_entry_class = -1; /*--- End of included file: packet-p7-hf.c ---*/ -#line 65 "packet-p7-template.c" +#line 62 "packet-p7-template.c" /* Initialize the subtree pointers */ static gint ett_p7 = -1; @@ -640,7 +637,7 @@ static gint ett_p7_RTSE_apdus = -1; static gint ett_p7_RTABapdu = -1; /*--- End of included file: packet-p7-ett.c ---*/ -#line 69 "packet-p7-template.c" +#line 66 "packet-p7-template.c" /*--- Included file: packet-p7-table.c ---*/ @@ -683,7 +680,7 @@ static const value_string p7_err_code_string_vals[] = { /*--- End of included file: packet-p7-table.c ---*/ -#line 71 "packet-p7-template.c" +#line 68 "packet-p7-template.c" /*--- Included file: packet-p7-fn.c ---*/ @@ -4081,7 +4078,7 @@ static void dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-p7-fn.c ---*/ -#line 73 "packet-p7-template.c" +#line 70 "packet-p7-template.c" /*--- Included file: packet-p7-table11.c ---*/ @@ -4113,7 +4110,7 @@ static const ros_opr_t p7_opr_tab[] = { /*--- End of included file: packet-p7-table11.c ---*/ -#line 75 "packet-p7-template.c" +#line 72 "packet-p7-template.c" /*--- Included file: packet-p7-table21.c ---*/ #line 1 "packet-p7-table21.c" @@ -4152,7 +4149,7 @@ static const ros_err_t p7_err_tab[] = { /*--- End of included file: packet-p7-table21.c ---*/ -#line 76 "packet-p7-template.c" +#line 73 "packet-p7-template.c" static const ros_info_t p7_ros_info = { "P7", @@ -5632,7 +5629,7 @@ void proto_register_p7(void) { NULL, HFILL }}, /*--- End of included file: packet-p7-hfarr.c ---*/ -#line 95 "packet-p7-template.c" +#line 92 "packet-p7-template.c" }; /* List of subtrees */ @@ -5776,7 +5773,7 @@ void proto_register_p7(void) { &ett_p7_RTABapdu, /*--- End of included file: packet-p7-ettarr.c ---*/ -#line 101 "packet-p7-template.c" +#line 98 "packet-p7-template.c" }; module_t *p7_module; @@ -5835,7 +5832,7 @@ void proto_reg_handoff_p7(void) { /*--- End of included file: packet-p7-dis-tab.c ---*/ -#line 127 "packet-p7-template.c" +#line 124 "packet-p7-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 6ce68c5e9f..846da7016e 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -44,7 +44,6 @@ #include <epan/packet.h> #include <epan/prefs.h> -#include <string.h> #include <epan/strutil.h> #include <epan/asn1.h> @@ -237,7 +236,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-pcap-val.h ---*/ -#line 62 "packet-pcap-template.c" +#line 61 "packet-pcap-template.c" static dissector_handle_t pcap_handle = NULL; @@ -1360,7 +1359,7 @@ static int hf_pcap_AvailableSubChannelNumbers_subCh1 = -1; static int hf_pcap_AvailableSubChannelNumbers_subCh0 = -1; /*--- End of included file: packet-pcap-hf.c ---*/ -#line 69 "packet-pcap-template.c" +#line 68 "packet-pcap-template.c" /* Initialize the subtree pointers */ static int ett_pcap = -1; @@ -1752,7 +1751,7 @@ static gint ett_pcap_UnsuccessfulOutcome = -1; static gint ett_pcap_Outcome = -1; /*--- End of included file: packet-pcap-ett.c ---*/ -#line 74 "packet-pcap-template.c" +#line 73 "packet-pcap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -13042,7 +13041,7 @@ static int dissect_PCAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pcap-fn.c ---*/ -#line 98 "packet-pcap-template.c" +#line 97 "packet-pcap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -13239,7 +13238,7 @@ proto_reg_handoff_pcap(void) /*--- End of included file: packet-pcap-dis-tab.c ---*/ -#line 172 "packet-pcap-template.c" +#line 171 "packet-pcap-template.c" } else { range_foreach(ssn_range, range_delete_callback); g_free(ssn_range); @@ -17700,7 +17699,7 @@ void proto_register_pcap(void) { NULL, HFILL }}, /*--- End of included file: packet-pcap-hfarr.c ---*/ -#line 188 "packet-pcap-template.c" +#line 187 "packet-pcap-template.c" }; /* List of subtrees */ @@ -18093,7 +18092,7 @@ void proto_register_pcap(void) { &ett_pcap_Outcome, /*--- End of included file: packet-pcap-ettarr.c ---*/ -#line 194 "packet-pcap-template.c" +#line 193 "packet-pcap-template.c" }; module_t *pcap_module; diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index cc4197285d..bebeda1eb8 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkcs1.h" #include "packet-x509af.h" @@ -67,7 +65,7 @@ static int hf_pkcs1_digestAlgorithm = -1; /* DigestAlgorithmIdentifier * static int hf_pkcs1_digest = -1; /* Digest */ /*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 47 "packet-pkcs1-template.c" +#line 45 "packet-pkcs1-template.c" /* Initialize the subtree pointers */ @@ -78,7 +76,7 @@ static gint ett_pkcs1_RSAPrivateKey = -1; static gint ett_pkcs1_DigestInfo = -1; /*--- End of included file: packet-pkcs1-ett.c ---*/ -#line 50 "packet-pkcs1-template.c" +#line 48 "packet-pkcs1-template.c" /*--- Included file: packet-pkcs1-fn.c ---*/ @@ -176,7 +174,7 @@ dissect_pkcs1_DigestInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse /*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 52 "packet-pkcs1-template.c" +#line 50 "packet-pkcs1-template.c" /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { @@ -232,7 +230,7 @@ void proto_register_pkcs1(void) { "pkcs1.Digest", HFILL }}, /*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 59 "packet-pkcs1-template.c" +#line 57 "packet-pkcs1-template.c" }; /* List of subtrees */ @@ -245,7 +243,7 @@ void proto_register_pkcs1(void) { &ett_pkcs1_DigestInfo, /*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 64 "packet-pkcs1-template.c" +#line 62 "packet-pkcs1-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 716bd01d9a..cec43d6b80 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -41,9 +41,6 @@ #include <epan/asn1.h> #include <epan/prefs.h> -#include <stdio.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkcs12.h" #include "packet-x509af.h" @@ -145,7 +142,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 82 "packet-pkcs12-template.c" +#line 79 "packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -173,7 +170,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 85 "packet-pkcs12-template.c" +#line 82 "packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1129,7 +1126,7 @@ static void dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 386 "packet-pkcs12-template.c" +#line 383 "packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1417,7 +1414,7 @@ void proto_register_pkcs12(void) { "x509af.AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 453 "packet-pkcs12-template.c" +#line 450 "packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1448,7 +1445,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 459 "packet-pkcs12-template.c" +#line 456 "packet-pkcs12-template.c" }; module_t *pkcs12_module; @@ -1509,7 +1506,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 491 "packet-pkcs12-template.c" +#line 488 "packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c index df735b7634..1b7b6d4c6e 100644 --- a/epan/dissectors/packet-pkinit.c +++ b/epan/dissectors/packet-pkinit.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkinit.h" #include "packet-cms.h" @@ -79,7 +77,7 @@ static int hf_pkinit_dhNonce = -1; /* INTEGER */ static int hf_pkinit_dhKeyExpiration = -1; /* KerberosTime */ /*--- End of included file: packet-pkinit-hf.c ---*/ -#line 49 "packet-pkinit-template.c" +#line 47 "packet-pkinit-template.c" /* Initialize the subtree pointers */ @@ -95,7 +93,7 @@ static gint ett_pkinit_PaPkAsRep = -1; static gint ett_pkinit_KDCDHKeyInfo = -1; /*--- End of included file: packet-pkinit-ett.c ---*/ -#line 52 "packet-pkinit-template.c" +#line 50 "packet-pkinit-template.c" static int dissect_KerberosV5Spec2_KerberosTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); static int dissect_KerberosV5Spec2_Checksum(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_); @@ -284,7 +282,7 @@ static void dissect_KDCDHKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkinit-fn.c ---*/ -#line 57 "packet-pkinit-template.c" +#line 55 "packet-pkinit-template.c" int dissect_pkinit_PA_PK_AS_REQ(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_) { @@ -405,7 +403,7 @@ void proto_register_pkinit(void) { "KerberosV5Spec2.KerberosTime", HFILL }}, /*--- End of included file: packet-pkinit-hfarr.c ---*/ -#line 89 "packet-pkinit-template.c" +#line 87 "packet-pkinit-template.c" }; /* List of subtrees */ @@ -423,7 +421,7 @@ void proto_register_pkinit(void) { &ett_pkinit_KDCDHKeyInfo, /*--- End of included file: packet-pkinit-ettarr.c ---*/ -#line 94 "packet-pkinit-template.c" +#line 92 "packet-pkinit-template.c" }; /* Register protocol */ @@ -446,6 +444,6 @@ void proto_reg_handoff_pkinit(void) { /*--- End of included file: packet-pkinit-dis-tab.c ---*/ -#line 109 "packet-pkinit-template.c" +#line 107 "packet-pkinit-template.c" } diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c index 171b610263..1c158b83f8 100644 --- a/epan/dissectors/packet-pkix1explicit.c +++ b/epan/dissectors/packet-pkix1explicit.c @@ -42,8 +42,6 @@ #include <epan/oids.h> #include <epan/afn.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkix1explicit.h" #include "packet-x509af.h" @@ -110,7 +108,7 @@ static int hf_pkix1explicit_min_01 = -1; /* ASId */ static int hf_pkix1explicit_max_01 = -1; /* ASId */ /*--- End of included file: packet-pkix1explicit-hf.c ---*/ -#line 58 "packet-pkix1explicit-template.c" +#line 56 "packet-pkix1explicit-template.c" /* Initialize the subtree pointers */ @@ -140,7 +138,7 @@ static gint ett_pkix1explicit_ASIdOrRange = -1; static gint ett_pkix1explicit_ASRange = -1; /*--- End of included file: packet-pkix1explicit-ett.c ---*/ -#line 61 "packet-pkix1explicit-template.c" +#line 59 "packet-pkix1explicit-template.c" static const char *object_identifier_id; @@ -813,7 +811,7 @@ static void dissect_ASIdentifiers_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkix1explicit-fn.c ---*/ -#line 105 "packet-pkix1explicit-template.c" +#line 103 "packet-pkix1explicit-template.c" /*--- proto_register_pkix1explicit ----------------------------------------------*/ @@ -1009,7 +1007,7 @@ void proto_register_pkix1explicit(void) { "pkix1explicit.ASId", HFILL }}, /*--- End of included file: packet-pkix1explicit-hfarr.c ---*/ -#line 124 "packet-pkix1explicit-template.c" +#line 122 "packet-pkix1explicit-template.c" }; /* List of subtrees */ @@ -1042,7 +1040,7 @@ void proto_register_pkix1explicit(void) { &ett_pkix1explicit_ASRange, /*--- End of included file: packet-pkix1explicit-ettarr.c ---*/ -#line 130 "packet-pkix1explicit-template.c" +#line 128 "packet-pkix1explicit-template.c" }; /* Register protocol */ @@ -1068,6 +1066,6 @@ void proto_reg_handoff_pkix1explicit(void) { /*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/ -#line 146 "packet-pkix1explicit-template.c" +#line 144 "packet-pkix1explicit-template.c" } diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index e4a6670bad..ffa4bc0832 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -37,8 +37,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-ber.h" #include "packet-pkix1implicit.h" @@ -70,7 +68,7 @@ static int hf_pkix1implicit_bmpString = -1; /* BMPString */ static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ /*--- End of included file: packet-pkix1implicit-hf.c ---*/ -#line 47 "packet-pkix1implicit-template.c" +#line 45 "packet-pkix1implicit-template.c" /* Initialize the subtree pointers */ @@ -84,7 +82,7 @@ static gint ett_pkix1implicit_T_noticeNumbers = -1; static gint ett_pkix1implicit_DisplayText = -1; /*--- End of included file: packet-pkix1implicit-ett.c ---*/ -#line 50 "packet-pkix1implicit-template.c" +#line 48 "packet-pkix1implicit-template.c" int @@ -289,7 +287,7 @@ static void dissect_UserNotice_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-pkix1implicit-fn.c ---*/ -#line 66 "packet-pkix1implicit-template.c" +#line 64 "packet-pkix1implicit-template.c" /*--- proto_register_pkix1implicit ----------------------------------------------*/ @@ -358,7 +356,7 @@ void proto_register_pkix1implicit(void) { "pkix1implicit.UTF8String", HFILL }}, /*--- End of included file: packet-pkix1implicit-hfarr.c ---*/ -#line 74 "packet-pkix1implicit-template.c" +#line 72 "packet-pkix1implicit-template.c" }; /* List of subtrees */ @@ -374,7 +372,7 @@ void proto_register_pkix1implicit(void) { &ett_pkix1implicit_DisplayText, /*--- End of included file: packet-pkix1implicit-ettarr.c ---*/ -#line 79 "packet-pkix1implicit-template.c" +#line 77 "packet-pkix1implicit-template.c" }; /* Register protocol */ @@ -430,6 +428,6 @@ void proto_reg_handoff_pkix1implicit(void) { /*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/ -#line 94 "packet-pkix1implicit-template.c" +#line 92 "packet-pkix1implicit-template.c" } diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index 1e723fd6d1..3f607fbe51 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkixproxy.h" @@ -61,7 +59,7 @@ static int hf_pkixproxy_policyLanguage = -1; /* OBJECT_IDENTIFIER */ static int hf_pkixproxy_policy = -1; /* OCTET_STRING */ /*--- End of included file: packet-pkixproxy-hf.c ---*/ -#line 47 "packet-pkixproxy-template.c" +#line 45 "packet-pkixproxy-template.c" /* Initialize the subtree pointers */ @@ -71,7 +69,7 @@ static gint ett_pkixproxy_ProxyCertInfoExtension = -1; static gint ett_pkixproxy_ProxyPolicy = -1; /*--- End of included file: packet-pkixproxy-ett.c ---*/ -#line 50 "packet-pkixproxy-template.c" +#line 48 "packet-pkixproxy-template.c" /*--- Included file: packet-pkixproxy-fn.c ---*/ @@ -145,7 +143,7 @@ static void dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 52 "packet-pkixproxy-template.c" +#line 50 "packet-pkixproxy-template.c" /*--- proto_register_pkixproxy ----------------------------------------------*/ @@ -178,7 +176,7 @@ void proto_register_pkixproxy(void) { "pkixproxy.OCTET_STRING", HFILL }}, /*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 60 "packet-pkixproxy-template.c" +#line 58 "packet-pkixproxy-template.c" }; /* List of subtrees */ @@ -190,7 +188,7 @@ void proto_register_pkixproxy(void) { &ett_pkixproxy_ProxyPolicy, /*--- End of included file: packet-pkixproxy-ettarr.c ---*/ -#line 65 "packet-pkixproxy-template.c" +#line 63 "packet-pkixproxy-template.c" }; /* Register protocol */ @@ -212,7 +210,7 @@ void proto_reg_handoff_pkixproxy(void) { /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ -#line 80 "packet-pkixproxy-template.c" +#line 78 "packet-pkixproxy-template.c" oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0"); oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1"); oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2"); diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index e26ff14c1e..dfe0eb52d1 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pkixqualified.h" #include "packet-x509af.h" @@ -78,7 +76,7 @@ static int hf_pkixqualified_nameRegistrationAuthorities = -1; /* NameRegistrati static int hf_pkixqualified_NameRegistrationAuthorities_item = -1; /* GeneralName */ /*--- End of included file: packet-pkixqualified-hf.c ---*/ -#line 49 "packet-pkixqualified-template.c" +#line 47 "packet-pkixqualified-template.c" /* Initialize the subtree pointers */ @@ -93,7 +91,7 @@ static gint ett_pkixqualified_SemanticsInformation = -1; static gint ett_pkixqualified_NameRegistrationAuthorities = -1; /*--- End of included file: packet-pkixqualified-ett.c ---*/ -#line 52 "packet-pkixqualified-template.c" +#line 50 "packet-pkixqualified-template.c" static const char *object_identifier_id; @@ -355,7 +353,7 @@ static void dissect_XmppAddr_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-pkixqualified-fn.c ---*/ -#line 56 "packet-pkixqualified-template.c" +#line 54 "packet-pkixqualified-template.c" /*--- proto_register_pkixqualified ----------------------------------------------*/ @@ -448,7 +446,7 @@ void proto_register_pkixqualified(void) { "x509ce.GeneralName", HFILL }}, /*--- End of included file: packet-pkixqualified-hfarr.c ---*/ -#line 64 "packet-pkixqualified-template.c" +#line 62 "packet-pkixqualified-template.c" }; /* List of subtrees */ @@ -465,7 +463,7 @@ void proto_register_pkixqualified(void) { &ett_pkixqualified_NameRegistrationAuthorities, /*--- End of included file: packet-pkixqualified-ettarr.c ---*/ -#line 69 "packet-pkixqualified-template.c" +#line 67 "packet-pkixqualified-template.c" }; /* Register protocol */ @@ -496,6 +494,6 @@ void proto_reg_handoff_pkixqualified(void) { /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ -#line 84 "packet-pkixqualified-template.c" +#line 82 "packet-pkixqualified-template.c" } diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 93b77cc5ce..38895db2b9 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -38,8 +38,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-ber.h" #include "packet-pkixtsp.h" @@ -90,7 +88,7 @@ static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1; static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1; /*--- End of included file: packet-pkixtsp-hf.c ---*/ -#line 49 "packet-pkixtsp-template.c" +#line 47 "packet-pkixtsp-template.c" /* Initialize the subtree pointers */ static gint ett_pkixtsp = -1; @@ -106,7 +104,7 @@ static gint ett_pkixtsp_TSTInfo = -1; static gint ett_pkixtsp_Accuracy = -1; /*--- End of included file: packet-pkixtsp-ett.c ---*/ -#line 53 "packet-pkixtsp-template.c" +#line 51 "packet-pkixtsp-template.c" @@ -363,7 +361,7 @@ static void dissect_TSTInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pkixtsp-fn.c ---*/ -#line 56 "packet-pkixtsp-template.c" +#line 54 "packet-pkixtsp-template.c" static int @@ -543,7 +541,7 @@ void proto_register_pkixtsp(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixtsp-hfarr.c ---*/ -#line 107 "packet-pkixtsp-template.c" +#line 105 "packet-pkixtsp-template.c" }; /* List of subtrees */ @@ -561,7 +559,7 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp_Accuracy, /*--- End of included file: packet-pkixtsp-ettarr.c ---*/ -#line 113 "packet-pkixtsp-template.c" +#line 111 "packet-pkixtsp-template.c" }; /* Register protocol */ @@ -592,6 +590,6 @@ void proto_reg_handoff_pkixtsp(void) { /*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ -#line 137 "packet-pkixtsp-template.c" +#line 135 "packet-pkixtsp-template.c" } diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 286f57bafc..c3e0657553 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -35,8 +35,6 @@ # include "config.h" #endif -#include <string.h> - #include <epan/packet.h> #include <epan/strutil.h> #include <epan/asn1.h> @@ -79,7 +77,7 @@ static int hf_q932_ros_present = -1; /* INTEGER */ static int hf_q932_ros_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-q932-ros-hf.c ---*/ -#line 46 "packet-q932-ros-template.c" +#line 44 "packet-q932-ros-template.c" /* Initialize the subtree pointers */ @@ -97,7 +95,7 @@ static gint ett_q932_ros_T_problem = -1; static gint ett_q932_ros_InvokeId = -1; /*--- End of included file: packet-q932-ros-ett.c ---*/ -#line 49 "packet-q932-ros-template.c" +#line 47 "packet-q932-ros-template.c" /* Preferences */ @@ -675,7 +673,7 @@ static int dissect_ROS_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree /*--- End of included file: packet-q932-ros-fn.c ---*/ -#line 64 "packet-q932-ros-template.c" +#line 62 "packet-q932-ros-template.c" /*--- dissect_q932_ros -----------------------------------------------------*/ static int dissect_q932_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -790,7 +788,7 @@ void proto_register_q932_ros(void) { "q932_ros.InvokeId_present", HFILL }}, /*--- End of included file: packet-q932-ros-hfarr.c ---*/ -#line 78 "packet-q932-ros-template.c" +#line 76 "packet-q932-ros-template.c" }; /* List of subtrees */ @@ -810,7 +808,7 @@ void proto_register_q932_ros(void) { &ett_q932_ros_InvokeId, /*--- End of included file: packet-q932-ros-ettarr.c ---*/ -#line 83 "packet-q932-ros-template.c" +#line 81 "packet-q932-ros-template.c" }; /* Register protocol and dissector */ diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index 6672923dc1..cd53ee4a87 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -40,7 +40,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <epan/emem.h> #include <epan/strutil.h> #include <epan/asn1.h> @@ -383,7 +382,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-ranap-val.h ---*/ -#line 63 "packet-ranap-template.c" +#line 62 "packet-ranap-template.c" /* Initialize the protocol and registered fields */ static int proto_ranap = -1; @@ -1034,7 +1033,7 @@ static int hf_ranap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_valu static int hf_ranap_value = -1; /* T_value */ /*--- End of included file: packet-ranap-hf.c ---*/ -#line 76 "packet-ranap-template.c" +#line 75 "packet-ranap-template.c" /* Initialize the subtree pointers */ static int ett_ranap = -1; @@ -1339,7 +1338,7 @@ static gint ett_ranap_UnsuccessfulOutcome = -1; static gint ett_ranap_Outcome = -1; /*--- End of included file: packet-ranap-ett.c ---*/ -#line 82 "packet-ranap-template.c" +#line 81 "packet-ranap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -11784,7 +11783,7 @@ static int dissect_RANAP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-ranap-fn.c ---*/ -#line 142 "packet-ranap-template.c" +#line 141 "packet-ranap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -14478,7 +14477,7 @@ void proto_register_ranap(void) { "ranap.T_value", HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 299 "packet-ranap-template.c" +#line 298 "packet-ranap-template.c" }; /* List of subtrees */ @@ -14784,7 +14783,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 306 "packet-ranap-template.c" +#line 305 "packet-ranap-template.c" }; @@ -15145,7 +15144,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 351 "packet-ranap-template.c" +#line 350 "packet-ranap-template.c" } else { dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 62f9c368d3..8e2665ee1c 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -43,8 +43,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-per.h" @@ -951,7 +949,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-rnsap-val.h ---*/ -#line 56 "packet-rnsap-template.c" +#line 54 "packet-rnsap-template.c" static dissector_handle_t rrc_dl_dcch_handle = NULL; @@ -3658,7 +3656,7 @@ static int hf_rnsap_value_04 = -1; /* UnsuccessfulOutcome_value * static int hf_rnsap_value_05 = -1; /* Outcome_value */ /*--- End of included file: packet-rnsap-hf.c ---*/ -#line 63 "packet-rnsap-template.c" +#line 61 "packet-rnsap-template.c" /* Initialize the subtree pointers */ static int ett_rnsap = -1; @@ -4934,7 +4932,7 @@ static gint ett_rnsap_UnsuccessfulOutcome = -1; static gint ett_rnsap_Outcome = -1; /*--- End of included file: packet-rnsap-ett.c ---*/ -#line 68 "packet-rnsap-template.c" +#line 66 "packet-rnsap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -42255,7 +42253,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-rnsap-fn.c ---*/ -#line 89 "packet-rnsap-template.c" +#line 87 "packet-rnsap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -53092,7 +53090,7 @@ void proto_register_rnsap(void) { "rnsap.Outcome_value", HFILL }}, /*--- End of included file: packet-rnsap-hfarr.c ---*/ -#line 141 "packet-rnsap-template.c" +#line 139 "packet-rnsap-template.c" }; /* List of subtrees */ @@ -54369,7 +54367,7 @@ void proto_register_rnsap(void) { &ett_rnsap_Outcome, /*--- End of included file: packet-rnsap-ettarr.c ---*/ -#line 147 "packet-rnsap-template.c" +#line 145 "packet-rnsap-template.c" }; @@ -55198,7 +55196,7 @@ proto_reg_handoff_rnsap(void) /*--- End of included file: packet-rnsap-dis-tab.c ---*/ -#line 186 "packet-rnsap-template.c" +#line 184 "packet-rnsap-template.c" } diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 4367fd20b0..e642ad00c5 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -42,8 +42,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pres.h" #include "packet-ros.h" @@ -116,7 +114,7 @@ static int hf_ros_local = -1; /* INTEGER */ static int hf_ros_global = -1; /* OBJECT_IDENTIFIER */ /*--- End of included file: packet-ros-hf.c ---*/ -#line 80 "packet-ros-template.c" +#line 78 "packet-ros-template.c" /* Initialize the subtree pointers */ static gint ett_ros = -1; @@ -134,7 +132,7 @@ static gint ett_ros_InvokeId = -1; static gint ett_ros_Code = -1; /*--- End of included file: packet-ros-ett.c ---*/ -#line 84 "packet-ros-template.c" +#line 82 "packet-ros-template.c" static dissector_table_t ros_oid_dissector_table=NULL; @@ -997,7 +995,7 @@ dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a /*--- End of included file: packet-ros-fn.c ---*/ -#line 373 "packet-ros-template.c" +#line 371 "packet-ros-template.c" /* * Dissect ROS PDUs inside a PPDU. @@ -1244,7 +1242,7 @@ void proto_register_ros(void) { "ros.OBJECT_IDENTIFIER", HFILL }}, /*--- End of included file: packet-ros-hfarr.c ---*/ -#line 507 "packet-ros-template.c" +#line 505 "packet-ros-template.c" }; /* List of subtrees */ @@ -1265,7 +1263,7 @@ void proto_register_ros(void) { &ett_ros_Code, /*--- End of included file: packet-ros-ettarr.c ---*/ -#line 514 "packet-ros-template.c" +#line 512 "packet-ros-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index cd6e106ad1..f616fb595b 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -43,8 +43,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-per.h" #include "packet-rrc.h" @@ -229,7 +227,7 @@ static void dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info #define maxURNTI_Group 8 /*--- End of included file: packet-rrc-val.h ---*/ -#line 69 "packet-rrc-template.c" +#line 67 "packet-rrc-template.c" /* Initialize the protocol and registered fields */ int proto_rrc = -1; @@ -8391,7 +8389,7 @@ static int hf_rrc_GsmSecurityCapability_a5_2 = -1; static int hf_rrc_GsmSecurityCapability_a5_1 = -1; /*--- End of included file: packet-rrc-hf.c ---*/ -#line 74 "packet-rrc-template.c" +#line 72 "packet-rrc-template.c" /* Initialize the subtree pointers */ static int ett_rrc = -1; @@ -13474,7 +13472,7 @@ static gint ett_rrc_UE_RadioAccessCapability_r6 = -1; static gint ett_rrc_UL_RFC3095_Context = -1; /*--- End of included file: packet-rrc-ett.c ---*/ -#line 79 "packet-rrc-template.c" +#line 77 "packet-rrc-template.c" /* Global variables */ static proto_tree *top_tree; @@ -118349,7 +118347,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ /*--- End of included file: packet-rrc-fn.c ---*/ -#line 84 "packet-rrc-template.c" +#line 82 "packet-rrc-template.c" #include "packet-rrc.h" @@ -151010,7 +151008,7 @@ void proto_register_rrc(void) { NULL, HFILL }}, /*--- End of included file: packet-rrc-hfarr.c ---*/ -#line 136 "packet-rrc-template.c" +#line 134 "packet-rrc-template.c" { &hf_test, { "RAB Test", "rrc.RAB.test", FT_UINT8, BASE_DEC, NULL, 0, @@ -156099,7 +156097,7 @@ void proto_register_rrc(void) { &ett_rrc_UL_RFC3095_Context, /*--- End of included file: packet-rrc-ettarr.c ---*/ -#line 147 "packet-rrc-template.c" +#line 145 "packet-rrc-template.c" }; @@ -156176,7 +156174,7 @@ void proto_register_rrc(void) { /*--- End of included file: packet-rrc-dis-reg.c ---*/ -#line 159 "packet-rrc-template.c" +#line 157 "packet-rrc-template.c" } diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 379b44f530..c33eb2d421 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -42,8 +42,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-per.h" #include "packet-gsm_a_common.h" @@ -877,7 +875,7 @@ static int hf_rrlp_GANSSModelID_model7 = -1; static int hf_rrlp_GANSSModelID_model8 = -1; /*--- End of included file: packet-rrlp-hf.c ---*/ -#line 60 "packet-rrlp-template.c" +#line 58 "packet-rrlp-template.c" /* Initialize the subtree pointers */ static gint ett_rrlp = -1; @@ -1128,7 +1126,7 @@ static gint ett_rrlp_GANSSModelID = -1; static gint ett_rrlp_AssistanceNeeded = -1; /*--- End of included file: packet-rrlp-ett.c ---*/ -#line 64 "packet-rrlp-template.c" +#line 62 "packet-rrlp-template.c" /* Include constants */ @@ -1140,7 +1138,7 @@ static gint ett_rrlp_AssistanceNeeded = -1; #define maxGANSSAssistanceData 40 /*--- End of included file: packet-rrlp-val.h ---*/ -#line 67 "packet-rrlp-template.c" +#line 65 "packet-rrlp-template.c" @@ -7031,7 +7029,7 @@ static void dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-rrlp-fn.c ---*/ -#line 70 "packet-rrlp-template.c" +#line 68 "packet-rrlp-template.c" /*--- proto_register_rrlp -------------------------------------------*/ @@ -10273,7 +10271,7 @@ void proto_register_rrlp(void) { NULL, HFILL }}, /*--- End of included file: packet-rrlp-hfarr.c ---*/ -#line 79 "packet-rrlp-template.c" +#line 77 "packet-rrlp-template.c" }; /* List of subtrees */ @@ -10526,7 +10524,7 @@ void proto_register_rrlp(void) { &ett_rrlp_AssistanceNeeded, /*--- End of included file: packet-rrlp-ettarr.c ---*/ -#line 85 "packet-rrlp-template.c" +#line 83 "packet-rrlp-template.c" }; diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 0084e0d1bc..bf535030ad 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -43,8 +43,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-pres.h" #include "packet-acse.h" @@ -97,7 +95,7 @@ static int hf_rtse_t61String = -1; /* T_t61String */ static int hf_rtse_octetString = -1; /* T_octetString */ /*--- End of included file: packet-rtse-hf.c ---*/ -#line 64 "packet-rtse-template.c" +#line 62 "packet-rtse-template.c" /* Initialize the subtree pointers */ static gint ett_rtse = -1; @@ -114,7 +112,7 @@ static gint ett_rtse_SessionConnectionIdentifier = -1; static gint ett_rtse_CallingSSuserReference = -1; /*--- End of included file: packet-rtse-ett.c ---*/ -#line 68 "packet-rtse-template.c" +#line 66 "packet-rtse-template.c" static dissector_table_t rtse_oid_dissector_table=NULL; @@ -690,7 +688,7 @@ dissect_rtse_RTSE_apdus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-rtse-fn.c ---*/ -#line 184 "packet-rtse-template.c" +#line 182 "packet-rtse-template.c" /* * Dissect RTSE PDUs inside a PPDU. @@ -958,7 +956,7 @@ void proto_register_rtse(void) { "rtse.T_octetString", HFILL }}, /*--- End of included file: packet-rtse-hfarr.c ---*/ -#line 351 "packet-rtse-template.c" +#line 349 "packet-rtse-template.c" }; /* List of subtrees */ @@ -980,7 +978,7 @@ void proto_register_rtse(void) { &ett_rtse_CallingSSuserReference, /*--- End of included file: packet-rtse-ettarr.c ---*/ -#line 360 "packet-rtse-template.c" +#line 358 "packet-rtse-template.c" }; module_t *rtse_module; diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index fd44224037..69e11a425b 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -42,7 +42,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> #include <ctype.h> #include <epan/strutil.h> #include <epan/asn1.h> @@ -285,7 +284,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-s1ap-val.h ---*/ -#line 65 "packet-s1ap-template.c" +#line 64 "packet-s1ap-template.c" /* Initialize the protocol and registered fields */ static int proto_s1ap = -1; @@ -689,7 +688,7 @@ static int hf_s1ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_s1ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-s1ap-hf.c ---*/ -#line 72 "packet-s1ap-template.c" +#line 71 "packet-s1ap-template.c" /* Initialize the subtree pointers */ static int ett_s1ap = -1; @@ -910,7 +909,7 @@ static gint ett_s1ap_SuccessfulOutcome = -1; static gint ett_s1ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-s1ap-ett.c ---*/ -#line 81 "packet-s1ap-template.c" +#line 80 "packet-s1ap-template.c" enum{ INITIATING_MESSAGE, @@ -7694,7 +7693,7 @@ static int dissect_S1AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-s1ap-fn.c ---*/ -#line 123 "packet-s1ap-template.c" +#line 122 "packet-s1ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -7966,7 +7965,7 @@ proto_reg_handoff_s1ap(void) /*--- End of included file: packet-s1ap-dis-tab.c ---*/ -#line 193 "packet-s1ap-template.c" +#line 192 "packet-s1ap-template.c" } else { if (SctpPort != 0) { dissector_delete("sctp.port", SctpPort, s1ap_handle); @@ -9567,7 +9566,7 @@ void proto_register_s1ap(void) { "s1ap.UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-s1ap-hfarr.c ---*/ -#line 221 "packet-s1ap-template.c" +#line 220 "packet-s1ap-template.c" }; /* List of subtrees */ @@ -9789,7 +9788,7 @@ void proto_register_s1ap(void) { &ett_s1ap_UnsuccessfulOutcome, /*--- End of included file: packet-s1ap-ettarr.c ---*/ -#line 231 "packet-s1ap-template.c" +#line 230 "packet-s1ap-template.c" }; module_t *s1ap_module; diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c index 6f128c7b37..45b6ab012b 100644 --- a/epan/dissectors/packet-s4406.c +++ b/epan/dissectors/packet-s4406.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509if.h" @@ -166,7 +164,7 @@ static int proto_s4406 = -1; #define ub_data_size 65535 /*--- End of included file: packet-s4406-val.h ---*/ -#line 52 "packet-s4406-template.c" +#line 50 "packet-s4406-template.c" /*--- Included file: packet-s4406-hf.c ---*/ @@ -252,7 +250,7 @@ static int hf_s4406_Acp127NotificationType_acp127_pn = -1; static int hf_s4406_Acp127NotificationType_acp127_tn = -1; /*--- End of included file: packet-s4406-hf.c ---*/ -#line 54 "packet-s4406-template.c" +#line 52 "packet-s4406-template.c" /* Initialize the subtree pointers */ static gint ett_s4406 = -1; @@ -288,7 +286,7 @@ static gint ett_s4406_MMMessageParameters = -1; static gint ett_s4406_Acp127NotificationType = -1; /*--- End of included file: packet-s4406-ett.c ---*/ -#line 58 "packet-s4406-template.c" +#line 56 "packet-s4406-template.c" /*--- Included file: packet-s4406-fn.c ---*/ @@ -1239,7 +1237,7 @@ static void dissect_Acp127NotificationType_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-s4406-fn.c ---*/ -#line 60 "packet-s4406-template.c" +#line 58 "packet-s4406-template.c" /* @@ -1590,7 +1588,7 @@ void proto_register_s4406(void) { NULL, HFILL }}, /*--- End of included file: packet-s4406-hfarr.c ---*/ -#line 94 "packet-s4406-template.c" +#line 92 "packet-s4406-template.c" }; /* List of subtrees */ @@ -1628,7 +1626,7 @@ void proto_register_s4406(void) { &ett_s4406_Acp127NotificationType, /*--- End of included file: packet-s4406-ettarr.c ---*/ -#line 100 "packet-s4406-template.c" +#line 98 "packet-s4406-template.c" }; /* Register protocol */ @@ -1679,7 +1677,7 @@ void proto_reg_handoff_s4406(void) { /*--- End of included file: packet-s4406-dis-tab.c ---*/ -#line 115 "packet-s4406-template.c" +#line 113 "packet-s4406-template.c" register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_s4406, proto_s4406, "STANAG 4406"); diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c index 7a5d18b49f..904a957916 100644 --- a/epan/dissectors/packet-sabp.c +++ b/epan/dissectors/packet-sabp.c @@ -40,8 +40,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-tcp.h" @@ -105,7 +103,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-sabp-val.h ---*/ -#line 55 "packet-sabp-template.c" +#line 53 "packet-sabp-template.c" /* Initialize the protocol and registered fields */ static int proto_sabp = -1; @@ -195,7 +193,7 @@ static int hf_sabp_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_sabp_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-sabp-hf.c ---*/ -#line 61 "packet-sabp-template.c" +#line 59 "packet-sabp-template.c" /* Initialize the subtree pointers */ static int ett_sabp = -1; @@ -247,7 +245,7 @@ static gint ett_sabp_SuccessfulOutcome = -1; static gint ett_sabp_UnsuccessfulOutcome = -1; /*--- End of included file: packet-sabp-ett.c ---*/ -#line 69 "packet-sabp-template.c" +#line 67 "packet-sabp-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -1683,7 +1681,7 @@ static int dissect_SABP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-sabp-fn.c ---*/ -#line 93 "packet-sabp-template.c" +#line 91 "packet-sabp-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -2086,7 +2084,7 @@ void proto_register_sabp(void) { "sabp.UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-sabp-hfarr.c ---*/ -#line 175 "packet-sabp-template.c" +#line 173 "packet-sabp-template.c" }; /* List of subtrees */ @@ -2139,7 +2137,7 @@ void proto_register_sabp(void) { &ett_sabp_UnsuccessfulOutcome, /*--- End of included file: packet-sabp-ettarr.c ---*/ -#line 184 "packet-sabp-template.c" +#line 182 "packet-sabp-template.c" }; @@ -2221,7 +2219,7 @@ proto_reg_handoff_sabp(void) /*--- End of included file: packet-sabp-dis-tab.c ---*/ -#line 220 "packet-sabp-template.c" +#line 218 "packet-sabp-template.c" } diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 6cf19d42b6..b78f2cd90f 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-smrse.h" @@ -87,7 +85,7 @@ static int hf_smrse_sm_diag_info = -1; /* RP_UD */ static int hf_smrse_ms_address = -1; /* SMS_Address */ /*--- End of included file: packet-smrse-hf.c ---*/ -#line 52 "packet-smrse-template.c" +#line 50 "packet-smrse-template.c" /* Initialize the subtree pointers */ static gint ett_smrse = -1; @@ -107,7 +105,7 @@ static gint ett_smrse_RPError = -1; static gint ett_smrse_RPAlertSC = -1; /*--- End of included file: packet-smrse-ett.c ---*/ -#line 56 "packet-smrse-template.c" +#line 54 "packet-smrse-template.c" @@ -483,7 +481,7 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset /*--- End of included file: packet-smrse-fn.c ---*/ -#line 59 "packet-smrse-template.c" +#line 57 "packet-smrse-template.c" static const value_string tag_vals[] = { { 1, "AliveTest" }, @@ -698,7 +696,7 @@ void proto_register_smrse(void) { "smrse.SMS_Address", HFILL }}, /*--- End of included file: packet-smrse-hfarr.c ---*/ -#line 165 "packet-smrse-template.c" +#line 163 "packet-smrse-template.c" }; /* List of subtrees */ @@ -720,7 +718,7 @@ void proto_register_smrse(void) { &ett_smrse_RPAlertSC, /*--- End of included file: packet-smrse-ettarr.c ---*/ -#line 171 "packet-smrse-template.c" +#line 169 "packet-smrse-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 23db2f709a..62ea959531 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -58,8 +58,6 @@ # include "config.h" #endif -#include <stdio.h> -#include <string.h> #include <ctype.h> #include <glib.h> @@ -296,7 +294,7 @@ static int hf_snmp_priority = -1; /* INTEGER_M1_2147483647 */ static int hf_snmp_operation = -1; /* T_operation */ /*--- End of included file: packet-snmp-hf.c ---*/ -#line 222 "packet-snmp-template.c" +#line 220 "packet-snmp-template.c" static int hf_smux_version = -1; static int hf_smux_pdutype = -1; @@ -339,7 +337,7 @@ static gint ett_snmp_SimpleOpen_U = -1; static gint ett_snmp_RReqPDU_U = -1; /*--- End of included file: packet-snmp-ett.c ---*/ -#line 241 "packet-snmp-template.c" +#line 239 "packet-snmp-template.c" static const true_false_string auth_flags = { "OK", @@ -2702,7 +2700,7 @@ static void dissect_SMUX_PDUs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-snmp-fn.c ---*/ -#line 1482 "packet-snmp-template.c" +#line 1480 "packet-snmp-template.c" guint @@ -3553,7 +3551,7 @@ void proto_register_snmp(void) { "snmp.T_operation", HFILL }}, /*--- End of included file: packet-snmp-hfarr.c ---*/ -#line 2068 "packet-snmp-template.c" +#line 2066 "packet-snmp-template.c" }; /* List of subtrees */ @@ -3593,7 +3591,7 @@ void proto_register_snmp(void) { &ett_snmp_RReqPDU_U, /*--- End of included file: packet-snmp-ettarr.c ---*/ -#line 2084 "packet-snmp-template.c" +#line 2082 "packet-snmp-template.c" }; module_t *snmp_module; diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c index 12a0bce617..76a99afba6 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -39,8 +39,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include "packet-ber.h" @@ -173,7 +171,7 @@ static int hf_t125_Segmentation_begin = -1; static int hf_t125_Segmentation_end = -1; /*--- End of included file: packet-t125-hf.c ---*/ -#line 47 "packet-t125-template.c" +#line 45 "packet-t125-template.c" /* Initialize the subtree pointers */ static int ett_t125 = -1; @@ -249,7 +247,7 @@ static gint ett_t125_ConnectMCSPDU = -1; static gint ett_t125_DomainMCSPDU = -1; /*--- End of included file: packet-t125-ett.c ---*/ -#line 51 "packet-t125-template.c" +#line 49 "packet-t125-template.c" /*--- Included file: packet-t125-fn.c ---*/ @@ -2122,7 +2120,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-t125-fn.c ---*/ -#line 53 "packet-t125-template.c" +#line 51 "packet-t125-template.c" static int dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) @@ -2626,7 +2624,7 @@ void proto_register_t125(void) { NULL, HFILL }}, /*--- End of included file: packet-t125-hfarr.c ---*/ -#line 88 "packet-t125-template.c" +#line 86 "packet-t125-template.c" }; /* List of subtrees */ @@ -2704,7 +2702,7 @@ void proto_register_t125(void) { &ett_t125_DomainMCSPDU, /*--- End of included file: packet-t125-ettarr.c ---*/ -#line 94 "packet-t125-template.c" +#line 92 "packet-t125-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c index 0c0677feb4..e633f3b3ad 100644 --- a/epan/dissectors/packet-ulp.c +++ b/epan/dissectors/packet-ulp.c @@ -43,8 +43,6 @@ #include <epan/prefs.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-per.h" #include "packet-tcp.h" #include "packet-gsm_map.h" @@ -660,7 +658,7 @@ static int hf_ulp_GANSSSignals_signal7 = -1; static int hf_ulp_GANSSSignals_signal8 = -1; /*--- End of included file: packet-ulp-hf.c ---*/ -#line 65 "packet-ulp-template.c" +#line 63 "packet-ulp-template.c" /* Initialize the subtree pointers */ static gint ett_ulp = -1; @@ -874,7 +872,7 @@ static gint ett_ulp_PolygonArea = -1; static gint ett_ulp_PolygonDescription = -1; /*--- End of included file: packet-ulp-ett.c ---*/ -#line 69 "packet-ulp-template.c" +#line 67 "packet-ulp-template.c" /* Include constants */ @@ -897,7 +895,7 @@ static gint ett_ulp_PolygonDescription = -1; #define maxWimaxBSMeas 32 /*--- End of included file: packet-ulp-val.h ---*/ -#line 72 "packet-ulp-template.c" +#line 70 "packet-ulp-template.c" @@ -6227,7 +6225,7 @@ static void dissect_ULP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-ulp-fn.c ---*/ -#line 75 "packet-ulp-template.c" +#line 73 "packet-ulp-template.c" static guint @@ -8597,7 +8595,7 @@ void proto_register_ulp(void) { NULL, HFILL }}, /*--- End of included file: packet-ulp-hfarr.c ---*/ -#line 100 "packet-ulp-template.c" +#line 98 "packet-ulp-template.c" }; /* List of subtrees */ @@ -8813,7 +8811,7 @@ void proto_register_ulp(void) { &ett_ulp_PolygonDescription, /*--- End of included file: packet-ulp-ettarr.c ---*/ -#line 106 "packet-ulp-template.c" +#line 104 "packet-ulp-template.c" }; module_t *ulp_module; diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c index 469479cc4c..1514101cc3 100644 --- a/epan/dissectors/packet-wlancertextn.c +++ b/epan/dissectors/packet-wlancertextn.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-wlancertextn.h" #include "packet-x509af.h" @@ -61,7 +59,7 @@ static int hf_wlancertextn_SSIDList_PDU = -1; /* SSIDList */ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ /*--- End of included file: packet-wlancertextn-hf.c ---*/ -#line 50 "packet-wlancertextn-template.c" +#line 48 "packet-wlancertextn-template.c" /* Initialize the subtree pointers */ @@ -70,7 +68,7 @@ static int hf_wlancertextn_SSIDList_item = -1; /* SSID */ static gint ett_wlancertextn_SSIDList = -1; /*--- End of included file: packet-wlancertextn-ett.c ---*/ -#line 53 "packet-wlancertextn-template.c" +#line 51 "packet-wlancertextn-template.c" /*--- Included file: packet-wlancertextn-fn.c ---*/ @@ -108,7 +106,7 @@ static void dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-wlancertextn-fn.c ---*/ -#line 55 "packet-wlancertextn-template.c" +#line 53 "packet-wlancertextn-template.c" /*--- proto_register_wlancertextn ----------------------------------------------*/ @@ -129,7 +127,7 @@ void proto_register_wlancertextn(void) { "wlancertextn.SSID", HFILL }}, /*--- End of included file: packet-wlancertextn-hfarr.c ---*/ -#line 63 "packet-wlancertextn-template.c" +#line 61 "packet-wlancertextn-template.c" }; /* List of subtrees */ @@ -140,7 +138,7 @@ void proto_register_wlancertextn(void) { &ett_wlancertextn_SSIDList, /*--- End of included file: packet-wlancertextn-ettarr.c ---*/ -#line 68 "packet-wlancertextn-template.c" +#line 66 "packet-wlancertextn-template.c" }; /* Register protocol */ @@ -163,7 +161,7 @@ void proto_reg_handoff_wlancertextn(void) { /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/ -#line 83 "packet-wlancertextn-template.c" +#line 81 "packet-wlancertextn-template.c" oid_add_from_string("id-kp-eapOverPPP","1.3.6.1.5.5.7.3.13"); oid_add_from_string("id-kp-eapOverLAN","1.3.6.1.5.5.7.3.14"); } diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index bf04337db0..e4bfc7bc02 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -43,8 +43,6 @@ #include <glib.h> #include <epan/packet.h> -#include <string.h> - #include <epan/asn1.h> #include <epan/prefs.h> #include <epan/sctpppids.h> @@ -165,7 +163,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-x2ap-val.h ---*/ -#line 62 "packet-x2ap-template.c" +#line 60 "packet-x2ap-template.c" /* Initialize the protocol and registered fields */ static int proto_x2ap = -1; @@ -425,7 +423,7 @@ static int hf_x2ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value */ static int hf_x2ap_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-x2ap-hf.c ---*/ -#line 68 "packet-x2ap-template.c" +#line 66 "packet-x2ap-template.c" /* Initialize the subtree pointers */ static int ett_x2ap = -1; @@ -545,7 +543,7 @@ static gint ett_x2ap_SuccessfulOutcome = -1; static gint ett_x2ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-x2ap-ett.c ---*/ -#line 73 "packet-x2ap-template.c" +#line 71 "packet-x2ap-template.c" /* Global variables */ static guint32 ProcedureCode; @@ -4245,7 +4243,7 @@ static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-x2ap-fn.c ---*/ -#line 94 "packet-x2ap-template.c" +#line 92 "packet-x2ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { @@ -5304,7 +5302,7 @@ void proto_register_x2ap(void) { "x2ap.UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-x2ap-hfarr.c ---*/ -#line 152 "packet-x2ap-template.c" +#line 150 "packet-x2ap-template.c" }; /* List of subtrees */ @@ -5426,7 +5424,7 @@ void proto_register_x2ap(void) { &ett_x2ap_UnsuccessfulOutcome, /*--- End of included file: packet-x2ap-ettarr.c ---*/ -#line 159 "packet-x2ap-template.c" +#line 157 "packet-x2ap-template.c" }; module_t *x2ap_module; @@ -5558,7 +5556,7 @@ proto_reg_handoff_x2ap(void) /*--- End of included file: packet-x2ap-dis-tab.c ---*/ -#line 205 "packet-x2ap-template.c" +#line 203 "packet-x2ap-template.c" } else { if (SctpPort != 0) { dissector_delete("sctp.port", SctpPort, x2ap_handle); diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 9b1fc5f5e5..26db92deca 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -42,8 +42,6 @@ #include <epan/asn1.h> #include <epan/expert.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" @@ -501,7 +499,7 @@ static int hf_x411_UniversalOrganizationalUnitNames_item = -1; /* UniversalOrga static int hf_x411_character_encoding = -1; /* T_character_encoding */ static int hf_x411_two_octets = -1; /* BMPString_SIZE_1_ub_string_length */ static int hf_x411_four_octets = -1; /* UniversalString_SIZE_1_ub_string_length */ -static int hf_x411_iso_639_language_code = -1; /* PrintableString_SIZE_CONSTR32134928 */ +static int hf_x411_iso_639_language_code = -1; /* PrintableString_SIZE_CONSTR32534896 */ static int hf_x411_x121_dcc_code_01 = -1; /* T_x121_dcc_code_01 */ static int hf_x411_iso_3166_alpha2_code_01 = -1; /* T_iso_3166_alpha2_code_01 */ static int hf_x411_numeric_code = -1; /* T_numeric_code */ @@ -669,7 +667,7 @@ static int hf_x411_G3FacsimileNonBasicParameters_jpeg = -1; static int hf_x411_G3FacsimileNonBasicParameters_processable_mode_26 = -1; /*--- End of included file: packet-x411-hf.c ---*/ -#line 84 "packet-x411-template.c" +#line 82 "packet-x411-template.c" /* Initialize the subtree pointers */ static gint ett_x411 = -1; @@ -871,7 +869,7 @@ static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientMessageSubmiss static gint ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields = -1; /*--- End of included file: packet-x411-ett.c ---*/ -#line 95 "packet-x411-template.c" +#line 93 "packet-x411-template.c" /* Dissector tables */ static dissector_table_t x411_extension_dissector_table; @@ -922,7 +920,7 @@ static const value_string p3_err_code_string_vals[] = { /*--- End of included file: packet-x411-table.c ---*/ -#line 102 "packet-x411-template.c" +#line 100 "packet-x411-template.c" /*--- Included file: packet-x411-fn.c ---*/ @@ -6507,7 +6505,7 @@ dissect_x411_T_character_encoding(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int -dissect_x411_PrintableString_SIZE_CONSTR32134928(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +dissect_x411_PrintableString_SIZE_CONSTR32534896(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_constrained_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, actx, tree, tvb, offset, 2, 5, hf_index, NULL); @@ -6518,7 +6516,7 @@ dissect_x411_PrintableString_SIZE_CONSTR32134928(gboolean implicit_tag _U_, tvbu static const ber_sequence_t UniversalOrBMPString_set[] = { { &hf_x411_character_encoding, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_x411_T_character_encoding }, - { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR32134928 }, + { &hf_x411_iso_639_language_code, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x411_PrintableString_SIZE_CONSTR32534896 }, { NULL, 0, 0, 0, NULL } }; @@ -8554,7 +8552,7 @@ static void dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-x411-fn.c ---*/ -#line 104 "packet-x411-template.c" +#line 102 "packet-x411-template.c" /*--- Included file: packet-x411-table11.c ---*/ @@ -8586,7 +8584,7 @@ static const ros_opr_t p3_opr_tab[] = { /*--- End of included file: packet-x411-table11.c ---*/ -#line 106 "packet-x411-template.c" +#line 104 "packet-x411-template.c" /*--- Included file: packet-x411-table21.c ---*/ #line 1 "packet-x411-table21.c" @@ -8631,7 +8629,7 @@ static const ros_err_t p3_err_tab[] = { /*--- End of included file: packet-x411-table21.c ---*/ -#line 107 "packet-x411-template.c" +#line 105 "packet-x411-template.c" static const ros_info_t p3_ros_info = { "P3", @@ -10419,7 +10417,7 @@ void proto_register_x411(void) { { &hf_x411_iso_639_language_code, { "iso-639-language-code", "x411.iso_639_language_code", FT_STRING, BASE_NONE, NULL, 0, - "x411.PrintableString_SIZE_CONSTR32134928", HFILL }}, + "x411.PrintableString_SIZE_CONSTR32534896", HFILL }}, { &hf_x411_x121_dcc_code_01, { "x121-dcc-code", "x411.x121_dcc_code", FT_STRING, BASE_NONE, NULL, 0, @@ -11078,7 +11076,7 @@ void proto_register_x411(void) { NULL, HFILL }}, /*--- End of included file: packet-x411-hfarr.c ---*/ -#line 249 "packet-x411-template.c" +#line 247 "packet-x411-template.c" }; /* List of subtrees */ @@ -11282,7 +11280,7 @@ void proto_register_x411(void) { &ett_x411_SEQUENCE_SIZE_1_ub_recipients_OF_PerRecipientProbeSubmissionFields, /*--- End of included file: packet-x411-ettarr.c ---*/ -#line 262 "packet-x411-template.c" +#line 260 "packet-x411-template.c" }; module_t *x411_module; @@ -11474,7 +11472,7 @@ void proto_reg_handoff_x411(void) { /*--- End of included file: packet-x411-dis-tab.c ---*/ -#line 297 "packet-x411-template.c" +#line 295 "packet-x411-template.c" /* APPLICATION CONTEXT */ diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index e6f1c06e73..5b98fde8ff 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-acse.h" #include "packet-ros.h" @@ -344,7 +342,7 @@ static const value_string charsetreg_vals [] = { #define ub_telephone_number 32 /*--- End of included file: packet-x420-val.h ---*/ -#line 88 "packet-x420-template.c" +#line 86 "packet-x420-template.c" /*--- Included file: packet-x420-hf.c ---*/ @@ -729,7 +727,7 @@ static int hf_x420_RecipientSecurityRequest_ipn_non_repudiation = -1; static int hf_x420_RecipientSecurityRequest_ipn_proof = -1; /*--- End of included file: packet-x420-hf.c ---*/ -#line 90 "packet-x420-template.c" +#line 88 "packet-x420-template.c" /* Initialize the subtree pointers */ static gint ett_x420 = -1; @@ -863,7 +861,7 @@ static gint ett_x420_T_body_part_token_choice = -1; static gint ett_x420_T_choice = -1; /*--- End of included file: packet-x420-ett.c ---*/ -#line 94 "packet-x420-template.c" +#line 92 "packet-x420-template.c" /*--- Included file: packet-x420-fn.c ---*/ @@ -4530,7 +4528,7 @@ static void dissect_ForwardedContentToken_PDU(tvbuff_t *tvb _U_, packet_info *pi /*--- End of included file: packet-x420-fn.c ---*/ -#line 96 "packet-x420-template.c" +#line 94 "packet-x420-template.c" /* * Dissect X420 PDUs inside a PPDU. @@ -6075,7 +6073,7 @@ void proto_register_x420(void) { NULL, HFILL }}, /*--- End of included file: packet-x420-hfarr.c ---*/ -#line 128 "packet-x420-template.c" +#line 126 "packet-x420-template.c" }; /* List of subtrees */ @@ -6211,7 +6209,7 @@ void proto_register_x420(void) { &ett_x420_T_choice, /*--- End of included file: packet-x420-ettarr.c ---*/ -#line 134 "packet-x420-template.c" +#line 132 "packet-x420-template.c" }; /* Register protocol */ @@ -6331,7 +6329,7 @@ void proto_reg_handoff_x420(void) { /*--- End of included file: packet-x420-dis-tab.c ---*/ -#line 150 "packet-x420-template.c" +#line 148 "packet-x420-template.c" register_ber_oid_dissector("2.6.1.10.0", dissect_x420, proto_x420, "InterPersonal Message (1984)"); register_ber_oid_dissector("2.6.1.10.1", dissect_x420, proto_x420, "InterPersonal Message (1988)"); diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index b64828ec30..415ef3b262 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509af.h" #include "packet-x509ce.h" @@ -136,7 +134,7 @@ static int hf_x509af_q = -1; /* INTEGER */ static int hf_x509af_g = -1; /* INTEGER */ /*--- End of included file: packet-x509af-hf.c ---*/ -#line 53 "packet-x509af-template.c" +#line 51 "packet-x509af-template.c" /* Initialize the subtree pointers */ static gint ett_pkix_crl = -1; @@ -177,7 +175,7 @@ static gint ett_x509af_SET_OF_AttributeType = -1; static gint ett_x509af_DSS_Params = -1; /*--- End of included file: packet-x509af-ett.c ---*/ -#line 57 "packet-x509af-template.c" +#line 55 "packet-x509af-template.c" static const char *algorithm_id; static const char *extension_id; @@ -891,7 +889,7 @@ static void dissect_DSS_Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-x509af-fn.c ---*/ -#line 62 "packet-x509af-template.c" +#line 60 "packet-x509af-template.c" const char *x509af_get_last_algorithm_id(void) { return algorithm_id; @@ -1233,7 +1231,7 @@ void proto_register_x509af(void) { "x509af.INTEGER", HFILL }}, /*--- End of included file: packet-x509af-hfarr.c ---*/ -#line 103 "packet-x509af-template.c" +#line 101 "packet-x509af-template.c" }; /* List of subtrees */ @@ -1276,7 +1274,7 @@ void proto_register_x509af(void) { &ett_x509af_DSS_Params, /*--- End of included file: packet-x509af-ettarr.c ---*/ -#line 109 "packet-x509af-template.c" +#line 107 "packet-x509af-template.c" }; /* Register protocol */ @@ -1310,7 +1308,7 @@ void proto_reg_handoff_x509af(void) { /*--- End of included file: packet-x509af-dis-tab.c ---*/ -#line 129 "packet-x509af-template.c" +#line 127 "packet-x509af-template.c" /*XXX these should really go to a better place but since that I have not that ITU standard, ill put it here for the time diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 84eab48ad4..29418840e5 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -39,8 +39,6 @@ #include <epan/packet.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x509ce.h" #include "packet-x509af.h" @@ -255,7 +253,7 @@ static int hf_x509ce_EntrustInfoFlags_webCategory = -1; static int hf_x509ce_EntrustInfoFlags_sETCategory = -1; /*--- End of included file: packet-x509ce-hf.c ---*/ -#line 54 "packet-x509ce-template.c" +#line 52 "packet-x509ce-template.c" /* Initialize the subtree pointers */ @@ -322,7 +320,7 @@ static gint ett_x509ce_EntrustVersionInfo = -1; static gint ett_x509ce_EntrustInfoFlags = -1; /*--- End of included file: packet-x509ce-ett.c ---*/ -#line 57 "packet-x509ce-template.c" +#line 55 "packet-x509ce-template.c" static const char *object_identifier_id; @@ -1816,7 +1814,7 @@ static void dissect_EntrustVersionInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo /*--- End of included file: packet-x509ce-fn.c ---*/ -#line 61 "packet-x509ce-template.c" +#line 59 "packet-x509ce-template.c" static void @@ -2625,7 +2623,7 @@ void proto_register_x509ce(void) { NULL, HFILL }}, /*--- End of included file: packet-x509ce-hfarr.c ---*/ -#line 101 "packet-x509ce-template.c" +#line 99 "packet-x509ce-template.c" }; /* List of subtrees */ @@ -2694,7 +2692,7 @@ void proto_register_x509ce(void) { &ett_x509ce_EntrustInfoFlags, /*--- End of included file: packet-x509ce-ettarr.c ---*/ -#line 106 "packet-x509ce-template.c" +#line 104 "packet-x509ce-template.c" }; /* Register protocol */ @@ -2756,7 +2754,7 @@ void proto_reg_handoff_x509ce(void) { /*--- End of included file: packet-x509ce-dis-tab.c ---*/ -#line 121 "packet-x509ce-template.c" +#line 119 "packet-x509ce-template.c" register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate"); register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime"); } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 08ba77397c..1838024693 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-dap.h" #include "packet-x509if.h" @@ -216,7 +214,7 @@ static int hf_x509if_AllowedSubset_oneLevel = -1; static int hf_x509if_AllowedSubset_wholeSubtree = -1; /*--- End of included file: packet-x509if-hf.c ---*/ -#line 52 "packet-x509if-template.c" +#line 50 "packet-x509if-template.c" /* Initialize the subtree pointers */ @@ -297,7 +295,7 @@ static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType = -1; static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; /*--- End of included file: packet-x509if-ett.c ---*/ -#line 55 "packet-x509if-template.c" +#line 53 "packet-x509if-template.c" static const char *object_identifier_id; static proto_tree *top_of_dn = NULL; @@ -2082,7 +2080,7 @@ static void dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-x509if-fn.c ---*/ -#line 78 "packet-x509if-template.c" +#line 76 "packet-x509if-template.c" const char * x509if_get_last_dn(void) { @@ -2748,7 +2746,7 @@ void proto_register_x509if(void) { NULL, HFILL }}, /*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 123 "packet-x509if-template.c" +#line 121 "packet-x509if-template.c" }; /* List of subtrees */ @@ -2831,7 +2829,7 @@ void proto_register_x509if(void) { &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 128 "packet-x509if-template.c" +#line 126 "packet-x509if-template.c" }; /* Register protocol */ @@ -2887,6 +2885,6 @@ void proto_reg_handoff_x509if(void) { /*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 147 "packet-x509if-template.c" +#line 145 "packet-x509if-template.c" } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 73de715518..438b324ff9 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -40,8 +40,6 @@ #include <epan/oids.h> #include <epan/asn1.h> -#include <string.h> - #include "packet-ber.h" #include "packet-x411.h" #include "packet-x509sat.h" @@ -216,7 +214,7 @@ static int hf_x509sat_T_bitNamedDays_friday = -1; static int hf_x509sat_T_bitNamedDays_saturday = -1; /*--- End of included file: packet-x509sat-hf.c ---*/ -#line 49 "packet-x509sat-template.c" +#line 47 "packet-x509sat-template.c" /* Initialize the subtree pointers */ @@ -271,7 +269,7 @@ static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; /*--- End of included file: packet-x509sat-ett.c ---*/ -#line 52 "packet-x509sat-template.c" +#line 50 "packet-x509sat-template.c" /*--- Included file: packet-x509sat-fn.c ---*/ @@ -1728,7 +1726,7 @@ static void dissect_GUID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr /*--- End of included file: packet-x509sat-fn.c ---*/ -#line 54 "packet-x509sat-template.c" +#line 52 "packet-x509sat-template.c" /*--- proto_register_x509sat ----------------------------------------------*/ @@ -2369,7 +2367,7 @@ void proto_register_x509sat(void) { NULL, HFILL }}, /*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 62 "packet-x509sat-template.c" +#line 60 "packet-x509sat-template.c" }; /* List of subtrees */ @@ -2426,7 +2424,7 @@ void proto_register_x509sat(void) { &ett_x509sat_LocaleContextSyntax, /*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 67 "packet-x509sat-template.c" +#line 65 "packet-x509sat-template.c" }; /* Register protocol */ @@ -2597,7 +2595,7 @@ void proto_reg_handoff_x509sat(void) { /*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 82 "packet-x509sat-template.c" +#line 80 "packet-x509sat-template.c" /* OBJECT CLASSES */ |