From 6d3b007130082ef13b5004df8476950ab071b443 Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Mon, 5 May 2014 15:11:47 +0200
Subject: [PATCH] zscanner: remove unused constants also from scanner.g2
---
scripts/update-parser.sh | 4 ++++
src/zscanner/scanner.c.g2 | 41 ---------------------------------------
2 files changed, 4 insertions(+), 41 deletions(-)
diff --git a/scripts/update-parser.sh b/scripts/update-parser.sh
index 4a99d94574..3acb1ef103 100755
--- a/scripts/update-parser.sh
+++ b/scripts/update-parser.sh
@@ -17,4 +17,8 @@ ragel -G2 -s -o $OUT $IN
sed '/#line/d' $OUT > $OUT.g2
rm $OUT
+# Remove unused constants because of clang 3.4 warnings
+sed -e '/static\ const\ int\ zone_scanner_en_/d' -e '/zone_scanner_first_final/d' $OUT.g2 > ./tmp
+mv -f ./tmp $OUT.g2
+
popd
diff --git a/src/zscanner/scanner.c.g2 b/src/zscanner/scanner.c.g2
index d3632ba002..c80f41917d 100644
--- a/src/zscanner/scanner.c.g2
+++ b/src/zscanner/scanner.c.g2
@@ -84,49 +84,8 @@ static inline void window_add_bit(const uint16_t type, zs_scanner_t *s) {
// Include scanner file (in Ragel).
static const int zone_scanner_start = 1056;
-static const int zone_scanner_first_final = 1056;
static const int zone_scanner_error = 0;
-static const int zone_scanner_en_err_line = 246;
-static const int zone_scanner_en_dname_ = 248;
-static const int zone_scanner_en_text_ = 257;
-static const int zone_scanner_en_default_ttl_ = 269;
-static const int zone_scanner_en_zone_origin_ = 278;
-static const int zone_scanner_en_include_file_ = 290;
-static const int zone_scanner_en_base64_ = 307;
-static const int zone_scanner_en_bitmap_ = 314;
-static const int zone_scanner_en_nonempty_hex_r_data = 434;
-static const int zone_scanner_en_hex_r_data = 443;
-static const int zone_scanner_en_dns_alg_ = 453;
-static const int zone_scanner_en_cert_type_ = 548;
-static const int zone_scanner_en_r_data_a = 589;
-static const int zone_scanner_en_r_data_ns = 591;
-static const int zone_scanner_en_r_data_soa = 593;
-static const int zone_scanner_en_r_data_hinfo = 625;
-static const int zone_scanner_en_r_data_minfo = 630;
-static const int zone_scanner_en_r_data_mx = 635;
-static const int zone_scanner_en_r_data_txt = 640;
-static const int zone_scanner_en_r_data_aaaa = 644;
-static const int zone_scanner_en_r_data_loc = 646;
-static const int zone_scanner_en_r_data_srv = 701;
-static const int zone_scanner_en_r_data_naptr = 712;
-static const int zone_scanner_en_r_data_cert = 729;
-static const int zone_scanner_en_r_data_apl = 740;
-static const int zone_scanner_en_r_data_ds = 751;
-static const int zone_scanner_en_r_data_sshfp = 764;
-static const int zone_scanner_en_r_data_ipseckey = 774;
-static const int zone_scanner_en_r_data_rrsig = 813;
-static const int zone_scanner_en_r_data_nsec = 955;
-static const int zone_scanner_en_r_data_dnskey = 958;
-static const int zone_scanner_en_r_data_dhcid = 969;
-static const int zone_scanner_en_r_data_nsec3 = 971;
-static const int zone_scanner_en_r_data_nsec3param = 1000;
-static const int zone_scanner_en_r_data_tlsa = 1013;
-static const int zone_scanner_en_r_data_l32 = 1026;
-static const int zone_scanner_en_r_data_l64 = 1031;
-static const int zone_scanner_en_r_data_eui48 = 1044;
-static const int zone_scanner_en_r_data_eui64 = 1050;
-static const int zone_scanner_en_main = 1056;
--
GitLab