From 5f58271562197447d50e4c727bc5c6e8ee1a1f0f Mon Sep 17 00:00:00 2001 From: Daniel Salzman <daniel.salzman@nic.cz> Date: Wed, 5 Mar 2014 12:10:42 +0100 Subject: [PATCH] zscanner: unify error codes --- Knot.files | 9 +- src/knot/zone/zone-create.c | 2 +- src/zscanner/error.c | 130 +- src/zscanner/error.h | 130 +- src/zscanner/functions.c | 10 +- src/zscanner/loader.c | 14 +- src/zscanner/scanner.c.g2 | 4830 ++++++++++----------- src/zscanner/scanner.c.t0 | 332 +- src/zscanner/scanner.rl | 4 +- src/zscanner/scanner_body.rl | 200 +- src/zscanner/tests/data/00-0_general.out | 2 +- src/zscanner/tests/data/00-1_general.out | 2 +- src/zscanner/tests/data/01_owner.out | 22 +- src/zscanner/tests/data/02_class.out | 4 +- src/zscanner/tests/data/03_rrttl.out | 10 +- src/zscanner/tests/data/04-0_ORIGIN.out | 2 +- src/zscanner/tests/data/04-1_ORIGIN.out | 2 +- src/zscanner/tests/data/04-2_ORIGIN.out | 2 +- src/zscanner/tests/data/04-3_ORIGIN.out | 2 +- src/zscanner/tests/data/04-4_ORIGIN.out | 2 +- src/zscanner/tests/data/04-5_ORIGIN.out | 2 +- src/zscanner/tests/data/04-6_ORIGIN.out | 2 +- src/zscanner/tests/data/04-7_ORIGIN.out | 2 +- src/zscanner/tests/data/04-8_ORIGIN.out | 2 +- src/zscanner/tests/data/04-9_ORIGIN.out | 2 +- src/zscanner/tests/data/05-0_TTL.out | 2 +- src/zscanner/tests/data/05-1_TTL.out | 2 +- src/zscanner/tests/data/05-2_TTL.out | 2 +- src/zscanner/tests/data/05-3_TTL.out | 2 +- src/zscanner/tests/data/05-4_TTL.out | 2 +- src/zscanner/tests/data/06-1_INCLUDE.out | 2 +- src/zscanner/tests/data/06-2_INCLUDE.out | 2 +- src/zscanner/tests/data/06-3_INCLUDE.out | 2 +- src/zscanner/tests/data/06-4_INCLUDE.out | 2 +- src/zscanner/tests/data/06-5_INCLUDE.out | 2 +- src/zscanner/tests/data/06-6_INCLUDE.out | 4 +- src/zscanner/tests/data/06-7_INCLUDE.out | 4 +- src/zscanner/tests/data/10_A.out | 14 +- src/zscanner/tests/data/11_AAAA.out | 14 +- src/zscanner/tests/data/12_TXT.out | 14 +- src/zscanner/tests/data/13_SPF.out | 2 +- src/zscanner/tests/data/14_NS.out | 26 +- src/zscanner/tests/data/15_CNAME.out | 2 +- src/zscanner/tests/data/16_PTR.out | 2 +- src/zscanner/tests/data/17_DNAME.out | 2 +- src/zscanner/tests/data/18_MX.out | 14 +- src/zscanner/tests/data/19_AFSDB.out | 2 +- src/zscanner/tests/data/20_RT.out | 2 +- src/zscanner/tests/data/21_KX.out | 2 +- src/zscanner/tests/data/22_HINFO.out | 16 +- src/zscanner/tests/data/23_MINFO.out | 6 +- src/zscanner/tests/data/24_RP.out | 2 +- src/zscanner/tests/data/25_SOA.out | 20 +- src/zscanner/tests/data/26_SRV.out | 24 +- src/zscanner/tests/data/27_NAPTR.out | 14 +- src/zscanner/tests/data/28_TYPE.out | 16 +- src/zscanner/tests/data/29_CERT.out | 34 +- src/zscanner/tests/data/30_KEY.out | 32 +- src/zscanner/tests/data/31_DNSKEY.out | 32 +- src/zscanner/tests/data/32_APL.out | 16 +- src/zscanner/tests/data/33_DS.out | 20 +- src/zscanner/tests/data/34_SSHFP.out | 18 +- src/zscanner/tests/data/35_IPSECKEY.out | 22 +- src/zscanner/tests/data/36_RRSIG.out | 50 +- src/zscanner/tests/data/37_NSEC.out | 10 +- src/zscanner/tests/data/38_DHCID.out | 24 +- src/zscanner/tests/data/39_NSEC3.out | 48 +- src/zscanner/tests/data/40_NSEC3PARAM.out | 22 +- src/zscanner/tests/data/41_TLSA.out | 18 +- src/zscanner/tests/data/42_LOC.out | 50 +- src/zscanner/tests/data/43_EUI48.out | 18 +- src/zscanner/tests/data/44_EUI64.out | 18 +- src/zscanner/tests/data/45_NID.out | 2 +- src/zscanner/tests/data/46_L32.out | 18 +- src/zscanner/tests/data/47_L64.out | 20 +- src/zscanner/tests/data/48_LP.out | 2 +- src/zscanner/tests/zscanner-tool.c | 4 +- 77 files changed, 3210 insertions(+), 3211 deletions(-) diff --git a/Knot.files b/Knot.files index 3add8bc5e1..6dc9603faf 100644 --- a/Knot.files +++ b/Knot.files @@ -246,16 +246,15 @@ src/utils/nsupdate/nsupdate_params.h src/zscanner/Makefile.am src/zscanner/error.c src/zscanner/error.h -src/zscanner/file_loader.c -src/zscanner/file_loader.h +src/zscanner/functions.c +src/zscanner/functions.h +src/zscanner/loader.c +src/zscanner/loader.h src/zscanner/scanner.h src/zscanner/scanner.rl src/zscanner/scanner_body.rl -src/zscanner/scanner_functions.c -src/zscanner/scanner_functions.h src/zscanner/tests/processing.c src/zscanner/tests/processing.h -src/zscanner/tests/runtests.c src/zscanner/tests/tests.c src/zscanner/tests/tests.h src/zscanner/tests/zscanner-tool.c diff --git a/src/knot/zone/zone-create.c b/src/knot/zone/zone-create.c index a4b649ac90..b83ffd59d8 100644 --- a/src/knot/zone/zone-create.c +++ b/src/knot/zone/zone-create.c @@ -247,7 +247,7 @@ knot_zone_contents_t *zonefile_load(zloader_t *loader) zcreator_t *zc = loader->creator; assert(zc); int ret = zs_loader_process(loader->file_loader); - if (ret != ZSCANNER_OK) { + if (ret != ZS_OK) { log_zone_error("%s: zone file could not be loaded (%s).\n", loader->source, zs_strerror(ret)); goto fail; diff --git a/src/zscanner/error.c b/src/zscanner/error.c index 0dd3399427..16ab4de439 100644 --- a/src/zscanner/error.c +++ b/src/zscanner/error.c @@ -28,138 +28,138 @@ typedef struct { #define ERR_ITEM(code, text) { code, text, #code } const err_table_t err_msgs[] = { - ERR_ITEM( ZSCANNER_OK, "OK" ), + ERR_ITEM( ZS_OK, "OK" ), /* Zone file loader errors. */ - ERR_ITEM( FLOADER_EFSTAT, + ERR_ITEM( ZS_LOADER_FSTAT, "Fstat error." ), - ERR_ITEM( FLOADER_EDIRECTORY, + ERR_ITEM( ZS_LOADER_DIRECTORY, "Zone file is a directory." ), - ERR_ITEM( FLOADER_EEMPTY, + ERR_ITEM( ZS_LOADER_EMPTY, "Empty zone file." ), - ERR_ITEM( FLOADER_EMMAP, + ERR_ITEM( ZS_LOADER_MMAP, "Mmap error." ), - ERR_ITEM( FLOADER_EMUNMAP, + ERR_ITEM( ZS_LOADER_MUNMAP, "Munmap error." ), - ERR_ITEM( FLOADER_ESCANNER, + ERR_ITEM( ZS_LOADER_SCANNER, "Zone processing error." ), /* Zone scanner errors. */ - ERR_ITEM( ZSCANNER_DOS_NEWLINE, + ERR_ITEM( ZS_DOS_NEWLINE, "Unsupported CRLF newline. Please, remove CR bytes." ), - ERR_ITEM( ZSCANNER_UNCOVERED_STATE, + ERR_ITEM( ZS_UNCOVERED_STATE, "General scanner error." ), - ERR_ITEM( ZSCANNER_UNCLOSED_MULTILINE, + ERR_ITEM( ZS_UNCLOSED_MULTILINE, "Unclosed last multiline block." ), - ERR_ITEM( ZSCANNER_ELEFT_PARENTHESIS, + ERR_ITEM( ZS_LEFT_PARENTHESIS, "Too many left parentheses." ), - ERR_ITEM( ZSCANNER_ERIGHT_PARENTHESIS, + ERR_ITEM( ZS_RIGHT_PARENTHESIS, "Too many right parentheses." ), - ERR_ITEM( ZSCANNER_EUNSUPPORTED_TYPE, + ERR_ITEM( ZS_UNSUPPORTED_TYPE, "Unsupported record type." ), - ERR_ITEM( ZSCANNER_EBAD_PREVIOUS_OWNER, + ERR_ITEM( ZS_BAD_PREVIOUS_OWNER, "Previous owner is invalid." ), - ERR_ITEM( ZSCANNER_EBAD_DNAME_CHAR, + ERR_ITEM( ZS_BAD_DNAME_CHAR, "Invalid domain name character." ), - ERR_ITEM( ZSCANNER_EBAD_OWNER, + ERR_ITEM( ZS_BAD_OWNER, "Owner is invalid." ), - ERR_ITEM( ZSCANNER_ELABEL_OVERFLOW, + ERR_ITEM( ZS_LABEL_OVERFLOW, "Maximal domain name label length has exceeded." ), - ERR_ITEM( ZSCANNER_EDNAME_OVERFLOW, + ERR_ITEM( ZS_DNAME_OVERFLOW, "Maximal domain name length has exceeded." ), - ERR_ITEM( ZSCANNER_EBAD_NUMBER, + ERR_ITEM( ZS_BAD_NUMBER, "Invalid number." ), - ERR_ITEM( ZSCANNER_ENUMBER64_OVERFLOW, + ERR_ITEM( ZS_NUMBER64_OVERFLOW, "Number is too big." ), - ERR_ITEM( ZSCANNER_ENUMBER32_OVERFLOW, + ERR_ITEM( ZS_NUMBER32_OVERFLOW, "Number is bigger than 32 bits." ), - ERR_ITEM( ZSCANNER_ENUMBER16_OVERFLOW, + ERR_ITEM( ZS_NUMBER16_OVERFLOW, "Number is bigger than 16 bits." ), - ERR_ITEM( ZSCANNER_ENUMBER8_OVERFLOW, + ERR_ITEM( ZS_NUMBER8_OVERFLOW, "Number is bigger than 8 bits." ), - ERR_ITEM( ZSCANNER_EFLOAT_OVERFLOW, + ERR_ITEM( ZS_FLOAT_OVERFLOW, "Float number overflow." ), - ERR_ITEM( ZSCANNER_ERDATA_OVERFLOW, + ERR_ITEM( ZS_RDATA_OVERFLOW, "Maximal record data length has exceeded." ), - ERR_ITEM( ZSCANNER_EITEM_OVERFLOW, + ERR_ITEM( ZS_ITEM_OVERFLOW, "Maximal item length has exceeded." ), - ERR_ITEM( ZSCANNER_EBAD_ADDRESS_CHAR, + ERR_ITEM( ZS_BAD_ADDRESS_CHAR, "Invalid address character." ), - ERR_ITEM( ZSCANNER_EBAD_IPV4, + ERR_ITEM( ZS_BAD_IPV4, "Invalid IPv4 address." ), - ERR_ITEM( ZSCANNER_EBAD_IPV6, + ERR_ITEM( ZS_BAD_IPV6, "Invalid IPv6 address." ), - ERR_ITEM( ZSCANNER_EBAD_GATEWAY, + ERR_ITEM( ZS_BAD_GATEWAY, "Invalid gateway." ), - ERR_ITEM( ZSCANNER_EBAD_GATEWAY_KEY, + ERR_ITEM( ZS_BAD_GATEWAY_KEY, "Invalid gateway key." ), - ERR_ITEM( ZSCANNER_EBAD_APL, + ERR_ITEM( ZS_BAD_APL, "Invalid address prefix list." ), - ERR_ITEM( ZSCANNER_EBAD_RDATA, + ERR_ITEM( ZS_BAD_RDATA, "Invalid record data." ), - ERR_ITEM( ZSCANNER_EBAD_HEX_RDATA, + ERR_ITEM( ZS_BAD_HEX_RDATA, "Invalid record data in hex format." ), - ERR_ITEM( ZSCANNER_EBAD_HEX_CHAR, + ERR_ITEM( ZS_BAD_HEX_CHAR, "Invalid hexadecimal character." ), - ERR_ITEM( ZSCANNER_EBAD_BASE64_CHAR, + ERR_ITEM( ZS_BAD_BASE64_CHAR, "Invalid Base64 character." ), - ERR_ITEM( ZSCANNER_EBAD_BASE32HEX_CHAR, + ERR_ITEM( ZS_BAD_BASE32HEX_CHAR, "Invalid Base32hex character." ), - ERR_ITEM( ZSCANNER_EBAD_REST, + ERR_ITEM( ZS_BAD_REST, "Unexpected data." ), - ERR_ITEM( ZSCANNER_EBAD_TIMESTAMP_CHAR, + ERR_ITEM( ZS_BAD_TIMESTAMP_CHAR, "Invalid timestamp character." ), - ERR_ITEM( ZSCANNER_EBAD_TIMESTAMP_LENGTH, + ERR_ITEM( ZS_BAD_TIMESTAMP_LENGTH, "Invalid timestamp length." ), - ERR_ITEM( ZSCANNER_EBAD_TIMESTAMP, + ERR_ITEM( ZS_BAD_TIMESTAMP, "Invalid timestamp." ), - ERR_ITEM( ZSCANNER_EBAD_DATE, + ERR_ITEM( ZS_BAD_DATE, "Invalid date." ), - ERR_ITEM( ZSCANNER_EBAD_TIME, + ERR_ITEM( ZS_BAD_TIME, "Invalid time." ), - ERR_ITEM( ZSCANNER_EBAD_TIME_UNIT, + ERR_ITEM( ZS_BAD_TIME_UNIT, "Invalid time unit." ), - ERR_ITEM( ZSCANNER_EBAD_BITMAP, + ERR_ITEM( ZS_BAD_BITMAP, "Invalid bitmap." ), - ERR_ITEM( ZSCANNER_ETEXT_OVERFLOW, + ERR_ITEM( ZS_TEXT_OVERFLOW, "Text is too long." ), - ERR_ITEM( ZSCANNER_EBAD_TEXT_CHAR, + ERR_ITEM( ZS_BAD_TEXT_CHAR, "Invalid text character." ), - ERR_ITEM( ZSCANNER_EBAD_TEXT, + ERR_ITEM( ZS_BAD_TEXT, "Invalid text string." ), - ERR_ITEM( ZSCANNER_EBAD_DIRECTIVE, + ERR_ITEM( ZS_BAD_DIRECTIVE, "Invalid directive." ), - ERR_ITEM( ZSCANNER_EBAD_TTL, + ERR_ITEM( ZS_BAD_TTL, "Invalid zone TTL." ), - ERR_ITEM( ZSCANNER_EBAD_ORIGIN, + ERR_ITEM( ZS_BAD_ORIGIN, "Invalid FQDN zone origin." ), - ERR_ITEM( ZSCANNER_EBAD_INCLUDE_FILENAME, + ERR_ITEM( ZS_BAD_INCLUDE_FILENAME, "Invalid filename in include directive." ), - ERR_ITEM( ZSCANNER_EBAD_INCLUDE_ORIGIN, + ERR_ITEM( ZS_BAD_INCLUDE_ORIGIN, "Invalid origin in include directive." ), - ERR_ITEM( ZSCANNER_EUNPROCESSED_INCLUDE, + ERR_ITEM( ZS_UNPROCESSED_INCLUDE, "Include file processing error." ), - ERR_ITEM( ZSCANNER_EUNOPENED_INCLUDE, + ERR_ITEM( ZS_UNOPENED_INCLUDE, "Include file opening error." ), - ERR_ITEM( ZSCANNER_EBAD_RDATA_LENGTH, + ERR_ITEM( ZS_BAD_RDATA_LENGTH, "The rdata length statement is incorrect." ), - ERR_ITEM( ZSCANNER_ECANNOT_TEXT_DATA, + ERR_ITEM( ZS_CANNOT_TEXT_DATA, "Unable to process text form for this type." ), - ERR_ITEM( ZSCANNER_EBAD_LOC_DATA, + ERR_ITEM( ZS_BAD_LOC_DATA, "Invalid zone location data." ), - ERR_ITEM( ZSCANNER_EUNKNOWN_BLOCK, + ERR_ITEM( ZS_UNKNOWN_BLOCK, "Unknown rdata block." ), - ERR_ITEM( ZSCANNER_EBAD_ALGORITHM, + ERR_ITEM( ZS_BAD_ALGORITHM, "Invalid algorithm." ), - ERR_ITEM( ZSCANNER_EBAD_CERT_TYPE, + ERR_ITEM( ZS_BAD_CERT_TYPE, "Invalid certificate type." ), - ERR_ITEM( ZSCANNER_EBAD_EUI_LENGTH, + ERR_ITEM( ZS_BAD_EUI_LENGTH, "Invalid EUI length." ), - ERR_ITEM( ZSCANNER_EBAD_L64_LENGTH, + ERR_ITEM( ZS_BAD_L64_LENGTH, "Invalid 64-bit locator." ), - ERR_ITEM( ZSCANNER_EBAD_CHAR_COLON, + ERR_ITEM( ZS_BAD_CHAR_COLON, "Missing colon character." ), - ERR_ITEM( ZSCANNER_EBAD_CHAR_DASH, + ERR_ITEM( ZS_BAD_CHAR_DASH, "Missing dash character." ), ERR_ITEM( 0, NULL ) // Terminator diff --git a/src/zscanner/error.h b/src/zscanner/error.h index 5866c19807..69047af47c 100644 --- a/src/zscanner/error.h +++ b/src/zscanner/error.h @@ -26,73 +26,73 @@ #define _ZSCANNER__ERROR_H_ enum err_codes { - ZSCANNER_OK = 0, + ZS_OK = 0, - FLOADER_EFSTAT = -1000, - FLOADER_EDIRECTORY, - FLOADER_EEMPTY, - FLOADER_EMMAP, - FLOADER_EMUNMAP, - FLOADER_ESCANNER, + ZS_LOADER_FSTAT = -1000, + ZS_LOADER_DIRECTORY, + ZS_LOADER_EMPTY, + ZS_LOADER_MMAP, + ZS_LOADER_MUNMAP, + ZS_LOADER_SCANNER, - ZSCANNER_DOS_NEWLINE, - ZSCANNER_UNCOVERED_STATE, - ZSCANNER_UNCLOSED_MULTILINE, - ZSCANNER_ELEFT_PARENTHESIS, - ZSCANNER_ERIGHT_PARENTHESIS, - ZSCANNER_EUNSUPPORTED_TYPE, - ZSCANNER_EBAD_PREVIOUS_OWNER, - ZSCANNER_EBAD_DNAME_CHAR, - ZSCANNER_EBAD_OWNER, - ZSCANNER_ELABEL_OVERFLOW, - ZSCANNER_EDNAME_OVERFLOW, - ZSCANNER_EBAD_NUMBER, - ZSCANNER_ENUMBER64_OVERFLOW, - ZSCANNER_ENUMBER32_OVERFLOW, - ZSCANNER_ENUMBER16_OVERFLOW, - ZSCANNER_ENUMBER8_OVERFLOW, - ZSCANNER_EFLOAT_OVERFLOW, - ZSCANNER_ERDATA_OVERFLOW, - ZSCANNER_EITEM_OVERFLOW, - ZSCANNER_EBAD_ADDRESS_CHAR, - ZSCANNER_EBAD_IPV4, - ZSCANNER_EBAD_IPV6, - ZSCANNER_EBAD_GATEWAY, - ZSCANNER_EBAD_GATEWAY_KEY, - ZSCANNER_EBAD_APL, - ZSCANNER_EBAD_RDATA, - ZSCANNER_EBAD_HEX_RDATA, - ZSCANNER_EBAD_HEX_CHAR, - ZSCANNER_EBAD_BASE64_CHAR, - ZSCANNER_EBAD_BASE32HEX_CHAR, - ZSCANNER_EBAD_REST, - ZSCANNER_EBAD_TIMESTAMP_CHAR, - ZSCANNER_EBAD_TIMESTAMP_LENGTH, - ZSCANNER_EBAD_TIMESTAMP, - ZSCANNER_EBAD_DATE, - ZSCANNER_EBAD_TIME, - ZSCANNER_EBAD_TIME_UNIT, - ZSCANNER_EBAD_BITMAP, - ZSCANNER_ETEXT_OVERFLOW, - ZSCANNER_EBAD_TEXT_CHAR, - ZSCANNER_EBAD_TEXT, - ZSCANNER_EBAD_DIRECTIVE, - ZSCANNER_EBAD_TTL, - ZSCANNER_EBAD_ORIGIN, - ZSCANNER_EBAD_INCLUDE_FILENAME, - ZSCANNER_EBAD_INCLUDE_ORIGIN, - ZSCANNER_EUNPROCESSED_INCLUDE, - ZSCANNER_EUNOPENED_INCLUDE, - ZSCANNER_EBAD_RDATA_LENGTH, - ZSCANNER_ECANNOT_TEXT_DATA, - ZSCANNER_EBAD_LOC_DATA, - ZSCANNER_EUNKNOWN_BLOCK, - ZSCANNER_EBAD_ALGORITHM, - ZSCANNER_EBAD_CERT_TYPE, - ZSCANNER_EBAD_EUI_LENGTH, - ZSCANNER_EBAD_L64_LENGTH, - ZSCANNER_EBAD_CHAR_COLON, - ZSCANNER_EBAD_CHAR_DASH + ZS_DOS_NEWLINE, + ZS_UNCOVERED_STATE, + ZS_UNCLOSED_MULTILINE, + ZS_LEFT_PARENTHESIS, + ZS_RIGHT_PARENTHESIS, + ZS_UNSUPPORTED_TYPE, + ZS_BAD_PREVIOUS_OWNER, + ZS_BAD_DNAME_CHAR, + ZS_BAD_OWNER, + ZS_LABEL_OVERFLOW, + ZS_DNAME_OVERFLOW, + ZS_BAD_NUMBER, + ZS_NUMBER64_OVERFLOW, + ZS_NUMBER32_OVERFLOW, + ZS_NUMBER16_OVERFLOW, + ZS_NUMBER8_OVERFLOW, + ZS_FLOAT_OVERFLOW, + ZS_RDATA_OVERFLOW, + ZS_ITEM_OVERFLOW, + ZS_BAD_ADDRESS_CHAR, + ZS_BAD_IPV4, + ZS_BAD_IPV6, + ZS_BAD_GATEWAY, + ZS_BAD_GATEWAY_KEY, + ZS_BAD_APL, + ZS_BAD_RDATA, + ZS_BAD_HEX_RDATA, + ZS_BAD_HEX_CHAR, + ZS_BAD_BASE64_CHAR, + ZS_BAD_BASE32HEX_CHAR, + ZS_BAD_REST, + ZS_BAD_TIMESTAMP_CHAR, + ZS_BAD_TIMESTAMP_LENGTH, + ZS_BAD_TIMESTAMP, + ZS_BAD_DATE, + ZS_BAD_TIME, + ZS_BAD_TIME_UNIT, + ZS_BAD_BITMAP, + ZS_TEXT_OVERFLOW, + ZS_BAD_TEXT_CHAR, + ZS_BAD_TEXT, + ZS_BAD_DIRECTIVE, + ZS_BAD_TTL, + ZS_BAD_ORIGIN, + ZS_BAD_INCLUDE_FILENAME, + ZS_BAD_INCLUDE_ORIGIN, + ZS_UNPROCESSED_INCLUDE, + ZS_UNOPENED_INCLUDE, + ZS_BAD_RDATA_LENGTH, + ZS_CANNOT_TEXT_DATA, + ZS_BAD_LOC_DATA, + ZS_UNKNOWN_BLOCK, + ZS_BAD_ALGORITHM, + ZS_BAD_CERT_TYPE, + ZS_BAD_EUI_LENGTH, + ZS_BAD_L64_LENGTH, + ZS_BAD_CHAR_COLON, + ZS_BAD_CHAR_DASH }; /*! diff --git a/src/zscanner/functions.c b/src/zscanner/functions.c index 778548e0b1..457def2b6e 100644 --- a/src/zscanner/functions.c +++ b/src/zscanner/functions.c @@ -743,7 +743,7 @@ int date_to_timestamp(uint8_t *buff, uint32_t *timestamp) second = 10 * (buff[12] - '0') + (buff[13] - '0'); if (year < 1970 || year > 2105 || month < 1 || month > 12 || day < 1) { - return ZSCANNER_EBAD_DATE; + return ZS_BAD_DATE; } else { year -= 1970; } @@ -753,14 +753,14 @@ int date_to_timestamp(uint8_t *buff, uint32_t *timestamp) leap_day = 1; // Add one day in case of leap year. } else if (month == 2 && day > (uint32_t)(days_in_months[month] + 1)) { - return ZSCANNER_EBAD_DATE; + return ZS_BAD_DATE; } } else if (day > days_in_months[month]){ - return ZSCANNER_EBAD_DATE; + return ZS_BAD_DATE; } if (hour > 23 || minute > 59 || second > 59) { - return ZSCANNER_EBAD_TIME; + return ZS_BAD_TIME; } *timestamp = hour * 3600 + minute * 60 + second + @@ -768,7 +768,7 @@ int date_to_timestamp(uint8_t *buff, uint32_t *timestamp) days_across_months[month] + day - 1 + leap_day) * 86400; - return ZSCANNER_OK; + return ZS_OK; } void wire_dname_to_str(const uint8_t *data, diff --git a/src/zscanner/loader.c b/src/zscanner/loader.c index 0b2e772a4e..94441cbc47 100644 --- a/src/zscanner/loader.c +++ b/src/zscanner/loader.c @@ -100,17 +100,17 @@ int zs_loader_process(zs_loader_t *fl) // Getting file information. if (fstat(fl->fd, &file_stat) == -1) { - return FLOADER_EFSTAT; + return ZS_LOADER_FSTAT; } // Check for directory. if (S_ISDIR(file_stat.st_mode)) { - return FLOADER_EDIRECTORY; + return ZS_LOADER_DIRECTORY; } // Check for empty file. if (file_stat.st_size == 0) { - return FLOADER_EEMPTY; + return ZS_LOADER_EMPTY; } // Block size adjustment to multiple of page size. @@ -139,7 +139,7 @@ int zs_loader_process(zs_loader_t *fl) fl->fd, scanner_start); if (data == MAP_FAILED) { - return FLOADER_EMMAP; + return ZS_LOADER_MMAP; } // Scan zone file. @@ -158,14 +158,14 @@ int zs_loader_process(zs_loader_t *fl) // Zone file block unmapping. if (munmap(data, block_size) == -1) { - return FLOADER_EMUNMAP; + return ZS_LOADER_MUNMAP; } } // Check for scanner return. if (ret != 0) { - return FLOADER_ESCANNER; + return ZS_LOADER_SCANNER; } - return ZSCANNER_OK; + return ZS_OK; } diff --git a/src/zscanner/scanner.c.g2 b/src/zscanner/scanner.c.g2 index 3215f7e2e2..e44419ccbf 100644 --- a/src/zscanner/scanner.c.g2 +++ b/src/zscanner/scanner.c.g2 @@ -29,20 +29,20 @@ #include <arpa/inet.h> // inet_pton #include "zscanner/scanner.h" -#include "zscanner/error.h" // error codes -#include "zscanner/file_loader.h" // file_loader -#include "zscanner/scanner_functions.h" // Base64 -#include "common/descriptor.h" // KNOT_RRTYPE_A +#include "zscanner/loader.h" // loader in includes +#include "zscanner/error.h" +#include "zscanner/functions.h" +#include "common/descriptor.h" /*! \brief Shorthand for setting warning data. */ #define WARN(code) { s->error_code = code; } /*! \brief Shorthand for setting error data. */ -#define ERR(code) { s->error_code = code; s->stop = true; } +#define ERR(code) { s->error_code = code; s->stop = true; } /*! * \brief Empty function which is called if no callback function is specified. */ -static inline void noop(const scanner_t *s) +static inline void noop(const zs_scanner_t *s) { (void)s; } @@ -65,7 +65,7 @@ static inline void type_num(const uint16_t type, uint8_t **rdata_tail) * \param type Type number. * \param s Scanner context. */ -static inline void window_add_bit(const uint16_t type, scanner_t *s) { +static inline void window_add_bit(const uint16_t type, zs_scanner_t *s) { uint8_t win = type / 256; uint8_t bit_pos = type % 256; uint8_t byte_pos = bit_pos / 8; @@ -131,17 +131,17 @@ static const int zone_scanner_en_main = 1059; -scanner_t* scanner_create(const char *file_name, - const char *origin, - const uint16_t rclass, - const uint32_t ttl, - void (*process_record)(const scanner_t *), - void (*process_error)(const scanner_t *), - void *data) +zs_scanner_t* zs_scanner_create(const char *file_name, + const char *origin, + const uint16_t rclass, + const uint32_t ttl, + void (*process_record)(const zs_scanner_t *), + void (*process_error)(const zs_scanner_t *), + void *data) { char settings[1024]; - scanner_t *s = calloc(1, sizeof(scanner_t)); + zs_scanner_t *s = calloc(1, sizeof(zs_scanner_t)); if (s == NULL) { return NULL; } @@ -180,8 +180,8 @@ scanner_t* scanner_create(const char *file_name, } int ret = snprintf(settings, sizeof(settings), format, origin); if (ret <= 0 || (size_t)ret >= sizeof(settings) || - scanner_process(settings, settings + ret, true, s) != 0) { - scanner_free(s); + zs_scanner_process(settings, settings + ret, true, s) != 0) { + zs_scanner_free(s); return NULL; } @@ -196,7 +196,7 @@ scanner_t* scanner_create(const char *file_name, return s; } -void scanner_free(scanner_t *s) +void zs_scanner_free(zs_scanner_t *s) { if (s != NULL) { free(s->file_name); @@ -205,10 +205,10 @@ void scanner_free(scanner_t *s) } } -int scanner_process(const char *start, - const char *end, - const bool is_complete, - scanner_t *s) +int zs_scanner_process(const char *start, + const char *end, + const bool is_complete, + zs_scanner_t *s) { // Necessary scanner variables. const char *p = start; @@ -1409,7 +1409,7 @@ tr19: tr81: { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -1469,852 +1469,852 @@ case 1059: goto tr3140; tr0: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr23: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } goto st0; tr35: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } goto st0; tr55: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr69: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr77: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr83: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr95: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr119: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr125: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr524: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } goto st0; tr526: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr591: { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); p--; {goto st246;} } goto st0; tr602: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } goto st0; tr614: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } goto st0; tr638: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr653: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr681: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); p--; {goto st246;} } goto st0; tr691: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr697: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr708: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr721: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr774: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } goto st0; tr779: { - WARN(ZSCANNER_EBAD_DNAME_CHAR); + WARN(ZS_BAD_DNAME_CHAR); p--; {goto st246;} } goto st0; tr794: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_DNAME_CHAR); + WARN(ZS_BAD_DNAME_CHAR); p--; {goto st246;} } goto st0; tr802: { - WARN(ZSCANNER_EBAD_TEXT_CHAR); + WARN(ZS_BAD_TEXT_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {goto st246;} } goto st0; tr809: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TEXT_CHAR); + WARN(ZS_BAD_TEXT_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {goto st246;} } goto st0; tr819: { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {goto st246;} } goto st0; tr826: { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } goto st0; tr832: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } goto st0; tr834: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } goto st0; tr846: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } goto st0; tr848: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } goto st0; tr861: { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {goto st246;} } goto st0; tr872: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {goto st246;} } goto st0; tr889: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {goto st246;} } goto st0; tr901: { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } goto st0; tr902: { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr909: { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr920: { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {goto st246;} } goto st0; tr936: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {goto st246;} } goto st0; tr948: { - WARN(ZSCANNER_EBAD_BASE64_CHAR); + WARN(ZS_BAD_BASE64_CHAR); p--; {goto st246;} } goto st0; tr962: { - WARN(ZSCANNER_EBAD_BITMAP); + WARN(ZS_BAD_BITMAP); p--; {goto st246;} } goto st0; tr1409: { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } goto st0; tr1415: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } goto st0; tr1423: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } goto st0; tr1473: { - WARN(ZSCANNER_EBAD_ALGORITHM); + WARN(ZS_BAD_ALGORITHM); p--; {goto st246;} } goto st0; tr1584: { - WARN(ZSCANNER_EBAD_CERT_TYPE); + WARN(ZS_BAD_CERT_TYPE); p--; {goto st246;} } goto st0; tr1637: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr1660: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr1679: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr1846: { - WARN(ZSCANNER_EBAD_LOC_DATA); + WARN(ZS_BAD_LOC_DATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2203: { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2218: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2261: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2318: { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2333: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2347: { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2370: { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2384: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2391: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2496: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2549: { - WARN(ZSCANNER_EBAD_TIMESTAMP_CHAR); + WARN(ZS_BAD_TIMESTAMP_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2888: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr2976: { - WARN(ZSCANNER_EBAD_BASE32HEX_CHAR); + WARN(ZS_BAD_BASE32HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr3119: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_CHAR_COLON); + WARN(ZS_BAD_CHAR_COLON); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr3125: { - WARN(ZSCANNER_EBAD_CHAR_COLON); + WARN(ZS_BAD_CHAR_COLON); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr3129: { - WARN(ZSCANNER_EBAD_CHAR_DASH); + WARN(ZS_BAD_CHAR_DASH); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } goto st0; tr3140: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr3158: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr3178: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr3194: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; tr3217: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } goto st0; @@ -2324,7 +2324,7 @@ cs = 0; tr2: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2333,7 +2333,7 @@ tr2: tr3: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2342,7 +2342,7 @@ tr3: tr3141: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -2350,13 +2350,13 @@ tr3141: tr3143: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2365,13 +2365,13 @@ tr3143: tr3144: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2380,14 +2380,14 @@ tr3144: tr3204: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -2395,14 +2395,14 @@ tr3204: tr3205: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -2413,7 +2413,7 @@ tr3195: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -2424,13 +2424,13 @@ tr3197: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2442,13 +2442,13 @@ tr3198: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2525,7 +2525,7 @@ tr4: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -2541,7 +2541,7 @@ tr27: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -2586,7 +2586,7 @@ case 2: tr37: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2595,7 +2595,7 @@ tr37: tr38: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2611,7 +2611,7 @@ tr24: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2621,13 +2621,13 @@ tr25: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2638,13 +2638,13 @@ tr26: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2655,7 +2655,7 @@ tr33: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2668,7 +2668,7 @@ tr632: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2676,7 +2676,7 @@ tr632: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2686,7 +2686,7 @@ tr633: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2694,13 +2694,13 @@ tr633: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2711,7 +2711,7 @@ tr634: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2719,13 +2719,13 @@ tr634: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2736,7 +2736,7 @@ tr636: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2744,7 +2744,7 @@ tr636: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -2865,7 +2865,7 @@ case 4: tr70: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2874,7 +2874,7 @@ tr70: tr71: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2898,7 +2898,7 @@ tr57: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2911,7 +2911,7 @@ tr58: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2939,7 +2939,7 @@ tr136: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2952,7 +2952,7 @@ tr137: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -2980,7 +2980,7 @@ tr150: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -2993,7 +2993,7 @@ tr151: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3021,7 +3021,7 @@ tr164: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3034,7 +3034,7 @@ tr165: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3062,7 +3062,7 @@ tr176: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3075,7 +3075,7 @@ tr177: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3103,7 +3103,7 @@ tr187: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3116,7 +3116,7 @@ tr188: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3144,7 +3144,7 @@ tr195: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3157,7 +3157,7 @@ tr196: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3185,7 +3185,7 @@ tr208: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3198,7 +3198,7 @@ tr209: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3226,7 +3226,7 @@ tr217: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3239,7 +3239,7 @@ tr218: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3267,7 +3267,7 @@ tr229: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3280,7 +3280,7 @@ tr230: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3308,7 +3308,7 @@ tr269: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3321,7 +3321,7 @@ tr270: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3349,7 +3349,7 @@ tr280: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3362,7 +3362,7 @@ tr281: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3390,7 +3390,7 @@ tr288: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3403,7 +3403,7 @@ tr289: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3431,7 +3431,7 @@ tr301: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3444,7 +3444,7 @@ tr302: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3472,7 +3472,7 @@ tr310: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3485,7 +3485,7 @@ tr311: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3513,7 +3513,7 @@ tr319: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3526,7 +3526,7 @@ tr320: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3554,7 +3554,7 @@ tr327: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3567,7 +3567,7 @@ tr328: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3595,7 +3595,7 @@ tr340: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3608,7 +3608,7 @@ tr341: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3636,7 +3636,7 @@ tr348: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3649,7 +3649,7 @@ tr349: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3677,7 +3677,7 @@ tr362: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3690,7 +3690,7 @@ tr363: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3718,7 +3718,7 @@ tr371: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3731,7 +3731,7 @@ tr372: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3759,7 +3759,7 @@ tr379: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3772,7 +3772,7 @@ tr380: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3800,7 +3800,7 @@ tr389: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3813,7 +3813,7 @@ tr390: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3841,7 +3841,7 @@ tr398: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3854,7 +3854,7 @@ tr399: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3882,7 +3882,7 @@ tr411: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3895,7 +3895,7 @@ tr412: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3923,7 +3923,7 @@ tr421: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3936,7 +3936,7 @@ tr422: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -3964,7 +3964,7 @@ tr432: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -3977,7 +3977,7 @@ tr433: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4005,7 +4005,7 @@ tr443: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4018,7 +4018,7 @@ tr444: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4046,7 +4046,7 @@ tr451: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4059,7 +4059,7 @@ tr452: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4087,7 +4087,7 @@ tr464: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4100,7 +4100,7 @@ tr465: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4128,7 +4128,7 @@ tr473: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4141,7 +4141,7 @@ tr474: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4169,7 +4169,7 @@ tr482: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4182,7 +4182,7 @@ tr483: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4210,7 +4210,7 @@ tr493: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4223,7 +4223,7 @@ tr494: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4251,7 +4251,7 @@ tr506: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4264,7 +4264,7 @@ tr507: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4292,7 +4292,7 @@ tr515: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4305,7 +4305,7 @@ tr516: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4325,7 +4325,7 @@ tr527: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -4338,7 +4338,7 @@ tr528: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -4347,7 +4347,7 @@ tr528: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4358,7 +4358,7 @@ tr529: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -4367,7 +4367,7 @@ tr529: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4378,7 +4378,7 @@ tr531: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -4402,7 +4402,7 @@ tr735: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4415,7 +4415,7 @@ tr736: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4443,7 +4443,7 @@ tr746: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4456,7 +4456,7 @@ tr747: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4484,7 +4484,7 @@ tr755: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -4497,7 +4497,7 @@ tr756: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -4628,7 +4628,7 @@ tr64: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -4703,7 +4703,7 @@ tr67: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -4779,7 +4779,7 @@ tr84: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -4907,7 +4907,7 @@ tr140: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -4986,7 +4986,7 @@ tr154: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5065,7 +5065,7 @@ tr168: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5144,7 +5144,7 @@ tr180: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5223,7 +5223,7 @@ tr191: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5302,7 +5302,7 @@ tr199: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5381,7 +5381,7 @@ tr212: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5460,7 +5460,7 @@ tr221: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5539,7 +5539,7 @@ tr233: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5618,7 +5618,7 @@ tr273: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5697,7 +5697,7 @@ tr284: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5776,7 +5776,7 @@ tr292: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5855,7 +5855,7 @@ tr305: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -5934,7 +5934,7 @@ tr314: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6013,7 +6013,7 @@ tr323: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6092,7 +6092,7 @@ tr331: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6171,7 +6171,7 @@ tr344: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6250,7 +6250,7 @@ tr352: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6329,7 +6329,7 @@ tr366: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6408,7 +6408,7 @@ tr375: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6487,7 +6487,7 @@ tr384: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6566,7 +6566,7 @@ tr394: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6645,7 +6645,7 @@ tr403: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6724,7 +6724,7 @@ tr415: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6803,7 +6803,7 @@ tr425: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6882,7 +6882,7 @@ tr436: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -6961,7 +6961,7 @@ tr447: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7040,7 +7040,7 @@ tr455: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7119,7 +7119,7 @@ tr468: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7198,7 +7198,7 @@ tr477: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7277,7 +7277,7 @@ tr486: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7356,7 +7356,7 @@ tr497: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7435,7 +7435,7 @@ tr510: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7514,7 +7514,7 @@ tr519: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7524,7 +7524,7 @@ tr533: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -7600,7 +7600,7 @@ tr533: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7679,7 +7679,7 @@ tr739: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7758,7 +7758,7 @@ tr750: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7837,7 +7837,7 @@ tr759: case KNOT_RRTYPE_EUI64: {stack[top++] = 6; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -7872,7 +7872,7 @@ case 6: tr79: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -7881,7 +7881,7 @@ tr79: tr80: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -8143,7 +8143,7 @@ tr532: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -8199,7 +8199,7 @@ case 10: tr87: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -8208,7 +8208,7 @@ tr87: tr88: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -8291,7 +8291,7 @@ tr65: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8369,7 +8369,7 @@ tr75: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8451,7 +8451,7 @@ tr141: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8533,7 +8533,7 @@ tr155: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8615,7 +8615,7 @@ tr169: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8697,7 +8697,7 @@ tr181: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8779,7 +8779,7 @@ tr192: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8861,7 +8861,7 @@ tr200: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -8943,7 +8943,7 @@ tr213: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9025,7 +9025,7 @@ tr222: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9107,7 +9107,7 @@ tr234: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9189,7 +9189,7 @@ tr274: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9271,7 +9271,7 @@ tr285: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9353,7 +9353,7 @@ tr293: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9435,7 +9435,7 @@ tr306: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9517,7 +9517,7 @@ tr315: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9599,7 +9599,7 @@ tr324: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9681,7 +9681,7 @@ tr332: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9763,7 +9763,7 @@ tr345: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9845,7 +9845,7 @@ tr353: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -9927,7 +9927,7 @@ tr367: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10009,7 +10009,7 @@ tr376: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10091,7 +10091,7 @@ tr385: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10173,7 +10173,7 @@ tr395: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10255,7 +10255,7 @@ tr404: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10337,7 +10337,7 @@ tr416: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10419,7 +10419,7 @@ tr426: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10501,7 +10501,7 @@ tr437: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10583,7 +10583,7 @@ tr448: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10665,7 +10665,7 @@ tr456: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10747,7 +10747,7 @@ tr469: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10829,7 +10829,7 @@ tr478: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10911,7 +10911,7 @@ tr487: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -10993,7 +10993,7 @@ tr498: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11075,7 +11075,7 @@ tr511: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11157,7 +11157,7 @@ tr520: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11167,7 +11167,7 @@ tr534: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -11246,7 +11246,7 @@ tr534: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11328,7 +11328,7 @@ tr740: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11410,7 +11410,7 @@ tr751: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11492,7 +11492,7 @@ tr760: case KNOT_RRTYPE_EUI64: {stack[top++] = 11; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11585,7 +11585,7 @@ tr93: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -11603,7 +11603,7 @@ tr657: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -11677,7 +11677,7 @@ case 1060: tr96: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -11686,7 +11686,7 @@ tr96: tr97: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -11695,7 +11695,7 @@ tr97: tr3148: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -11703,14 +11703,14 @@ tr3148: tr3150: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -11718,14 +11718,14 @@ tr3150: tr3151: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -11820,7 +11820,7 @@ tr98: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -11893,7 +11893,7 @@ tr98: case KNOT_RRTYPE_EUI64: {stack[top++] = 14; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -11940,7 +11940,7 @@ case 14: tr127: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -11949,7 +11949,7 @@ tr127: tr128: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -11960,7 +11960,7 @@ tr120: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -11970,13 +11970,13 @@ tr121: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -11987,13 +11987,13 @@ tr122: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -12137,7 +12137,7 @@ case 19: tr144: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -12146,7 +12146,7 @@ tr144: tr145: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -12226,7 +12226,7 @@ tr66: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12301,7 +12301,7 @@ tr76: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12380,7 +12380,7 @@ tr142: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12459,7 +12459,7 @@ tr156: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12538,7 +12538,7 @@ tr170: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12617,7 +12617,7 @@ tr182: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12696,7 +12696,7 @@ tr193: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12775,7 +12775,7 @@ tr201: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12854,7 +12854,7 @@ tr214: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -12933,7 +12933,7 @@ tr223: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13012,7 +13012,7 @@ tr235: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13091,7 +13091,7 @@ tr275: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13170,7 +13170,7 @@ tr286: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13249,7 +13249,7 @@ tr294: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13328,7 +13328,7 @@ tr307: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13407,7 +13407,7 @@ tr316: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13486,7 +13486,7 @@ tr325: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13565,7 +13565,7 @@ tr333: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13644,7 +13644,7 @@ tr346: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13723,7 +13723,7 @@ tr354: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13802,7 +13802,7 @@ tr368: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13881,7 +13881,7 @@ tr377: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -13960,7 +13960,7 @@ tr386: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14039,7 +14039,7 @@ tr396: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14118,7 +14118,7 @@ tr405: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14197,7 +14197,7 @@ tr417: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14276,7 +14276,7 @@ tr427: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14355,7 +14355,7 @@ tr438: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14434,7 +14434,7 @@ tr449: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14513,7 +14513,7 @@ tr457: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14592,7 +14592,7 @@ tr470: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14671,7 +14671,7 @@ tr479: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14750,7 +14750,7 @@ tr488: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14829,7 +14829,7 @@ tr499: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14908,7 +14908,7 @@ tr512: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14987,7 +14987,7 @@ tr521: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -14997,7 +14997,7 @@ tr535: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -15073,7 +15073,7 @@ tr535: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -15152,7 +15152,7 @@ tr741: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -15231,7 +15231,7 @@ tr752: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -15310,7 +15310,7 @@ tr761: case KNOT_RRTYPE_EUI64: {stack[top++] = 20; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -15928,7 +15928,7 @@ case 52: tr244: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -15937,7 +15937,7 @@ tr244: tr245: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -15953,7 +15953,7 @@ tr567: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -15963,13 +15963,13 @@ tr568: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -15980,13 +15980,13 @@ tr569: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -15997,7 +15997,7 @@ tr576: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -16016,7 +16016,7 @@ tr239: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -16028,7 +16028,7 @@ tr240: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -16047,7 +16047,7 @@ tr585: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -16055,7 +16055,7 @@ tr585: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -16065,7 +16065,7 @@ tr586: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -16073,13 +16073,13 @@ tr586: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -16090,7 +16090,7 @@ tr587: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -16098,13 +16098,13 @@ tr587: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -16115,7 +16115,7 @@ tr589: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -16123,7 +16123,7 @@ tr589: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -17620,7 +17620,7 @@ tr525: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -17636,7 +17636,7 @@ tr530: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -17681,7 +17681,7 @@ tr577: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -17696,7 +17696,7 @@ tr590: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -17704,7 +17704,7 @@ tr590: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -17742,7 +17742,7 @@ tr129: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -17755,7 +17755,7 @@ tr123: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -17764,7 +17764,7 @@ tr123: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -17842,7 +17842,7 @@ case 1061: tr537: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -17851,7 +17851,7 @@ tr537: tr538: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -17860,7 +17860,7 @@ tr538: tr3159: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -17868,14 +17868,14 @@ tr3159: tr3160: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -17883,14 +17883,14 @@ tr3160: tr3161: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -17999,7 +17999,7 @@ case 130: tr548: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -18008,7 +18008,7 @@ tr548: tr549: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -18030,7 +18030,7 @@ tr543: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -18042,7 +18042,7 @@ tr544: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -18125,7 +18125,7 @@ tr550: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -18141,7 +18141,7 @@ tr570: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -18187,7 +18187,7 @@ tr571: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18196,7 +18196,7 @@ tr572: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18205,7 +18205,7 @@ tr573: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18214,7 +18214,7 @@ tr575: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18257,7 +18257,7 @@ tr579: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -18279,7 +18279,7 @@ tr578: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -18289,7 +18289,7 @@ tr588: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18309,7 +18309,7 @@ tr588: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -18337,7 +18337,7 @@ tr580: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18346,7 +18346,7 @@ tr581: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18355,7 +18355,7 @@ tr582: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18364,7 +18364,7 @@ tr584: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -18451,7 +18451,7 @@ tr706: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -18470,13 +18470,13 @@ tr701: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -18490,7 +18490,7 @@ tr3176: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -18749,7 +18749,7 @@ case 146: tr609: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -18758,7 +18758,7 @@ tr609: tr610: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -18780,7 +18780,7 @@ tr604: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -18792,7 +18792,7 @@ tr605: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -18904,7 +18904,7 @@ tr670: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -18921,7 +18921,7 @@ tr695: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -18932,7 +18932,7 @@ tr695: tr3146: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -18946,7 +18946,7 @@ tr3206: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -18957,7 +18957,7 @@ tr3202: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -18968,7 +18968,7 @@ tr3202: tr3210: { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -18980,7 +18980,7 @@ tr3210: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -18991,7 +18991,7 @@ tr3233: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -19000,7 +19000,7 @@ tr3233: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -19089,7 +19089,7 @@ tr3179: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -19139,7 +19139,7 @@ case 149: tr621: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -19148,7 +19148,7 @@ tr621: tr622: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -19167,7 +19167,7 @@ tr615: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19178,7 +19178,7 @@ tr616: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -19187,7 +19187,7 @@ tr616: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19198,7 +19198,7 @@ tr617: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -19207,7 +19207,7 @@ tr617: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19223,7 +19223,7 @@ tr618: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19291,7 +19291,7 @@ tr619: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19327,7 +19327,7 @@ tr28: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19336,7 +19336,7 @@ tr29: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19345,7 +19345,7 @@ tr30: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19354,7 +19354,7 @@ tr32: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19397,7 +19397,7 @@ tr626: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -19419,7 +19419,7 @@ tr625: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -19429,7 +19429,7 @@ tr635: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19449,7 +19449,7 @@ tr635: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -19477,7 +19477,7 @@ tr627: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19486,7 +19486,7 @@ tr628: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19495,7 +19495,7 @@ tr629: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19504,7 +19504,7 @@ tr631: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19541,7 +19541,7 @@ tr34: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19551,7 +19551,7 @@ tr637: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19559,7 +19559,7 @@ tr637: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -19656,7 +19656,7 @@ case 156: tr647: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -19665,7 +19665,7 @@ tr647: tr648: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -19691,7 +19691,7 @@ tr640: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -19707,7 +19707,7 @@ tr641: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -19879,7 +19879,7 @@ tr99: case KNOT_RRTYPE_EUI64: {stack[top++] = 158; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -19928,7 +19928,7 @@ case 158: tr664: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -19937,7 +19937,7 @@ tr664: tr665: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -19956,7 +19956,7 @@ tr655: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -19969,7 +19969,7 @@ tr656: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -20089,13 +20089,13 @@ tr90: case KNOT_RRTYPE_EUI64: {stack[top++] = 1065; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -20176,7 +20176,7 @@ tr115: case KNOT_RRTYPE_EUI64: {stack[top++] = 1065; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -20258,13 +20258,13 @@ tr659: case KNOT_RRTYPE_EUI64: {stack[top++] = 1065; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -20317,7 +20317,7 @@ case 1065: tr668: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -20326,7 +20326,7 @@ tr668: tr669: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -20343,7 +20343,7 @@ tr693: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -20355,7 +20355,7 @@ tr694: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -20364,7 +20364,7 @@ tr694: tr3207: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -20372,14 +20372,14 @@ tr3207: tr3208: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -20387,14 +20387,14 @@ tr3208: tr3209: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -20464,7 +20464,7 @@ tr696: tr3211: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -20575,7 +20575,7 @@ tr660: case KNOT_RRTYPE_EUI64: {stack[top++] = 162; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -20650,7 +20650,7 @@ tr91: case KNOT_RRTYPE_EUI64: {stack[top++] = 162; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -20693,7 +20693,7 @@ case 162: tr673: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -20702,7 +20702,7 @@ tr673: tr674: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -20820,13 +20820,13 @@ tr661: case KNOT_RRTYPE_EUI64: {stack[top++] = 1066; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -20907,13 +20907,13 @@ tr666: case KNOT_RRTYPE_EUI64: {stack[top++] = 1066; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -20987,7 +20987,7 @@ case 1066: tr676: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -20996,7 +20996,7 @@ tr676: tr677: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -21075,7 +21075,7 @@ tr651: case KNOT_RRTYPE_EUI64: {stack[top++] = 164; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -21160,7 +21160,7 @@ tr644: case KNOT_RRTYPE_EUI64: {stack[top++] = 164; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -21168,7 +21168,7 @@ tr644: tr3212: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -21176,14 +21176,14 @@ tr3212: tr3213: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -21191,14 +21191,14 @@ tr3213: tr3214: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -21355,7 +21355,7 @@ tr100: case KNOT_RRTYPE_EUI64: {stack[top++] = 165; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -21467,7 +21467,7 @@ tr101: case KNOT_RRTYPE_EUI64: {stack[top++] = 166; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -21581,7 +21581,7 @@ tr102: case KNOT_RRTYPE_EUI64: {stack[top++] = 167; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -21691,7 +21691,7 @@ tr103: case KNOT_RRTYPE_EUI64: {stack[top++] = 168; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -21801,7 +21801,7 @@ tr104: case KNOT_RRTYPE_EUI64: {stack[top++] = 169; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -21913,7 +21913,7 @@ tr105: case KNOT_RRTYPE_EUI64: {stack[top++] = 170; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22025,7 +22025,7 @@ tr106: case KNOT_RRTYPE_EUI64: {stack[top++] = 171; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22139,7 +22139,7 @@ tr107: case KNOT_RRTYPE_EUI64: {stack[top++] = 172; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22251,7 +22251,7 @@ tr108: case KNOT_RRTYPE_EUI64: {stack[top++] = 173; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22365,7 +22365,7 @@ tr109: case KNOT_RRTYPE_EUI64: {stack[top++] = 174; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22475,7 +22475,7 @@ tr110: case KNOT_RRTYPE_EUI64: {stack[top++] = 175; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22589,7 +22589,7 @@ tr111: case KNOT_RRTYPE_EUI64: {stack[top++] = 176; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22705,7 +22705,7 @@ tr112: case KNOT_RRTYPE_EUI64: {stack[top++] = 177; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -22755,7 +22755,7 @@ tr713: tr3215: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -22803,7 +22803,7 @@ tr680: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -22824,7 +22824,7 @@ tr712: } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -22838,7 +22838,7 @@ tr3154: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -23007,7 +23007,7 @@ tr3149: case KNOT_RRTYPE_EUI64: {stack[top++] = 179; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -23216,7 +23216,7 @@ tr3152: case KNOT_RRTYPE_EUI64: {stack[top++] = 189; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -23267,7 +23267,7 @@ tr3218: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -23340,7 +23340,7 @@ tr3218: case KNOT_RRTYPE_EUI64: {stack[top++] = 190; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -23392,7 +23392,7 @@ case 190: tr704: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -23401,7 +23401,7 @@ tr704: tr705: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -23415,7 +23415,7 @@ tr698: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -23426,7 +23426,7 @@ tr699: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -23435,7 +23435,7 @@ tr699: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -23446,7 +23446,7 @@ tr700: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -23455,7 +23455,7 @@ tr700: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -23525,7 +23525,7 @@ tr702: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -23638,7 +23638,7 @@ tr3219: case KNOT_RRTYPE_EUI64: {stack[top++] = 193; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -23692,7 +23692,7 @@ case 193: tr717: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -23701,7 +23701,7 @@ tr717: tr718: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -23722,7 +23722,7 @@ tr710: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -23738,7 +23738,7 @@ tr711: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -23897,7 +23897,7 @@ tr117: case KNOT_RRTYPE_EUI64: {stack[top++] = 1068; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -23975,13 +23975,13 @@ tr719: case KNOT_RRTYPE_EUI64: {stack[top++] = 1068; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -24069,13 +24069,13 @@ tr714: case KNOT_RRTYPE_EUI64: {stack[top++] = 1068; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } s->r_data_length = rdata_tail - s->r_data; @@ -24156,13 +24156,13 @@ tr3156: case KNOT_RRTYPE_EUI64: {stack[top++] = 1068; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -24337,7 +24337,7 @@ tr3220: case KNOT_RRTYPE_EUI64: {stack[top++] = 195; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -24454,7 +24454,7 @@ tr3221: case KNOT_RRTYPE_EUI64: {stack[top++] = 196; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -24573,7 +24573,7 @@ tr3222: case KNOT_RRTYPE_EUI64: {stack[top++] = 197; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -24688,7 +24688,7 @@ tr3223: case KNOT_RRTYPE_EUI64: {stack[top++] = 198; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -24803,7 +24803,7 @@ tr3224: case KNOT_RRTYPE_EUI64: {stack[top++] = 199; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -24920,7 +24920,7 @@ tr3225: case KNOT_RRTYPE_EUI64: {stack[top++] = 200; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25037,7 +25037,7 @@ tr3226: case KNOT_RRTYPE_EUI64: {stack[top++] = 201; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25156,7 +25156,7 @@ tr3227: case KNOT_RRTYPE_EUI64: {stack[top++] = 202; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25273,7 +25273,7 @@ tr3228: case KNOT_RRTYPE_EUI64: {stack[top++] = 203; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25392,7 +25392,7 @@ tr3229: case KNOT_RRTYPE_EUI64: {stack[top++] = 204; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25507,7 +25507,7 @@ tr3230: case KNOT_RRTYPE_EUI64: {stack[top++] = 205; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25626,7 +25626,7 @@ tr3231: case KNOT_RRTYPE_EUI64: {stack[top++] = 206; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25747,7 +25747,7 @@ tr3232: case KNOT_RRTYPE_EUI64: {stack[top++] = 207; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25907,7 +25907,7 @@ tr720: case KNOT_RRTYPE_EUI64: {stack[top++] = 209; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -25918,7 +25918,7 @@ tr722: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -25993,7 +25993,7 @@ tr722: case KNOT_RRTYPE_EUI64: {stack[top++] = 209; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -26004,7 +26004,7 @@ tr723: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -26079,7 +26079,7 @@ tr723: case KNOT_RRTYPE_EUI64: {stack[top++] = 209; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -26161,7 +26161,7 @@ tr724: case KNOT_RRTYPE_EUI64: {stack[top++] = 209; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -26297,7 +26297,7 @@ tr725: case KNOT_RRTYPE_EUI64: {stack[top++] = 210; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -26356,7 +26356,7 @@ case 210: tr727: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -26365,7 +26365,7 @@ tr727: tr728: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -26425,7 +26425,7 @@ case 211: tr730: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -26434,7 +26434,7 @@ tr730: tr731: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -26510,7 +26510,7 @@ tr679: case KNOT_RRTYPE_EUI64: {stack[top++] = 212; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -26592,7 +26592,7 @@ tr715: case KNOT_RRTYPE_EUI64: {stack[top++] = 212; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -26667,13 +26667,13 @@ tr3216: case KNOT_RRTYPE_EUI64: {stack[top++] = 212; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -26886,7 +26886,7 @@ case 221: tr3155: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -26993,7 +26993,7 @@ tr116: case KNOT_RRTYPE_EUI64: {stack[top++] = 223; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -27036,7 +27036,7 @@ case 223: tr763: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -27045,7 +27045,7 @@ tr763: tr764: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -27089,7 +27089,7 @@ case 224: tr766: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -27098,7 +27098,7 @@ tr766: tr767: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -27174,7 +27174,7 @@ tr118: case KNOT_RRTYPE_EUI64: {stack[top++] = 225; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -27249,13 +27249,13 @@ tr3157: case KNOT_RRTYPE_EUI64: {stack[top++] = 225; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -27317,7 +27317,7 @@ case 225: tr769: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -27326,7 +27326,7 @@ tr769: tr770: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -27406,7 +27406,7 @@ tr662: case KNOT_RRTYPE_EUI64: {stack[top++] = 226; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -27481,7 +27481,7 @@ tr92: case KNOT_RRTYPE_EUI64: {stack[top++] = 226; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -27577,7 +27577,7 @@ case 227: tr772: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -27586,7 +27586,7 @@ tr772: tr773: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -27662,7 +27662,7 @@ tr652: case KNOT_RRTYPE_EUI64: {stack[top++] = 228; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -27744,7 +27744,7 @@ tr645: case KNOT_RRTYPE_EUI64: {stack[top++] = 228; goto st1053;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {goto st246;} } } @@ -28477,7 +28477,7 @@ case 241: tr3147: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -28488,7 +28488,7 @@ tr3203: } { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -28528,7 +28528,7 @@ case 242: tr3177: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {goto st246;} } } @@ -28609,7 +28609,7 @@ tr124: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -28659,7 +28659,7 @@ tr775: } { if ((*p) == '\r') { - ERR(ZSCANNER_DOS_NEWLINE); + ERR(ZS_DOS_NEWLINE); } if (s->buffer_length < sizeof(s->buffer) - 1) { @@ -28670,7 +28670,7 @@ tr775: tr777: { if ((*p) == '\r') { - ERR(ZSCANNER_DOS_NEWLINE); + ERR(ZS_DOS_NEWLINE); } if (s->buffer_length < sizeof(s->buffer) - 1) { @@ -28703,7 +28703,7 @@ tr776: s->process_error(s); // Reset. - s->error_code = ZSCANNER_OK; + s->error_code = ZS_OK; s->multiline = false; // In case of serious error, stop scanner. @@ -28731,7 +28731,7 @@ tr778: s->process_error(s); // Reset. - s->error_code = ZSCANNER_OK; + s->error_code = ZS_OK; s->multiline = false; // In case of serious error, stop scanner. @@ -28783,7 +28783,7 @@ tr780: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -28798,7 +28798,7 @@ tr788: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -28824,7 +28824,7 @@ tr785: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -28836,7 +28836,7 @@ tr785: s->dname_tmp_length += s->zone_origin_length; if (s->dname_tmp_length > MAX_DNAME_LENGTH) { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -28861,7 +28861,7 @@ tr797: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -28873,7 +28873,7 @@ tr797: s->dname_tmp_length += s->zone_origin_length; if (s->dname_tmp_length > MAX_DNAME_LENGTH) { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -28904,7 +28904,7 @@ tr786: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -28918,7 +28918,7 @@ tr799: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -28964,7 +28964,7 @@ tr781: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -28979,7 +28979,7 @@ tr789: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -28990,7 +28990,7 @@ tr791: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -29004,7 +29004,7 @@ tr798: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -29069,7 +29069,7 @@ tr793: (s->dname)[s->dname_tmp_length] = 0; s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -29183,7 +29183,7 @@ tr803: if (rdata_tail <= rdata_stop) { *(rdata_tail++) = (*p); } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29196,7 +29196,7 @@ tr813: if (rdata_tail <= rdata_stop) { *(rdata_tail++) = (*p); } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29246,7 +29246,7 @@ tr807: if (rdata_tail <= rdata_stop) { *(rdata_tail++) = (*p); } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29262,7 +29262,7 @@ tr814: if (rdata_tail <= rdata_stop) { *(rdata_tail++) = (*p); } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29310,7 +29310,7 @@ tr808: *rdata_tail = 0; s->item_length++; } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29323,7 +29323,7 @@ tr808: *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -29345,7 +29345,7 @@ tr810: *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -29367,7 +29367,7 @@ tr811: *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -29399,7 +29399,7 @@ tr816: if (rdata_tail <= rdata_stop) { *(rdata_tail++) = (*p); } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29412,7 +29412,7 @@ tr823: if (rdata_tail <= rdata_stop) { *(rdata_tail++) = (*p); } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29473,7 +29473,7 @@ tr820: *rdata_tail = 0; s->item_length++; } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {goto st246;} } } @@ -29486,7 +29486,7 @@ tr820: *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -29508,7 +29508,7 @@ tr821: *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -29530,7 +29530,7 @@ tr822: *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -29582,7 +29582,7 @@ case 270: tr828: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -29591,7 +29591,7 @@ tr828: tr829: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -29643,7 +29643,7 @@ tr833: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -29659,7 +29659,7 @@ tr838: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -29706,7 +29706,7 @@ case 272: tr836: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -29715,7 +29715,7 @@ tr836: tr837: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -29726,7 +29726,7 @@ tr855: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29736,13 +29736,13 @@ tr856: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -29753,13 +29753,13 @@ tr857: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -29797,7 +29797,7 @@ tr844: if (s->number64 <= UINT32_MAX) { s->default_ttl = (uint32_t)(s->number64); } else { - ERR(ZSCANNER_ENUMBER32_OVERFLOW); + ERR(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29813,7 +29813,7 @@ tr859: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29821,7 +29821,7 @@ tr859: if (s->number64 <= UINT32_MAX) { s->default_ttl = (uint32_t)(s->number64); } else { - ERR(ZSCANNER_ENUMBER32_OVERFLOW); + ERR(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29842,7 +29842,7 @@ tr860: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29858,7 +29858,7 @@ tr839: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29867,7 +29867,7 @@ tr840: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29876,7 +29876,7 @@ tr841: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29885,7 +29885,7 @@ tr843: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29930,7 +29930,7 @@ tr849: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -29952,7 +29952,7 @@ tr847: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -29962,7 +29962,7 @@ tr858: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -29982,7 +29982,7 @@ tr858: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -30010,7 +30010,7 @@ tr850: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -30019,7 +30019,7 @@ tr851: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -30028,7 +30028,7 @@ tr852: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -30037,7 +30037,7 @@ tr854: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -30126,7 +30126,7 @@ case 279: tr863: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -30135,7 +30135,7 @@ tr863: tr864: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -30193,7 +30193,7 @@ tr876: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30215,7 +30215,7 @@ tr867: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30233,7 +30233,7 @@ tr871: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -30247,7 +30247,7 @@ tr893: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -30294,7 +30294,7 @@ case 282: tr882: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -30303,7 +30303,7 @@ tr882: tr883: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -30320,7 +30320,7 @@ tr874: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -30332,7 +30332,7 @@ tr875: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -30417,7 +30417,7 @@ tr877: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30428,7 +30428,7 @@ tr886: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30442,7 +30442,7 @@ tr892: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30464,7 +30464,7 @@ tr868: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30524,7 +30524,7 @@ tr888: (s->dname)[s->dname_tmp_length] = 0; s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30668,7 +30668,7 @@ case 292: tr896: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -30677,7 +30677,7 @@ tr896: tr897: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -30757,7 +30757,7 @@ case 294: tr911: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -30766,7 +30766,7 @@ tr911: tr912: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -30781,7 +30781,7 @@ tr903: // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } @@ -30798,7 +30798,7 @@ tr904: // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } @@ -30807,7 +30807,7 @@ tr904: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -30822,7 +30822,7 @@ tr905: // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } @@ -30831,7 +30831,7 @@ tr905: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -30886,7 +30886,7 @@ tr925: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30908,7 +30908,7 @@ tr913: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -30926,7 +30926,7 @@ tr921: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -30940,7 +30940,7 @@ tr940: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {goto st246;} } } @@ -30987,7 +30987,7 @@ case 297: tr931: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -30996,7 +30996,7 @@ tr931: tr932: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -31019,7 +31019,7 @@ tr923: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -31034,7 +31034,7 @@ tr924: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -31076,7 +31076,7 @@ tr906: // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } @@ -31107,24 +31107,24 @@ tr906: } // Create new file loader for included zone file. - file_loader_t *fl = file_loader_create((char*)(s->buffer), - text_origin, - s->default_class, - s->default_ttl, - s->process_record, - s->process_error, - s->data); + zs_loader_t *fl = zs_loader_create((char*)(s->buffer), + text_origin, + s->default_class, + s->default_ttl, + s->process_record, + s->process_error, + s->data); if (fl != NULL) { // Process included zone file. - ret = file_loader_process(fl); - file_loader_free(fl); + ret = zs_loader_process(fl); + zs_loader_free(fl); if (ret != 0) { - ERR(ZSCANNER_EUNPROCESSED_INCLUDE); + ERR(ZS_UNPROCESSED_INCLUDE); p--; {goto st246;} } } else { - ERR(ZSCANNER_EUNOPENED_INCLUDE); + ERR(ZS_UNOPENED_INCLUDE); p--; {goto st246;} } } @@ -31160,24 +31160,24 @@ tr917: } // Create new file loader for included zone file. - file_loader_t *fl = file_loader_create((char*)(s->buffer), - text_origin, - s->default_class, - s->default_ttl, - s->process_record, - s->process_error, - s->data); + zs_loader_t *fl = zs_loader_create((char*)(s->buffer), + text_origin, + s->default_class, + s->default_ttl, + s->process_record, + s->process_error, + s->data); if (fl != NULL) { // Process included zone file. - ret = file_loader_process(fl); - file_loader_free(fl); + ret = zs_loader_process(fl); + zs_loader_free(fl); if (ret != 0) { - ERR(ZSCANNER_EUNPROCESSED_INCLUDE); + ERR(ZS_UNPROCESSED_INCLUDE); p--; {goto st246;} } } else { - ERR(ZSCANNER_EUNOPENED_INCLUDE); + ERR(ZS_UNOPENED_INCLUDE); p--; {goto st246;} } } @@ -31219,24 +31219,24 @@ tr928: } // Create new file loader for included zone file. - file_loader_t *fl = file_loader_create((char*)(s->buffer), - text_origin, - s->default_class, - s->default_ttl, - s->process_record, - s->process_error, - s->data); + zs_loader_t *fl = zs_loader_create((char*)(s->buffer), + text_origin, + s->default_class, + s->default_ttl, + s->process_record, + s->process_error, + s->data); if (fl != NULL) { // Process included zone file. - ret = file_loader_process(fl); - file_loader_free(fl); + ret = zs_loader_process(fl); + zs_loader_free(fl); if (ret != 0) { - ERR(ZSCANNER_EUNPROCESSED_INCLUDE); + ERR(ZS_UNPROCESSED_INCLUDE); p--; {goto st246;} } } else { - ERR(ZSCANNER_EUNOPENED_INCLUDE); + ERR(ZS_UNOPENED_INCLUDE); p--; {goto st246;} } } @@ -31261,7 +31261,7 @@ tr907: // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } @@ -31294,7 +31294,7 @@ tr926: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -31305,7 +31305,7 @@ tr933: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -31319,7 +31319,7 @@ tr939: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -31341,7 +31341,7 @@ tr914: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -31401,7 +31401,7 @@ tr935: (s->dname)[s->dname_tmp_length] = 0; s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {goto st246;} } } @@ -31499,7 +31499,7 @@ tr908: // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } @@ -31567,24 +31567,24 @@ tr942: } // Create new file loader for included zone file. - file_loader_t *fl = file_loader_create((char*)(s->buffer), - text_origin, - s->default_class, - s->default_ttl, - s->process_record, - s->process_error, - s->data); + zs_loader_t *fl = zs_loader_create((char*)(s->buffer), + text_origin, + s->default_class, + s->default_ttl, + s->process_record, + s->process_error, + s->data); if (fl != NULL) { // Process included zone file. - ret = file_loader_process(fl); - file_loader_free(fl); + ret = zs_loader_process(fl); + zs_loader_free(fl); if (ret != 0) { - ERR(ZSCANNER_EUNPROCESSED_INCLUDE); + ERR(ZS_UNPROCESSED_INCLUDE); p--; {goto st246;} } } else { - ERR(ZSCANNER_EUNOPENED_INCLUDE); + ERR(ZS_UNOPENED_INCLUDE); p--; {goto st246;} } } @@ -31632,7 +31632,7 @@ case 1076: tr944: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -31641,7 +31641,7 @@ tr944: tr945: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -31763,7 +31763,7 @@ tr949: if (rdata_tail <= rdata_stop) { *rdata_tail = first_base64_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -31790,7 +31790,7 @@ tr950: if (rdata_tail <= rdata_stop) { *rdata_tail = second_right_base64_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -31819,7 +31819,7 @@ tr951: if (rdata_tail <= rdata_stop) { *rdata_tail = third_right_base64_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -31844,7 +31844,7 @@ case 313: tr955: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -31853,7 +31853,7 @@ tr955: tr956: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32073,7 +32073,7 @@ case 317: tr972: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32082,7 +32082,7 @@ tr972: tr973: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32106,7 +32106,7 @@ tr964: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32119,7 +32119,7 @@ tr965: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32141,7 +32141,7 @@ tr994: { window_add_bit(KNOT_RRTYPE_A, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32151,7 +32151,7 @@ tr995: { window_add_bit(KNOT_RRTYPE_A, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32170,7 +32170,7 @@ tr1007: { window_add_bit(KNOT_RRTYPE_AAAA, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32180,7 +32180,7 @@ tr1008: { window_add_bit(KNOT_RRTYPE_AAAA, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32199,7 +32199,7 @@ tr1019: { window_add_bit(KNOT_RRTYPE_CERT, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32209,7 +32209,7 @@ tr1020: { window_add_bit(KNOT_RRTYPE_CERT, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32228,7 +32228,7 @@ tr1030: { window_add_bit(KNOT_RRTYPE_CNAME, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32238,7 +32238,7 @@ tr1031: { window_add_bit(KNOT_RRTYPE_CNAME, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32257,7 +32257,7 @@ tr1044: { window_add_bit(KNOT_RRTYPE_DHCID, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32267,7 +32267,7 @@ tr1045: { window_add_bit(KNOT_RRTYPE_DHCID, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32286,7 +32286,7 @@ tr1056: { window_add_bit(KNOT_RRTYPE_DNAME, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32296,7 +32296,7 @@ tr1057: { window_add_bit(KNOT_RRTYPE_DNAME, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32315,7 +32315,7 @@ tr1067: { window_add_bit(KNOT_RRTYPE_DNSKEY, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32325,7 +32325,7 @@ tr1068: { window_add_bit(KNOT_RRTYPE_DNSKEY, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32344,7 +32344,7 @@ tr1075: { window_add_bit(KNOT_RRTYPE_DS, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32354,7 +32354,7 @@ tr1076: { window_add_bit(KNOT_RRTYPE_DS, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32373,7 +32373,7 @@ tr1088: { window_add_bit(KNOT_RRTYPE_EUI48, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32383,7 +32383,7 @@ tr1089: { window_add_bit(KNOT_RRTYPE_EUI48, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32402,7 +32402,7 @@ tr1097: { window_add_bit(KNOT_RRTYPE_EUI64, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32412,7 +32412,7 @@ tr1098: { window_add_bit(KNOT_RRTYPE_EUI64, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32431,7 +32431,7 @@ tr1109: { window_add_bit(KNOT_RRTYPE_HINFO, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32441,7 +32441,7 @@ tr1110: { window_add_bit(KNOT_RRTYPE_HINFO, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32460,7 +32460,7 @@ tr1124: { window_add_bit(KNOT_RRTYPE_IPSECKEY, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32470,7 +32470,7 @@ tr1125: { window_add_bit(KNOT_RRTYPE_IPSECKEY, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32489,7 +32489,7 @@ tr1135: { window_add_bit(KNOT_RRTYPE_KEY, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32499,7 +32499,7 @@ tr1136: { window_add_bit(KNOT_RRTYPE_KEY, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32518,7 +32518,7 @@ tr1143: { window_add_bit(KNOT_RRTYPE_KX, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32528,7 +32528,7 @@ tr1144: { window_add_bit(KNOT_RRTYPE_KX, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32547,7 +32547,7 @@ tr1156: { window_add_bit(KNOT_RRTYPE_L32, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32557,7 +32557,7 @@ tr1157: { window_add_bit(KNOT_RRTYPE_L32, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32576,7 +32576,7 @@ tr1165: { window_add_bit(KNOT_RRTYPE_L64, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32586,7 +32586,7 @@ tr1166: { window_add_bit(KNOT_RRTYPE_L64, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32605,7 +32605,7 @@ tr1174: { window_add_bit(KNOT_RRTYPE_LOC, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32615,7 +32615,7 @@ tr1175: { window_add_bit(KNOT_RRTYPE_LOC, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32634,7 +32634,7 @@ tr1182: { window_add_bit(KNOT_RRTYPE_LP, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32644,7 +32644,7 @@ tr1183: { window_add_bit(KNOT_RRTYPE_LP, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32663,7 +32663,7 @@ tr1195: { window_add_bit(KNOT_RRTYPE_MINFO, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32673,7 +32673,7 @@ tr1196: { window_add_bit(KNOT_RRTYPE_MINFO, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32692,7 +32692,7 @@ tr1203: { window_add_bit(KNOT_RRTYPE_MX, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32702,7 +32702,7 @@ tr1204: { window_add_bit(KNOT_RRTYPE_MX, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32721,7 +32721,7 @@ tr1217: { window_add_bit(KNOT_RRTYPE_NAPTR, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32731,7 +32731,7 @@ tr1218: { window_add_bit(KNOT_RRTYPE_NAPTR, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32750,7 +32750,7 @@ tr1226: { window_add_bit(KNOT_RRTYPE_NID, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32760,7 +32760,7 @@ tr1227: { window_add_bit(KNOT_RRTYPE_NID, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32779,7 +32779,7 @@ tr1234: { window_add_bit(KNOT_RRTYPE_NS, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32789,7 +32789,7 @@ tr1235: { window_add_bit(KNOT_RRTYPE_NS, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32808,7 +32808,7 @@ tr1244: { window_add_bit(KNOT_RRTYPE_NSEC, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32818,7 +32818,7 @@ tr1245: { window_add_bit(KNOT_RRTYPE_NSEC, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32837,7 +32837,7 @@ tr1253: { window_add_bit(KNOT_RRTYPE_NSEC3, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32847,7 +32847,7 @@ tr1254: { window_add_bit(KNOT_RRTYPE_NSEC3, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32866,7 +32866,7 @@ tr1266: { window_add_bit(KNOT_RRTYPE_NSEC3PARAM, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32876,7 +32876,7 @@ tr1267: { window_add_bit(KNOT_RRTYPE_NSEC3PARAM, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32895,7 +32895,7 @@ tr1276: { window_add_bit(KNOT_RRTYPE_PTR, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32905,7 +32905,7 @@ tr1277: { window_add_bit(KNOT_RRTYPE_PTR, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32924,7 +32924,7 @@ tr1287: { window_add_bit(KNOT_RRTYPE_RP, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32934,7 +32934,7 @@ tr1288: { window_add_bit(KNOT_RRTYPE_RP, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32953,7 +32953,7 @@ tr1298: { window_add_bit(KNOT_RRTYPE_RRSIG, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32963,7 +32963,7 @@ tr1299: { window_add_bit(KNOT_RRTYPE_RRSIG, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -32982,7 +32982,7 @@ tr1306: { window_add_bit(KNOT_RRTYPE_RT, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -32992,7 +32992,7 @@ tr1307: { window_add_bit(KNOT_RRTYPE_RT, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33011,7 +33011,7 @@ tr1319: { window_add_bit(KNOT_RRTYPE_SOA, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33021,7 +33021,7 @@ tr1320: { window_add_bit(KNOT_RRTYPE_SOA, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33040,7 +33040,7 @@ tr1328: { window_add_bit(KNOT_RRTYPE_SPF, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33050,7 +33050,7 @@ tr1329: { window_add_bit(KNOT_RRTYPE_SPF, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33069,7 +33069,7 @@ tr1337: { window_add_bit(KNOT_RRTYPE_SRV, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33079,7 +33079,7 @@ tr1338: { window_add_bit(KNOT_RRTYPE_SRV, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33098,7 +33098,7 @@ tr1348: { window_add_bit(KNOT_RRTYPE_SSHFP, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33108,7 +33108,7 @@ tr1349: { window_add_bit(KNOT_RRTYPE_SSHFP, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33127,7 +33127,7 @@ tr1361: { window_add_bit(KNOT_RRTYPE_TLSA, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33137,7 +33137,7 @@ tr1362: { window_add_bit(KNOT_RRTYPE_TLSA, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33156,7 +33156,7 @@ tr1370: { window_add_bit(KNOT_RRTYPE_TXT, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33166,7 +33166,7 @@ tr1371: { window_add_bit(KNOT_RRTYPE_TXT, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33183,7 +33183,7 @@ tr1380: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -33193,13 +33193,13 @@ tr1381: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33210,13 +33210,13 @@ tr1382: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33227,7 +33227,7 @@ tr1384: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -33242,7 +33242,7 @@ tr1393: { window_add_bit(KNOT_RRTYPE_AFSDB, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33252,7 +33252,7 @@ tr1394: { window_add_bit(KNOT_RRTYPE_AFSDB, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33271,7 +33271,7 @@ tr1402: { window_add_bit(KNOT_RRTYPE_APL, s); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -33281,7 +33281,7 @@ tr1403: { window_add_bit(KNOT_RRTYPE_APL, s); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -33563,7 +33563,7 @@ tr1385: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -33623,7 +33623,7 @@ tr968: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33651,7 +33651,7 @@ tr990: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33680,7 +33680,7 @@ tr1001: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33709,7 +33709,7 @@ tr1011: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33738,7 +33738,7 @@ tr1023: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33767,7 +33767,7 @@ tr1034: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33796,7 +33796,7 @@ tr1048: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33825,7 +33825,7 @@ tr1060: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33854,7 +33854,7 @@ tr1071: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33883,7 +33883,7 @@ tr1079: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33912,7 +33912,7 @@ tr1092: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33941,7 +33941,7 @@ tr1101: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33970,7 +33970,7 @@ tr1113: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -33999,7 +33999,7 @@ tr1128: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34028,7 +34028,7 @@ tr1139: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34057,7 +34057,7 @@ tr1147: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34086,7 +34086,7 @@ tr1160: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34115,7 +34115,7 @@ tr1169: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34144,7 +34144,7 @@ tr1178: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34173,7 +34173,7 @@ tr1186: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34202,7 +34202,7 @@ tr1199: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34231,7 +34231,7 @@ tr1207: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34260,7 +34260,7 @@ tr1221: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34289,7 +34289,7 @@ tr1230: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34318,7 +34318,7 @@ tr1239: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34347,7 +34347,7 @@ tr1249: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34376,7 +34376,7 @@ tr1258: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34405,7 +34405,7 @@ tr1270: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34434,7 +34434,7 @@ tr1280: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34463,7 +34463,7 @@ tr1291: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34492,7 +34492,7 @@ tr1302: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34521,7 +34521,7 @@ tr1310: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34550,7 +34550,7 @@ tr1323: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34579,7 +34579,7 @@ tr1332: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34608,7 +34608,7 @@ tr1341: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34637,7 +34637,7 @@ tr1352: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34666,7 +34666,7 @@ tr1365: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34695,7 +34695,7 @@ tr1374: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34710,7 +34710,7 @@ tr1386: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -34731,7 +34731,7 @@ tr1386: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34760,7 +34760,7 @@ tr1397: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34789,7 +34789,7 @@ tr1406: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34829,7 +34829,7 @@ tr969: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34860,7 +34860,7 @@ tr991: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34892,7 +34892,7 @@ tr1002: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34924,7 +34924,7 @@ tr1012: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34956,7 +34956,7 @@ tr1024: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -34988,7 +34988,7 @@ tr1035: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35020,7 +35020,7 @@ tr1049: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35052,7 +35052,7 @@ tr1061: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35084,7 +35084,7 @@ tr1072: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35116,7 +35116,7 @@ tr1080: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35148,7 +35148,7 @@ tr1093: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35180,7 +35180,7 @@ tr1102: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35212,7 +35212,7 @@ tr1114: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35244,7 +35244,7 @@ tr1129: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35276,7 +35276,7 @@ tr1140: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35308,7 +35308,7 @@ tr1148: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35340,7 +35340,7 @@ tr1161: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35372,7 +35372,7 @@ tr1170: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35404,7 +35404,7 @@ tr1179: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35436,7 +35436,7 @@ tr1187: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35468,7 +35468,7 @@ tr1200: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35500,7 +35500,7 @@ tr1208: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35532,7 +35532,7 @@ tr1222: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35564,7 +35564,7 @@ tr1231: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35596,7 +35596,7 @@ tr1240: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35628,7 +35628,7 @@ tr1250: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35660,7 +35660,7 @@ tr1259: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35692,7 +35692,7 @@ tr1271: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35724,7 +35724,7 @@ tr1281: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35756,7 +35756,7 @@ tr1292: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35788,7 +35788,7 @@ tr1303: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35820,7 +35820,7 @@ tr1311: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35852,7 +35852,7 @@ tr1324: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35884,7 +35884,7 @@ tr1333: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35916,7 +35916,7 @@ tr1342: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35948,7 +35948,7 @@ tr1353: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -35980,7 +35980,7 @@ tr1366: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36012,7 +36012,7 @@ tr1375: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36027,7 +36027,7 @@ tr1387: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -36051,7 +36051,7 @@ tr1387: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36083,7 +36083,7 @@ tr1398: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36115,7 +36115,7 @@ tr1407: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36270,7 +36270,7 @@ tr970: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36298,7 +36298,7 @@ tr992: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36327,7 +36327,7 @@ tr1003: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36356,7 +36356,7 @@ tr1013: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36385,7 +36385,7 @@ tr1025: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36414,7 +36414,7 @@ tr1036: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36443,7 +36443,7 @@ tr1050: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36472,7 +36472,7 @@ tr1062: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36501,7 +36501,7 @@ tr1073: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36530,7 +36530,7 @@ tr1081: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36559,7 +36559,7 @@ tr1094: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36588,7 +36588,7 @@ tr1103: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36617,7 +36617,7 @@ tr1115: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36646,7 +36646,7 @@ tr1130: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36675,7 +36675,7 @@ tr1141: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36704,7 +36704,7 @@ tr1149: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36733,7 +36733,7 @@ tr1162: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36762,7 +36762,7 @@ tr1171: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36791,7 +36791,7 @@ tr1180: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36820,7 +36820,7 @@ tr1188: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36849,7 +36849,7 @@ tr1201: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36878,7 +36878,7 @@ tr1209: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36907,7 +36907,7 @@ tr1223: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36936,7 +36936,7 @@ tr1232: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36965,7 +36965,7 @@ tr1241: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -36994,7 +36994,7 @@ tr1251: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37023,7 +37023,7 @@ tr1260: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37052,7 +37052,7 @@ tr1272: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37081,7 +37081,7 @@ tr1282: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37110,7 +37110,7 @@ tr1293: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37139,7 +37139,7 @@ tr1304: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37168,7 +37168,7 @@ tr1312: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37197,7 +37197,7 @@ tr1325: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37226,7 +37226,7 @@ tr1334: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37255,7 +37255,7 @@ tr1343: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37284,7 +37284,7 @@ tr1354: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37313,7 +37313,7 @@ tr1367: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37342,7 +37342,7 @@ tr1376: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37357,7 +37357,7 @@ tr1388: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -37378,7 +37378,7 @@ tr1388: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37407,7 +37407,7 @@ tr1399: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -37436,7 +37436,7 @@ tr1408: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -39224,7 +39224,7 @@ tr1379: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -39240,7 +39240,7 @@ tr1383: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -39410,7 +39410,7 @@ case 437: tr1411: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -39419,7 +39419,7 @@ tr1411: tr1412: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -39471,7 +39471,7 @@ tr1416: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -39487,7 +39487,7 @@ tr1420: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -39522,7 +39522,7 @@ case 439: tr1425: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -39531,7 +39531,7 @@ tr1425: tr1426: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -39547,7 +39547,7 @@ tr1417: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -39557,13 +39557,13 @@ tr1418: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -39574,13 +39574,13 @@ tr1419: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -39591,7 +39591,7 @@ tr1421: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -39637,7 +39637,7 @@ tr1427: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -39658,7 +39658,7 @@ case 441: tr1432: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -39667,7 +39667,7 @@ tr1432: tr1433: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -39755,7 +39755,7 @@ case 443: tr1436: { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); p--; {goto st246;} } } @@ -39774,7 +39774,7 @@ tr1437: } { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); p--; {goto st246;} } } @@ -39826,7 +39826,7 @@ case 1084: tr1438: { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); p--; {goto st246;} } } @@ -39866,7 +39866,7 @@ tr1422: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -39953,7 +39953,7 @@ case 446: tr1440: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -39962,7 +39962,7 @@ tr1440: tr1441: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -40015,7 +40015,7 @@ tr1444: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -40057,7 +40057,7 @@ tr1446: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -40070,13 +40070,13 @@ tr1447: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -40090,13 +40090,13 @@ tr1448: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -40110,7 +40110,7 @@ tr1451: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -40154,7 +40154,7 @@ case 1086: tr1454: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -40163,7 +40163,7 @@ tr1454: tr1455: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -40179,7 +40179,7 @@ tr1468: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -40189,13 +40189,13 @@ tr1469: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -40206,13 +40206,13 @@ tr1470: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -40223,7 +40223,7 @@ tr1471: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -40269,7 +40269,7 @@ tr1456: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -40290,7 +40290,7 @@ case 450: tr1461: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -40299,7 +40299,7 @@ tr1461: tr1462: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -40392,7 +40392,7 @@ tr1450: tr1465: { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); p--; {goto st246;} } } @@ -40411,7 +40411,7 @@ tr1466: } { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); p--; {goto st246;} } } @@ -40463,7 +40463,7 @@ case 1088: tr1467: { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); p--; {goto st246;} } } @@ -40503,7 +40503,7 @@ tr1472: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -40549,7 +40549,7 @@ tr1445: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -40565,7 +40565,7 @@ tr1449: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -40605,7 +40605,7 @@ tr1452: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -40697,7 +40697,7 @@ tr1474: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -40713,7 +40713,7 @@ tr1481: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -40741,7 +40741,7 @@ tr1480: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -41775,7 +41775,7 @@ tr1585: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -41791,7 +41791,7 @@ tr1593: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -41819,7 +41819,7 @@ tr1592: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -42349,7 +42349,7 @@ tr1638: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -42360,7 +42360,7 @@ tr1640: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -42388,7 +42388,7 @@ tr1639: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -42508,7 +42508,7 @@ case 597: tr1650: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -42517,7 +42517,7 @@ tr1650: tr1651: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -42539,7 +42539,7 @@ tr1645: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -42551,7 +42551,7 @@ tr1646: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -42635,7 +42635,7 @@ case 599: tr1662: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -42644,7 +42644,7 @@ tr1662: tr1663: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -42666,7 +42666,7 @@ tr1656: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -42678,7 +42678,7 @@ tr1657: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -42733,7 +42733,7 @@ tr1664: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -42749,7 +42749,7 @@ tr1670: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -42784,7 +42784,7 @@ case 601: tr1674: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -42793,7 +42793,7 @@ tr1674: tr1675: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -42810,7 +42810,7 @@ tr1667: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -42821,13 +42821,13 @@ tr1668: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -42839,13 +42839,13 @@ tr1669: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -42857,7 +42857,7 @@ tr1671: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -42906,7 +42906,7 @@ tr1676: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -42922,7 +42922,7 @@ tr1683: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -42967,7 +42967,7 @@ case 603: tr1692: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -42976,7 +42976,7 @@ tr1692: tr1693: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -42993,7 +42993,7 @@ tr1680: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43004,13 +43004,13 @@ tr1681: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43022,13 +43022,13 @@ tr1682: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43040,7 +43040,7 @@ tr1689: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43053,7 +43053,7 @@ tr1780: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43062,7 +43062,7 @@ tr1780: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43072,7 +43072,7 @@ tr1781: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43081,13 +43081,13 @@ tr1781: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43098,7 +43098,7 @@ tr1782: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43107,13 +43107,13 @@ tr1782: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43124,7 +43124,7 @@ tr1784: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43133,7 +43133,7 @@ tr1784: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43182,7 +43182,7 @@ tr1694: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43198,7 +43198,7 @@ tr1700: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43243,7 +43243,7 @@ case 605: tr1709: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43252,7 +43252,7 @@ tr1709: tr1710: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43269,7 +43269,7 @@ tr1697: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43280,13 +43280,13 @@ tr1698: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43298,13 +43298,13 @@ tr1699: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43316,7 +43316,7 @@ tr1706: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43329,7 +43329,7 @@ tr1767: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43338,7 +43338,7 @@ tr1767: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43348,7 +43348,7 @@ tr1768: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43357,13 +43357,13 @@ tr1768: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43374,7 +43374,7 @@ tr1769: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43383,13 +43383,13 @@ tr1769: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43400,7 +43400,7 @@ tr1771: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43409,7 +43409,7 @@ tr1771: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43458,7 +43458,7 @@ tr1711: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43474,7 +43474,7 @@ tr1717: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43519,7 +43519,7 @@ case 607: tr1726: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43528,7 +43528,7 @@ tr1726: tr1727: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43545,7 +43545,7 @@ tr1714: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43556,13 +43556,13 @@ tr1715: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43574,13 +43574,13 @@ tr1716: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43592,7 +43592,7 @@ tr1723: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43605,7 +43605,7 @@ tr1754: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43614,7 +43614,7 @@ tr1754: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43624,7 +43624,7 @@ tr1755: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43633,13 +43633,13 @@ tr1755: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -43650,7 +43650,7 @@ tr1756: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43659,13 +43659,13 @@ tr1756: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -43676,7 +43676,7 @@ tr1758: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43685,7 +43685,7 @@ tr1758: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43734,7 +43734,7 @@ tr1728: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43750,7 +43750,7 @@ tr1732: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43788,7 +43788,7 @@ tr1731: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43801,7 +43801,7 @@ tr1745: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43810,7 +43810,7 @@ tr1745: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43827,7 +43827,7 @@ tr1733: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43836,7 +43836,7 @@ tr1734: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43845,7 +43845,7 @@ tr1735: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43854,7 +43854,7 @@ tr1737: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43887,7 +43887,7 @@ tr1739: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43909,7 +43909,7 @@ tr1738: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43919,7 +43919,7 @@ tr1746: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43939,7 +43939,7 @@ tr1746: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -43967,7 +43967,7 @@ tr1740: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43976,7 +43976,7 @@ tr1741: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43985,7 +43985,7 @@ tr1742: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -43994,7 +43994,7 @@ tr1744: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44022,7 +44022,7 @@ tr1724: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44032,7 +44032,7 @@ tr1759: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44041,7 +44041,7 @@ tr1759: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44077,7 +44077,7 @@ tr1718: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44086,7 +44086,7 @@ tr1719: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44095,7 +44095,7 @@ tr1720: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44104,7 +44104,7 @@ tr1722: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44147,7 +44147,7 @@ tr1748: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44169,7 +44169,7 @@ tr1747: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44179,7 +44179,7 @@ tr1757: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44199,7 +44199,7 @@ tr1757: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44227,7 +44227,7 @@ tr1749: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44236,7 +44236,7 @@ tr1750: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44245,7 +44245,7 @@ tr1751: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44254,7 +44254,7 @@ tr1753: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44292,7 +44292,7 @@ tr1707: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44302,7 +44302,7 @@ tr1772: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44311,7 +44311,7 @@ tr1772: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44347,7 +44347,7 @@ tr1701: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44356,7 +44356,7 @@ tr1702: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44365,7 +44365,7 @@ tr1703: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44374,7 +44374,7 @@ tr1705: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44417,7 +44417,7 @@ tr1761: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44439,7 +44439,7 @@ tr1760: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44449,7 +44449,7 @@ tr1770: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44469,7 +44469,7 @@ tr1770: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44497,7 +44497,7 @@ tr1762: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44506,7 +44506,7 @@ tr1763: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44515,7 +44515,7 @@ tr1764: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44524,7 +44524,7 @@ tr1766: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44562,7 +44562,7 @@ tr1690: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44572,7 +44572,7 @@ tr1785: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44581,7 +44581,7 @@ tr1785: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44617,7 +44617,7 @@ tr1684: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44626,7 +44626,7 @@ tr1685: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44635,7 +44635,7 @@ tr1686: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44644,7 +44644,7 @@ tr1688: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44687,7 +44687,7 @@ tr1774: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44709,7 +44709,7 @@ tr1773: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44719,7 +44719,7 @@ tr1783: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44739,7 +44739,7 @@ tr1783: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -44767,7 +44767,7 @@ tr1775: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44776,7 +44776,7 @@ tr1776: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44785,7 +44785,7 @@ tr1777: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44794,7 +44794,7 @@ tr1779: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44832,7 +44832,7 @@ tr1672: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -44976,7 +44976,7 @@ case 629: tr1794: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -44985,7 +44985,7 @@ tr1794: tr1795: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45003,7 +45003,7 @@ tr1787: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45015,13 +45015,13 @@ tr1788: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -45034,13 +45034,13 @@ tr1789: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45053,7 +45053,7 @@ tr1790: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45121,7 +45121,7 @@ tr1798: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45141,7 +45141,7 @@ tr1791: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45225,7 +45225,7 @@ case 634: tr1806: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -45234,7 +45234,7 @@ tr1806: tr1807: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45256,7 +45256,7 @@ tr1801: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -45268,7 +45268,7 @@ tr1802: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45404,7 +45404,7 @@ tr1812: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -45420,7 +45420,7 @@ tr1816: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -45455,7 +45455,7 @@ case 639: tr1820: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -45464,7 +45464,7 @@ tr1820: tr1821: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45481,7 +45481,7 @@ tr1813: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -45492,13 +45492,13 @@ tr1814: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -45510,13 +45510,13 @@ tr1815: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45528,7 +45528,7 @@ tr1817: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -45611,7 +45611,7 @@ tr1818: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -45699,7 +45699,7 @@ case 644: tr1836: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -45708,7 +45708,7 @@ tr1836: tr1837: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45726,7 +45726,7 @@ tr1827: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45738,13 +45738,13 @@ tr1828: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -45757,13 +45757,13 @@ tr1829: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -45776,7 +45776,7 @@ tr1830: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45832,7 +45832,7 @@ tr1831: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45876,7 +45876,7 @@ tr1832: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45904,7 +45904,7 @@ tr1833: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -45968,7 +45968,7 @@ tr1834: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -46027,7 +46027,7 @@ tr1843: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -46038,7 +46038,7 @@ tr1845: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -46072,7 +46072,7 @@ tr1844: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -46107,7 +46107,7 @@ tr1851: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46136,7 +46136,7 @@ tr1847: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46171,7 +46171,7 @@ case 650: tr1855: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46180,7 +46180,7 @@ tr1855: tr1856: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46196,7 +46196,7 @@ tr1848: if (s->number64 <= 90) { s->loc.d1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46206,13 +46206,13 @@ tr1849: if (s->number64 <= 90) { s->loc.d1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46223,13 +46223,13 @@ tr1850: if (s->number64 <= 90) { s->loc.d1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46240,7 +46240,7 @@ tr1852: if (s->number64 <= 90) { s->loc.d1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46291,7 +46291,7 @@ tr1857: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46307,7 +46307,7 @@ tr1865: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46342,7 +46342,7 @@ case 652: tr1869: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46351,7 +46351,7 @@ tr1869: tr1870: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46367,7 +46367,7 @@ tr1862: if (s->number64 <= 59) { s->loc.m1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46377,13 +46377,13 @@ tr1863: if (s->number64 <= 59) { s->loc.m1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46394,13 +46394,13 @@ tr1864: if (s->number64 <= 59) { s->loc.m1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46411,7 +46411,7 @@ tr1866: if (s->number64 <= 59) { s->loc.m1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46459,7 +46459,7 @@ tr1878: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46484,7 +46484,7 @@ tr1871: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46520,7 +46520,7 @@ case 654: tr1882: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46529,7 +46529,7 @@ tr1882: tr1883: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46549,7 +46549,7 @@ tr1874: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46557,7 +46557,7 @@ tr1874: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46571,7 +46571,7 @@ tr1875: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46579,13 +46579,13 @@ tr1875: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46600,7 +46600,7 @@ tr1876: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46608,13 +46608,13 @@ tr1876: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46629,7 +46629,7 @@ tr1879: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46637,7 +46637,7 @@ tr1879: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46657,7 +46657,7 @@ tr2073: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46665,7 +46665,7 @@ tr2073: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46682,7 +46682,7 @@ tr2074: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46690,13 +46690,13 @@ tr2074: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46714,7 +46714,7 @@ tr2075: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46722,13 +46722,13 @@ tr2075: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46746,7 +46746,7 @@ tr2077: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -46754,7 +46754,7 @@ tr2077: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -46817,7 +46817,7 @@ case 656: tr1887: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46826,7 +46826,7 @@ tr1887: tr1888: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46848,7 +46848,7 @@ tr2069: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46860,7 +46860,7 @@ tr2070: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46915,7 +46915,7 @@ tr1891: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46931,7 +46931,7 @@ tr1895: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -46966,7 +46966,7 @@ case 658: tr1899: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -46975,7 +46975,7 @@ tr1899: tr1900: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -46991,7 +46991,7 @@ tr1892: if (s->number64 <= 180) { s->loc.d2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47001,13 +47001,13 @@ tr1893: if (s->number64 <= 180) { s->loc.d2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47018,13 +47018,13 @@ tr1894: if (s->number64 <= 180) { s->loc.d2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47035,7 +47035,7 @@ tr1896: if (s->number64 <= 180) { s->loc.d2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47086,7 +47086,7 @@ tr1901: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -47102,7 +47102,7 @@ tr1909: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -47137,7 +47137,7 @@ case 660: tr1913: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47146,7 +47146,7 @@ tr1913: tr1914: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47162,7 +47162,7 @@ tr1906: if (s->number64 <= 59) { s->loc.m2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47172,13 +47172,13 @@ tr1907: if (s->number64 <= 59) { s->loc.m2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47189,13 +47189,13 @@ tr1908: if (s->number64 <= 59) { s->loc.m2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47206,7 +47206,7 @@ tr1910: if (s->number64 <= 59) { s->loc.m2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47254,7 +47254,7 @@ tr1922: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -47279,7 +47279,7 @@ tr1915: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -47315,7 +47315,7 @@ case 662: tr1926: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47324,7 +47324,7 @@ tr1926: tr1927: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47344,7 +47344,7 @@ tr1918: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47352,7 +47352,7 @@ tr1918: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47366,7 +47366,7 @@ tr1919: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47374,13 +47374,13 @@ tr1919: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47395,7 +47395,7 @@ tr1920: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47403,13 +47403,13 @@ tr1920: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47424,7 +47424,7 @@ tr1923: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47432,7 +47432,7 @@ tr1923: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47452,7 +47452,7 @@ tr2061: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47460,7 +47460,7 @@ tr2061: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47477,7 +47477,7 @@ tr2062: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47485,13 +47485,13 @@ tr2062: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47509,7 +47509,7 @@ tr2063: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47517,13 +47517,13 @@ tr2063: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47541,7 +47541,7 @@ tr2065: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47549,7 +47549,7 @@ tr2065: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47612,7 +47612,7 @@ case 664: tr1931: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47621,7 +47621,7 @@ tr1931: tr1932: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47643,7 +47643,7 @@ tr2057: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47655,7 +47655,7 @@ tr2058: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47715,7 +47715,7 @@ tr1942: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -47740,7 +47740,7 @@ tr1936: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -47768,7 +47768,7 @@ tr1937: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -47813,7 +47813,7 @@ case 667: tr1950: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47822,7 +47822,7 @@ tr1950: tr1951: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47842,7 +47842,7 @@ tr1938: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47852,7 +47852,7 @@ tr1938: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47866,7 +47866,7 @@ tr1939: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47876,13 +47876,13 @@ tr1939: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -47897,7 +47897,7 @@ tr1940: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47907,13 +47907,13 @@ tr1940: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -47928,7 +47928,7 @@ tr1944: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47938,7 +47938,7 @@ tr1944: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47958,7 +47958,7 @@ tr2045: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47968,7 +47968,7 @@ tr2045: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -47985,7 +47985,7 @@ tr2046: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -47995,13 +47995,13 @@ tr2046: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48019,7 +48019,7 @@ tr2047: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48029,13 +48029,13 @@ tr2047: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48053,7 +48053,7 @@ tr2050: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48063,7 +48063,7 @@ tr2050: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48117,7 +48117,7 @@ tr1962: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -48142,7 +48142,7 @@ tr1952: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -48187,7 +48187,7 @@ case 669: tr1970: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48196,7 +48196,7 @@ tr1970: tr1971: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48216,7 +48216,7 @@ tr1958: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48224,7 +48224,7 @@ tr1958: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48238,7 +48238,7 @@ tr1959: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48246,13 +48246,13 @@ tr1959: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48267,7 +48267,7 @@ tr1960: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48275,13 +48275,13 @@ tr1960: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48296,7 +48296,7 @@ tr1964: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48304,7 +48304,7 @@ tr1964: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48324,7 +48324,7 @@ tr2034: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48332,7 +48332,7 @@ tr2034: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48349,7 +48349,7 @@ tr2035: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48357,13 +48357,13 @@ tr2035: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48381,7 +48381,7 @@ tr2036: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48389,13 +48389,13 @@ tr2036: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48413,7 +48413,7 @@ tr2039: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48421,7 +48421,7 @@ tr2039: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48475,7 +48475,7 @@ tr1981: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -48500,7 +48500,7 @@ tr1972: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -48545,7 +48545,7 @@ case 671: tr1989: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48554,7 +48554,7 @@ tr1989: tr1990: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48574,7 +48574,7 @@ tr1977: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48582,7 +48582,7 @@ tr1977: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48596,7 +48596,7 @@ tr1978: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48604,13 +48604,13 @@ tr1978: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48625,7 +48625,7 @@ tr1979: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48633,13 +48633,13 @@ tr1979: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48654,7 +48654,7 @@ tr1983: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48662,7 +48662,7 @@ tr1983: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48682,7 +48682,7 @@ tr2023: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48690,7 +48690,7 @@ tr2023: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48707,7 +48707,7 @@ tr2024: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48715,13 +48715,13 @@ tr2024: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48739,7 +48739,7 @@ tr2025: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48747,13 +48747,13 @@ tr2025: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48771,7 +48771,7 @@ tr2028: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48779,7 +48779,7 @@ tr2028: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48833,7 +48833,7 @@ tr2000: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -48858,7 +48858,7 @@ tr1991: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -48903,7 +48903,7 @@ case 673: tr2007: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48912,7 +48912,7 @@ tr2007: tr2008: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -48932,7 +48932,7 @@ tr1996: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48940,7 +48940,7 @@ tr1996: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -48954,7 +48954,7 @@ tr1997: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48962,13 +48962,13 @@ tr1997: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -48983,7 +48983,7 @@ tr1998: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -48991,13 +48991,13 @@ tr1998: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -49012,7 +49012,7 @@ tr2001: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49020,7 +49020,7 @@ tr2001: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49040,7 +49040,7 @@ tr2013: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49048,7 +49048,7 @@ tr2013: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49065,7 +49065,7 @@ tr2014: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49073,13 +49073,13 @@ tr2014: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -49097,7 +49097,7 @@ tr2015: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49105,13 +49105,13 @@ tr2015: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -49129,7 +49129,7 @@ tr2017: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49137,7 +49137,7 @@ tr2017: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49187,7 +49187,7 @@ tr2002: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49195,7 +49195,7 @@ tr2002: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49212,7 +49212,7 @@ tr2018: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49220,7 +49220,7 @@ tr2018: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49261,7 +49261,7 @@ tr1946: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49271,7 +49271,7 @@ tr1946: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49345,7 +49345,7 @@ tr1966: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49353,7 +49353,7 @@ tr1966: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49396,7 +49396,7 @@ tr1985: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49404,7 +49404,7 @@ tr1985: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49447,7 +49447,7 @@ tr2003: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49455,7 +49455,7 @@ tr2003: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49501,7 +49501,7 @@ tr2019: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49509,7 +49509,7 @@ tr2019: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49555,7 +49555,7 @@ tr2030: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49563,7 +49563,7 @@ tr2030: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49609,7 +49609,7 @@ tr2041: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49617,7 +49617,7 @@ tr2041: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49663,7 +49663,7 @@ tr2052: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49673,7 +49673,7 @@ tr2052: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49755,7 +49755,7 @@ tr2004: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49763,7 +49763,7 @@ tr2004: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49812,7 +49812,7 @@ tr2020: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49820,7 +49820,7 @@ tr2020: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49930,7 +49930,7 @@ tr2005: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49938,7 +49938,7 @@ tr2005: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -49984,7 +49984,7 @@ tr2021: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -49992,7 +49992,7 @@ tr2021: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50106,7 +50106,7 @@ tr2016: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -50125,7 +50125,7 @@ tr2022: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -50178,7 +50178,7 @@ tr1984: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50186,7 +50186,7 @@ tr1984: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50203,7 +50203,7 @@ tr2029: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50211,7 +50211,7 @@ tr2029: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50286,7 +50286,7 @@ tr1986: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50294,7 +50294,7 @@ tr1986: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50343,7 +50343,7 @@ tr2031: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50351,7 +50351,7 @@ tr2031: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50463,7 +50463,7 @@ tr1987: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50471,7 +50471,7 @@ tr1987: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50517,7 +50517,7 @@ tr2032: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50525,7 +50525,7 @@ tr2032: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50639,7 +50639,7 @@ tr2026: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -50658,7 +50658,7 @@ tr2033: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -50711,7 +50711,7 @@ tr1982: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50719,7 +50719,7 @@ tr1982: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50736,7 +50736,7 @@ tr2027: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50744,7 +50744,7 @@ tr2027: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50791,7 +50791,7 @@ tr1965: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50799,7 +50799,7 @@ tr1965: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50816,7 +50816,7 @@ tr2040: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50824,7 +50824,7 @@ tr2040: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50899,7 +50899,7 @@ tr1967: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50907,7 +50907,7 @@ tr1967: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -50956,7 +50956,7 @@ tr2042: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -50964,7 +50964,7 @@ tr2042: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51076,7 +51076,7 @@ tr1968: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51084,7 +51084,7 @@ tr1968: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51130,7 +51130,7 @@ tr2043: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51138,7 +51138,7 @@ tr2043: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51252,7 +51252,7 @@ tr2037: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -51271,7 +51271,7 @@ tr2044: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -51324,7 +51324,7 @@ tr1963: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51332,7 +51332,7 @@ tr1963: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51349,7 +51349,7 @@ tr2038: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51357,7 +51357,7 @@ tr2038: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51404,7 +51404,7 @@ tr1945: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51414,7 +51414,7 @@ tr1945: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51431,7 +51431,7 @@ tr2051: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51441,7 +51441,7 @@ tr2051: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51482,7 +51482,7 @@ tr1947: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51492,7 +51492,7 @@ tr1947: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51575,7 +51575,7 @@ tr2053: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51585,7 +51585,7 @@ tr2053: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51666,7 +51666,7 @@ tr1948: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51676,7 +51676,7 @@ tr1948: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51753,7 +51753,7 @@ tr2054: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51763,7 +51763,7 @@ tr2054: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51877,7 +51877,7 @@ tr2048: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -51896,7 +51896,7 @@ tr2055: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -51949,7 +51949,7 @@ tr1943: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51959,7 +51959,7 @@ tr1943: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -51976,7 +51976,7 @@ tr2049: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -51986,7 +51986,7 @@ tr2049: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52090,7 +52090,7 @@ tr1924: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -52098,7 +52098,7 @@ tr1924: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52115,7 +52115,7 @@ tr2066: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -52123,7 +52123,7 @@ tr2066: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52199,7 +52199,7 @@ tr2064: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52218,7 +52218,7 @@ tr2067: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52258,7 +52258,7 @@ tr1911: if (s->number64 <= 59) { s->loc.m2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52295,7 +52295,7 @@ tr1897: if (s->number64 <= 180) { s->loc.d2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52393,7 +52393,7 @@ tr1880: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -52401,7 +52401,7 @@ tr1880: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52418,7 +52418,7 @@ tr2078: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {goto st246;} } } @@ -52426,7 +52426,7 @@ tr2078: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52502,7 +52502,7 @@ tr2076: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52521,7 +52521,7 @@ tr2079: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52561,7 +52561,7 @@ tr1867: if (s->number64 <= 59) { s->loc.m1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52598,7 +52598,7 @@ tr1853: if (s->number64 <= 90) { s->loc.d1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } } @@ -52651,7 +52651,7 @@ tr2080: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52667,7 +52667,7 @@ tr2084: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52702,7 +52702,7 @@ case 705: tr2088: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -52711,7 +52711,7 @@ tr2088: tr2089: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -52728,7 +52728,7 @@ tr2081: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -52739,13 +52739,13 @@ tr2082: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -52757,13 +52757,13 @@ tr2083: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -52775,7 +52775,7 @@ tr2085: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -52824,7 +52824,7 @@ tr2090: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52840,7 +52840,7 @@ tr2096: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -52875,7 +52875,7 @@ case 707: tr2100: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -52884,7 +52884,7 @@ tr2100: tr2101: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -52901,7 +52901,7 @@ tr2093: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -52912,13 +52912,13 @@ tr2094: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -52930,13 +52930,13 @@ tr2095: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -52948,7 +52948,7 @@ tr2097: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -52997,7 +52997,7 @@ tr2102: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -53013,7 +53013,7 @@ tr2108: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -53048,7 +53048,7 @@ case 709: tr2112: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53057,7 +53057,7 @@ tr2112: tr2113: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53074,7 +53074,7 @@ tr2105: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53085,13 +53085,13 @@ tr2106: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53103,13 +53103,13 @@ tr2107: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53121,7 +53121,7 @@ tr2109: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53204,7 +53204,7 @@ tr2110: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53242,7 +53242,7 @@ tr2098: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53280,7 +53280,7 @@ tr2086: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53333,7 +53333,7 @@ tr2118: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -53349,7 +53349,7 @@ tr2122: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -53384,7 +53384,7 @@ case 716: tr2126: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53393,7 +53393,7 @@ tr2126: tr2127: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53410,7 +53410,7 @@ tr2119: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53421,13 +53421,13 @@ tr2120: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53439,13 +53439,13 @@ tr2121: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53457,7 +53457,7 @@ tr2123: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53506,7 +53506,7 @@ tr2128: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -53522,7 +53522,7 @@ tr2134: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -53557,7 +53557,7 @@ case 718: tr2139: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53566,7 +53566,7 @@ tr2139: tr2140: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53583,7 +53583,7 @@ tr2131: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53594,13 +53594,13 @@ tr2132: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53612,13 +53612,13 @@ tr2133: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53630,7 +53630,7 @@ tr2135: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -53705,7 +53705,7 @@ case 720: tr2150: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53714,7 +53714,7 @@ tr2150: tr2151: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53732,7 +53732,7 @@ tr2143: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -53744,13 +53744,13 @@ tr2144: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53763,13 +53763,13 @@ tr2145: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53782,7 +53782,7 @@ tr2146: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -53857,7 +53857,7 @@ case 722: tr2161: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53866,7 +53866,7 @@ tr2161: tr2162: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53884,7 +53884,7 @@ tr2154: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -53896,13 +53896,13 @@ tr2155: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -53915,13 +53915,13 @@ tr2156: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -53934,7 +53934,7 @@ tr2157: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -54009,7 +54009,7 @@ case 724: tr2171: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54018,7 +54018,7 @@ tr2171: tr2172: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -54036,7 +54036,7 @@ tr2165: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -54048,13 +54048,13 @@ tr2166: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54067,13 +54067,13 @@ tr2167: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -54086,7 +54086,7 @@ tr2168: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -54170,7 +54170,7 @@ tr2169: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -54209,7 +54209,7 @@ tr2158: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -54248,7 +54248,7 @@ tr2147: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -54286,7 +54286,7 @@ tr2136: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -54324,7 +54324,7 @@ tr2124: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -54400,7 +54400,7 @@ case 733: tr2179: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54409,7 +54409,7 @@ tr2179: tr2180: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -54461,7 +54461,7 @@ tr2183: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -54477,7 +54477,7 @@ tr2187: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -54512,7 +54512,7 @@ case 735: tr2191: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54521,7 +54521,7 @@ tr2191: tr2192: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -54538,7 +54538,7 @@ tr2184: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -54549,13 +54549,13 @@ tr2185: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54567,13 +54567,13 @@ tr2186: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -54585,7 +54585,7 @@ tr2188: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -54657,7 +54657,7 @@ case 737: tr2197: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54666,7 +54666,7 @@ tr2197: tr2198: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -54778,7 +54778,7 @@ tr2189: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -54840,7 +54840,7 @@ case 742: tr2206: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54849,7 +54849,7 @@ tr2206: tr2207: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -54866,7 +54866,7 @@ tr2223: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -54889,7 +54889,7 @@ tr2223: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -54913,7 +54913,7 @@ tr2224: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -54936,7 +54936,7 @@ tr2224: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -54955,7 +54955,7 @@ tr2224: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -54967,7 +54967,7 @@ tr2225: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -54990,7 +54990,7 @@ tr2225: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -55009,7 +55009,7 @@ tr2225: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -55021,7 +55021,7 @@ tr2227: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -55044,7 +55044,7 @@ tr2227: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -55156,7 +55156,7 @@ tr2219: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -55167,7 +55167,7 @@ tr2220: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -55186,7 +55186,7 @@ tr2221: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -55196,7 +55196,7 @@ tr2235: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -55222,7 +55222,7 @@ tr2222: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -55238,7 +55238,7 @@ tr2226: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -55284,7 +55284,7 @@ tr2228: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -55307,7 +55307,7 @@ tr2228: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -55363,7 +55363,7 @@ tr2229: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -55386,7 +55386,7 @@ tr2229: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -55426,7 +55426,7 @@ tr2230: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -55449,7 +55449,7 @@ tr2230: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -55553,7 +55553,7 @@ tr2233: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -55564,7 +55564,7 @@ tr2234: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -55595,7 +55595,7 @@ tr2231: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } } @@ -55618,7 +55618,7 @@ tr2231: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } // Find prefix without trailing zeroes. @@ -55687,7 +55687,7 @@ tr2236: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -55703,7 +55703,7 @@ tr2240: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -55738,7 +55738,7 @@ case 755: tr2244: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -55747,7 +55747,7 @@ tr2244: tr2245: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -55764,7 +55764,7 @@ tr2237: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -55775,13 +55775,13 @@ tr2238: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -55793,13 +55793,13 @@ tr2239: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -55811,7 +55811,7 @@ tr2241: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -55883,7 +55883,7 @@ case 757: tr2250: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -55892,7 +55892,7 @@ tr2250: tr2251: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -55944,7 +55944,7 @@ tr2254: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -55960,7 +55960,7 @@ tr2258: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -55995,7 +55995,7 @@ case 759: tr2263: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56004,7 +56004,7 @@ tr2263: tr2264: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56021,7 +56021,7 @@ tr2255: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -56032,13 +56032,13 @@ tr2256: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56050,13 +56050,13 @@ tr2257: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56068,7 +56068,7 @@ tr2259: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -56114,7 +56114,7 @@ tr2265: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -56135,7 +56135,7 @@ case 761: tr2270: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56144,7 +56144,7 @@ tr2270: tr2271: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56326,7 +56326,7 @@ tr2260: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -56391,7 +56391,7 @@ tr2242: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -56444,7 +56444,7 @@ tr2277: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -56460,7 +56460,7 @@ tr2281: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -56495,7 +56495,7 @@ case 768: tr2285: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56504,7 +56504,7 @@ tr2285: tr2286: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56521,7 +56521,7 @@ tr2278: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -56532,13 +56532,13 @@ tr2279: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56550,13 +56550,13 @@ tr2280: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56568,7 +56568,7 @@ tr2282: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -56617,7 +56617,7 @@ tr2287: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -56633,7 +56633,7 @@ tr2293: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -56668,7 +56668,7 @@ case 770: tr2297: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56677,7 +56677,7 @@ tr2297: tr2298: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56694,7 +56694,7 @@ tr2290: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -56705,13 +56705,13 @@ tr2291: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56723,13 +56723,13 @@ tr2292: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56741,7 +56741,7 @@ tr2294: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -56787,7 +56787,7 @@ tr2299: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -56808,7 +56808,7 @@ case 772: tr2304: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -56817,7 +56817,7 @@ tr2304: tr2305: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -56999,7 +56999,7 @@ tr2295: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -57037,7 +57037,7 @@ tr2283: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -57090,7 +57090,7 @@ tr2311: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -57106,7 +57106,7 @@ tr2315: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -57141,7 +57141,7 @@ case 778: tr2320: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57150,7 +57150,7 @@ tr2320: tr2321: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57167,7 +57167,7 @@ tr2312: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -57178,13 +57178,13 @@ tr2313: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57196,13 +57196,13 @@ tr2314: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57214,7 +57214,7 @@ tr2316: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -57284,7 +57284,7 @@ case 780: tr2329: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57293,7 +57293,7 @@ tr2329: tr2330: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57345,7 +57345,7 @@ tr2334: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -57361,7 +57361,7 @@ tr2338: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -57396,7 +57396,7 @@ case 782: tr2342: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57405,7 +57405,7 @@ tr2342: tr2343: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57422,7 +57422,7 @@ tr2335: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -57433,13 +57433,13 @@ tr2336: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57451,13 +57451,13 @@ tr2337: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57469,7 +57469,7 @@ tr2339: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -57603,7 +57603,7 @@ case 784: tr2349: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57612,7 +57612,7 @@ tr2349: tr2350: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57634,7 +57634,7 @@ tr2475: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57646,7 +57646,7 @@ tr2476: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57665,7 +57665,7 @@ tr2393: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -57679,7 +57679,7 @@ tr2394: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -57689,7 +57689,7 @@ tr2394: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57700,7 +57700,7 @@ tr2395: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -57710,7 +57710,7 @@ tr2395: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57721,7 +57721,7 @@ tr2403: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -57738,7 +57738,7 @@ tr2434: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -57752,7 +57752,7 @@ tr2435: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -57762,7 +57762,7 @@ tr2435: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -57773,7 +57773,7 @@ tr2436: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -57783,7 +57783,7 @@ tr2436: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -57794,7 +57794,7 @@ tr2444: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -57932,7 +57932,7 @@ tr2402: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -57957,7 +57957,7 @@ tr2443: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -57984,7 +57984,7 @@ tr2404: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -57998,7 +57998,7 @@ tr2445: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58043,7 +58043,7 @@ case 787: tr2352: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58052,7 +58052,7 @@ tr2352: tr2353: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58074,7 +58074,7 @@ tr2478: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58086,7 +58086,7 @@ tr2479: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58105,7 +58105,7 @@ tr2396: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58119,7 +58119,7 @@ tr2397: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58129,7 +58129,7 @@ tr2397: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58140,7 +58140,7 @@ tr2398: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58150,7 +58150,7 @@ tr2398: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58161,7 +58161,7 @@ tr2407: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58178,7 +58178,7 @@ tr2437: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58192,7 +58192,7 @@ tr2438: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58202,7 +58202,7 @@ tr2438: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58213,7 +58213,7 @@ tr2439: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58223,7 +58223,7 @@ tr2439: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58234,7 +58234,7 @@ tr2448: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58321,7 +58321,7 @@ tr2408: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58335,7 +58335,7 @@ tr2449: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58390,7 +58390,7 @@ tr2409: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58410,7 +58410,7 @@ tr2450: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58511,7 +58511,7 @@ tr2410: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58536,7 +58536,7 @@ tr2451: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58584,7 +58584,7 @@ case 1126: tr2355: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58593,7 +58593,7 @@ tr2355: tr2356: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58615,7 +58615,7 @@ tr2481: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58627,7 +58627,7 @@ tr2482: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58646,7 +58646,7 @@ tr2399: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58660,7 +58660,7 @@ tr2400: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58670,7 +58670,7 @@ tr2400: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58681,7 +58681,7 @@ tr2401: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58691,7 +58691,7 @@ tr2401: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58702,7 +58702,7 @@ tr2411: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58719,7 +58719,7 @@ tr2440: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58733,7 +58733,7 @@ tr2441: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58743,7 +58743,7 @@ tr2441: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -58754,7 +58754,7 @@ tr2442: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58764,7 +58764,7 @@ tr2442: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -58775,7 +58775,7 @@ tr2452: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -58936,7 +58936,7 @@ tr2405: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -58956,7 +58956,7 @@ tr2446: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -59084,7 +59084,7 @@ tr2406: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -59109,7 +59109,7 @@ tr2447: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -59164,7 +59164,7 @@ tr2412: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -59178,7 +59178,7 @@ tr2453: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -59248,7 +59248,7 @@ tr2413: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -59268,7 +59268,7 @@ tr2454: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -59440,7 +59440,7 @@ tr2414: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -59465,7 +59465,7 @@ tr2455: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {goto st246;} } } @@ -59531,7 +59531,7 @@ tr2340: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -59623,7 +59623,7 @@ case 794: tr2373: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -59632,7 +59632,7 @@ tr2373: tr2374: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -59684,7 +59684,7 @@ tr2377: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -59700,7 +59700,7 @@ tr2381: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -59735,7 +59735,7 @@ case 796: tr2386: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -59744,7 +59744,7 @@ tr2386: tr2387: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -59761,7 +59761,7 @@ tr2378: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -59772,13 +59772,13 @@ tr2379: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -59790,13 +59790,13 @@ tr2380: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -59808,7 +59808,7 @@ tr2382: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -59853,7 +59853,7 @@ tr2388: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -59864,7 +59864,7 @@ tr2392: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -59975,7 +59975,7 @@ tr2383: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -60067,7 +60067,7 @@ case 801: tr2416: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -60076,7 +60076,7 @@ tr2416: tr2417: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -60128,7 +60128,7 @@ tr2420: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -60144,7 +60144,7 @@ tr2424: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -60179,7 +60179,7 @@ case 803: tr2428: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -60188,7 +60188,7 @@ tr2428: tr2429: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -60205,7 +60205,7 @@ tr2421: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -60216,13 +60216,13 @@ tr2422: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -60234,13 +60234,13 @@ tr2423: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -60252,7 +60252,7 @@ tr2425: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -60303,7 +60303,7 @@ tr2430: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -60314,7 +60314,7 @@ tr2433: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -60431,7 +60431,7 @@ tr2426: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -60523,7 +60523,7 @@ case 808: tr2457: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -60532,7 +60532,7 @@ tr2457: tr2458: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -60584,7 +60584,7 @@ tr2461: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -60600,7 +60600,7 @@ tr2465: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -60635,7 +60635,7 @@ case 810: tr2469: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -60644,7 +60644,7 @@ tr2469: tr2470: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -60661,7 +60661,7 @@ tr2462: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -60672,13 +60672,13 @@ tr2463: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -60690,13 +60690,13 @@ tr2464: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -60708,7 +60708,7 @@ tr2466: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -60861,7 +60861,7 @@ tr2467: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -60926,7 +60926,7 @@ tr2317: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -61027,7 +61027,7 @@ case 817: tr2520: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61036,7 +61036,7 @@ tr2520: tr2521: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61053,7 +61053,7 @@ tr2890: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -61064,13 +61064,13 @@ tr2891: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61082,13 +61082,13 @@ tr2892: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61100,7 +61100,7 @@ tr2894: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -61115,7 +61115,7 @@ tr2512: { type_num(KNOT_RRTYPE_A, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61125,7 +61125,7 @@ tr2513: { type_num(KNOT_RRTYPE_A, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61144,7 +61144,7 @@ tr2607: { type_num(KNOT_RRTYPE_AAAA, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61154,7 +61154,7 @@ tr2608: { type_num(KNOT_RRTYPE_AAAA, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61173,7 +61173,7 @@ tr2615: { type_num(KNOT_RRTYPE_AFSDB, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61183,7 +61183,7 @@ tr2616: { type_num(KNOT_RRTYPE_AFSDB, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61202,7 +61202,7 @@ tr2621: { type_num(KNOT_RRTYPE_APL, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61212,7 +61212,7 @@ tr2622: { type_num(KNOT_RRTYPE_APL, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61231,7 +61231,7 @@ tr2630: { type_num(KNOT_RRTYPE_CERT, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61241,7 +61241,7 @@ tr2631: { type_num(KNOT_RRTYPE_CERT, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61260,7 +61260,7 @@ tr2638: { type_num(KNOT_RRTYPE_CNAME, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61270,7 +61270,7 @@ tr2639: { type_num(KNOT_RRTYPE_CNAME, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61289,7 +61289,7 @@ tr2649: { type_num(KNOT_RRTYPE_DHCID, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61299,7 +61299,7 @@ tr2650: { type_num(KNOT_RRTYPE_DHCID, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61318,7 +61318,7 @@ tr2658: { type_num(KNOT_RRTYPE_DNAME, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61328,7 +61328,7 @@ tr2659: { type_num(KNOT_RRTYPE_DNAME, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61347,7 +61347,7 @@ tr2666: { type_num(KNOT_RRTYPE_DNSKEY, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61357,7 +61357,7 @@ tr2667: { type_num(KNOT_RRTYPE_DNSKEY, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61376,7 +61376,7 @@ tr2671: { type_num(KNOT_RRTYPE_DS, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61386,7 +61386,7 @@ tr2672: { type_num(KNOT_RRTYPE_DS, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61405,7 +61405,7 @@ tr2681: { type_num(KNOT_RRTYPE_EUI48, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61415,7 +61415,7 @@ tr2682: { type_num(KNOT_RRTYPE_EUI48, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61434,7 +61434,7 @@ tr2687: { type_num(KNOT_RRTYPE_EUI64, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61444,7 +61444,7 @@ tr2688: { type_num(KNOT_RRTYPE_EUI64, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61463,7 +61463,7 @@ tr2696: { type_num(KNOT_RRTYPE_HINFO, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61473,7 +61473,7 @@ tr2697: { type_num(KNOT_RRTYPE_HINFO, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61492,7 +61492,7 @@ tr2708: { type_num(KNOT_RRTYPE_IPSECKEY, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61502,7 +61502,7 @@ tr2709: { type_num(KNOT_RRTYPE_IPSECKEY, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61521,7 +61521,7 @@ tr2716: { type_num(KNOT_RRTYPE_KEY, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61531,7 +61531,7 @@ tr2717: { type_num(KNOT_RRTYPE_KEY, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61550,7 +61550,7 @@ tr2721: { type_num(KNOT_RRTYPE_KX, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61560,7 +61560,7 @@ tr2722: { type_num(KNOT_RRTYPE_KX, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61579,7 +61579,7 @@ tr2731: { type_num(KNOT_RRTYPE_L32, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61589,7 +61589,7 @@ tr2732: { type_num(KNOT_RRTYPE_L32, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61608,7 +61608,7 @@ tr2737: { type_num(KNOT_RRTYPE_L64, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61618,7 +61618,7 @@ tr2738: { type_num(KNOT_RRTYPE_L64, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61637,7 +61637,7 @@ tr2743: { type_num(KNOT_RRTYPE_LOC, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61647,7 +61647,7 @@ tr2744: { type_num(KNOT_RRTYPE_LOC, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61666,7 +61666,7 @@ tr2748: { type_num(KNOT_RRTYPE_LP, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61676,7 +61676,7 @@ tr2749: { type_num(KNOT_RRTYPE_LP, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61695,7 +61695,7 @@ tr2758: { type_num(KNOT_RRTYPE_MINFO, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61705,7 +61705,7 @@ tr2759: { type_num(KNOT_RRTYPE_MINFO, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61724,7 +61724,7 @@ tr2763: { type_num(KNOT_RRTYPE_MX, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61734,7 +61734,7 @@ tr2764: { type_num(KNOT_RRTYPE_MX, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61753,7 +61753,7 @@ tr2774: { type_num(KNOT_RRTYPE_NAPTR, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61763,7 +61763,7 @@ tr2775: { type_num(KNOT_RRTYPE_NAPTR, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61782,7 +61782,7 @@ tr2780: { type_num(KNOT_RRTYPE_NID, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61792,7 +61792,7 @@ tr2781: { type_num(KNOT_RRTYPE_NID, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61811,7 +61811,7 @@ tr2785: { type_num(KNOT_RRTYPE_NS, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61821,7 +61821,7 @@ tr2786: { type_num(KNOT_RRTYPE_NS, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61840,7 +61840,7 @@ tr2792: { type_num(KNOT_RRTYPE_NSEC, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61850,7 +61850,7 @@ tr2793: { type_num(KNOT_RRTYPE_NSEC, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61869,7 +61869,7 @@ tr2798: { type_num(KNOT_RRTYPE_NSEC3, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61879,7 +61879,7 @@ tr2799: { type_num(KNOT_RRTYPE_NSEC3, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61898,7 +61898,7 @@ tr2808: { type_num(KNOT_RRTYPE_NSEC3PARAM, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61908,7 +61908,7 @@ tr2809: { type_num(KNOT_RRTYPE_NSEC3PARAM, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61927,7 +61927,7 @@ tr2815: { type_num(KNOT_RRTYPE_PTR, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61937,7 +61937,7 @@ tr2816: { type_num(KNOT_RRTYPE_PTR, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61956,7 +61956,7 @@ tr2823: { type_num(KNOT_RRTYPE_RP, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61966,7 +61966,7 @@ tr2824: { type_num(KNOT_RRTYPE_RP, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -61985,7 +61985,7 @@ tr2831: { type_num(KNOT_RRTYPE_RRSIG, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -61995,7 +61995,7 @@ tr2832: { type_num(KNOT_RRTYPE_RRSIG, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62014,7 +62014,7 @@ tr2836: { type_num(KNOT_RRTYPE_RT, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62024,7 +62024,7 @@ tr2837: { type_num(KNOT_RRTYPE_RT, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62043,7 +62043,7 @@ tr2846: { type_num(KNOT_RRTYPE_SOA, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62053,7 +62053,7 @@ tr2847: { type_num(KNOT_RRTYPE_SOA, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62072,7 +62072,7 @@ tr2852: { type_num(KNOT_RRTYPE_SPF, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62082,7 +62082,7 @@ tr2853: { type_num(KNOT_RRTYPE_SPF, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62101,7 +62101,7 @@ tr2858: { type_num(KNOT_RRTYPE_SRV, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62111,7 +62111,7 @@ tr2859: { type_num(KNOT_RRTYPE_SRV, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62130,7 +62130,7 @@ tr2866: { type_num(KNOT_RRTYPE_SSHFP, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62140,7 +62140,7 @@ tr2867: { type_num(KNOT_RRTYPE_SSHFP, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62159,7 +62159,7 @@ tr2876: { type_num(KNOT_RRTYPE_TLSA, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62169,7 +62169,7 @@ tr2877: { type_num(KNOT_RRTYPE_TLSA, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62188,7 +62188,7 @@ tr2882: { type_num(KNOT_RRTYPE_TXT, &rdata_tail); } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62198,7 +62198,7 @@ tr2883: { type_num(KNOT_RRTYPE_TXT, &rdata_tail); } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62274,7 +62274,7 @@ case 819: tr2526: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62283,7 +62283,7 @@ tr2526: tr2527: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62335,7 +62335,7 @@ tr2530: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -62351,7 +62351,7 @@ tr2534: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -62386,7 +62386,7 @@ case 821: tr2538: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62395,7 +62395,7 @@ tr2538: tr2539: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62412,7 +62412,7 @@ tr2531: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -62423,13 +62423,13 @@ tr2532: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62441,13 +62441,13 @@ tr2533: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62459,7 +62459,7 @@ tr2535: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -62508,7 +62508,7 @@ tr2540: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -62524,7 +62524,7 @@ tr2546: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -62559,7 +62559,7 @@ case 823: tr2551: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62568,7 +62568,7 @@ tr2551: tr2552: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62585,7 +62585,7 @@ tr2543: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -62596,13 +62596,13 @@ tr2544: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62614,13 +62614,13 @@ tr2545: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62632,7 +62632,7 @@ tr2547: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -62675,7 +62675,7 @@ tr2553: if (s->buffer_length < MAX_RDATA_LENGTH) { s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -62685,7 +62685,7 @@ tr2559: if (s->buffer_length < MAX_RDATA_LENGTH) { s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -62720,7 +62720,7 @@ case 825: tr2563: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62729,7 +62729,7 @@ tr2563: tr2564: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62747,7 +62747,7 @@ tr2556: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -62760,7 +62760,7 @@ tr2556: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -62768,11 +62768,11 @@ tr2556: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } @@ -62784,7 +62784,7 @@ tr2557: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -62797,7 +62797,7 @@ tr2557: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -62805,17 +62805,17 @@ tr2557: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62828,7 +62828,7 @@ tr2558: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -62841,7 +62841,7 @@ tr2558: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -62849,17 +62849,17 @@ tr2558: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -62872,7 +62872,7 @@ tr2560: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -62885,7 +62885,7 @@ tr2560: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -62893,11 +62893,11 @@ tr2560: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } @@ -62940,7 +62940,7 @@ tr2565: if (s->buffer_length < MAX_RDATA_LENGTH) { s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -62950,7 +62950,7 @@ tr2571: if (s->buffer_length < MAX_RDATA_LENGTH) { s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -62985,7 +62985,7 @@ case 827: tr2575: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -62994,7 +62994,7 @@ tr2575: tr2576: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -63012,7 +63012,7 @@ tr2568: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -63025,7 +63025,7 @@ tr2568: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -63033,11 +63033,11 @@ tr2568: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } @@ -63049,7 +63049,7 @@ tr2569: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -63062,7 +63062,7 @@ tr2569: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -63070,17 +63070,17 @@ tr2569: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -63093,7 +63093,7 @@ tr2570: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -63106,7 +63106,7 @@ tr2570: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -63114,17 +63114,17 @@ tr2570: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -63137,7 +63137,7 @@ tr2572: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -63150,7 +63150,7 @@ tr2572: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -63158,11 +63158,11 @@ tr2572: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } @@ -63211,7 +63211,7 @@ tr2577: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -63227,7 +63227,7 @@ tr2583: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -63262,7 +63262,7 @@ case 829: tr2587: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -63271,7 +63271,7 @@ tr2587: tr2588: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -63288,7 +63288,7 @@ tr2580: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -63299,13 +63299,13 @@ tr2581: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -63317,13 +63317,13 @@ tr2582: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -63335,7 +63335,7 @@ tr2584: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -63413,7 +63413,7 @@ case 831: tr2598: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -63422,7 +63422,7 @@ tr2598: tr2599: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -63444,7 +63444,7 @@ tr2593: } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -63456,7 +63456,7 @@ tr2594: } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -63576,7 +63576,7 @@ tr2585: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -63615,7 +63615,7 @@ tr2573: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -63628,7 +63628,7 @@ tr2573: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -63636,11 +63636,11 @@ tr2573: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } @@ -63679,7 +63679,7 @@ tr2561: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -63692,7 +63692,7 @@ tr2561: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {goto st246;} } @@ -63700,11 +63700,11 @@ tr2561: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {goto st246;} } } @@ -63742,7 +63742,7 @@ tr2548: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {goto st246;} } } @@ -63780,7 +63780,7 @@ tr2536: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -63845,7 +63845,7 @@ tr2895: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -65661,7 +65661,7 @@ tr2889: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -65677,7 +65677,7 @@ tr2893: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -65798,7 +65798,7 @@ tr2899: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -65814,7 +65814,7 @@ tr2903: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -65849,7 +65849,7 @@ case 962: tr2907: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -65858,7 +65858,7 @@ tr2907: tr2908: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -65875,7 +65875,7 @@ tr2900: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -65886,13 +65886,13 @@ tr2901: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -65904,13 +65904,13 @@ tr2902: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -65922,7 +65922,7 @@ tr2904: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -65971,7 +65971,7 @@ tr2909: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -65987,7 +65987,7 @@ tr2915: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -66022,7 +66022,7 @@ case 964: tr2919: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66031,7 +66031,7 @@ tr2919: tr2920: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66048,7 +66048,7 @@ tr2912: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -66059,13 +66059,13 @@ tr2913: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66077,13 +66077,13 @@ tr2914: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66095,7 +66095,7 @@ tr2916: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -66167,7 +66167,7 @@ case 966: tr2925: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66176,7 +66176,7 @@ tr2925: tr2926: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66288,7 +66288,7 @@ tr2917: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -66326,7 +66326,7 @@ tr2905: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -66428,7 +66428,7 @@ tr2933: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -66444,7 +66444,7 @@ tr2937: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -66479,7 +66479,7 @@ case 975: tr2941: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66488,7 +66488,7 @@ tr2941: tr2942: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66505,7 +66505,7 @@ tr2934: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -66516,13 +66516,13 @@ tr2935: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66534,13 +66534,13 @@ tr2936: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66552,7 +66552,7 @@ tr2938: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -66601,7 +66601,7 @@ tr2943: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -66617,7 +66617,7 @@ tr2949: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -66652,7 +66652,7 @@ case 977: tr2953: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66661,7 +66661,7 @@ tr2953: tr2954: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66678,7 +66678,7 @@ tr2946: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -66689,13 +66689,13 @@ tr2947: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66707,13 +66707,13 @@ tr2948: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66725,7 +66725,7 @@ tr2950: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -66774,7 +66774,7 @@ tr2955: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -66790,7 +66790,7 @@ tr2961: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -66825,7 +66825,7 @@ case 979: tr2965: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66834,7 +66834,7 @@ tr2965: tr2966: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66851,7 +66851,7 @@ tr2958: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -66862,13 +66862,13 @@ tr2959: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66880,13 +66880,13 @@ tr2960: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -66898,7 +66898,7 @@ tr2962: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -66973,7 +66973,7 @@ case 981: tr2978: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -66982,7 +66982,7 @@ tr2978: tr2979: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -67000,7 +67000,7 @@ tr2971: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -67012,13 +67012,13 @@ tr2972: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -67031,13 +67031,13 @@ tr2973: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -67050,7 +67050,7 @@ tr2974: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -67099,7 +67099,7 @@ tr2980: if (rdata_tail <= rdata_stop) { *rdata_tail = first_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67109,7 +67109,7 @@ tr2995: if (rdata_tail <= rdata_stop) { *rdata_tail = first_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67134,7 +67134,7 @@ tr2983: if (rdata_tail <= rdata_stop) { *rdata_tail = second_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67179,7 +67179,7 @@ tr2986: if (rdata_tail <= rdata_stop) { *rdata_tail = fourth_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67206,7 +67206,7 @@ tr2987: if (rdata_tail <= rdata_stop) { *rdata_tail = fifth_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67251,7 +67251,7 @@ tr2991: if (rdata_tail <= rdata_stop) { *rdata_tail = seventh_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67306,7 +67306,7 @@ tr2994: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -67378,7 +67378,7 @@ tr2975: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -67415,7 +67415,7 @@ tr3000: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67428,7 +67428,7 @@ tr2968: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -67491,7 +67491,7 @@ tr2963: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -67529,7 +67529,7 @@ tr2951: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -67567,7 +67567,7 @@ tr2939: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -67620,7 +67620,7 @@ tr3001: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -67636,7 +67636,7 @@ tr3005: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -67671,7 +67671,7 @@ case 1004: tr3009: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -67680,7 +67680,7 @@ tr3009: tr3010: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -67697,7 +67697,7 @@ tr3002: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -67708,13 +67708,13 @@ tr3003: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -67726,13 +67726,13 @@ tr3004: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -67744,7 +67744,7 @@ tr3006: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -67793,7 +67793,7 @@ tr3011: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -67809,7 +67809,7 @@ tr3017: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -67844,7 +67844,7 @@ case 1006: tr3021: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -67853,7 +67853,7 @@ tr3021: tr3022: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -67870,7 +67870,7 @@ tr3014: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -67881,13 +67881,13 @@ tr3015: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -67899,13 +67899,13 @@ tr3016: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -67917,7 +67917,7 @@ tr3018: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -67966,7 +67966,7 @@ tr3023: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -67982,7 +67982,7 @@ tr3029: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -68017,7 +68017,7 @@ case 1008: tr3033: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68026,7 +68026,7 @@ tr3033: tr3034: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68043,7 +68043,7 @@ tr3026: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -68054,13 +68054,13 @@ tr3027: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68072,13 +68072,13 @@ tr3028: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68090,7 +68090,7 @@ tr3030: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -68158,7 +68158,7 @@ tr3039: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {goto st246;} } } @@ -68176,7 +68176,7 @@ tr3041: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -68189,7 +68189,7 @@ tr3036: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -68242,7 +68242,7 @@ tr3031: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -68280,7 +68280,7 @@ tr3019: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68318,7 +68318,7 @@ tr3007: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68371,7 +68371,7 @@ tr3042: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -68387,7 +68387,7 @@ tr3046: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -68422,7 +68422,7 @@ case 1017: tr3050: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68431,7 +68431,7 @@ tr3050: tr3051: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68448,7 +68448,7 @@ tr3043: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68459,13 +68459,13 @@ tr3044: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68477,13 +68477,13 @@ tr3045: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68495,7 +68495,7 @@ tr3047: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68544,7 +68544,7 @@ tr3052: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -68560,7 +68560,7 @@ tr3058: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -68595,7 +68595,7 @@ case 1019: tr3062: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68604,7 +68604,7 @@ tr3062: tr3063: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68621,7 +68621,7 @@ tr3055: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68632,13 +68632,13 @@ tr3056: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68650,13 +68650,13 @@ tr3057: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68668,7 +68668,7 @@ tr3059: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68717,7 +68717,7 @@ tr3064: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -68733,7 +68733,7 @@ tr3070: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -68768,7 +68768,7 @@ case 1021: tr3074: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68777,7 +68777,7 @@ tr3074: tr3075: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68794,7 +68794,7 @@ tr3067: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68805,13 +68805,13 @@ tr3068: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68823,13 +68823,13 @@ tr3069: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -68841,7 +68841,7 @@ tr3071: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -68887,7 +68887,7 @@ tr3076: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -68908,7 +68908,7 @@ case 1023: tr3081: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -68917,7 +68917,7 @@ tr3081: tr3082: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -69099,7 +69099,7 @@ tr3072: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -69137,7 +69137,7 @@ tr3060: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -69175,7 +69175,7 @@ tr3048: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {goto st246;} } } @@ -69228,7 +69228,7 @@ tr3088: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -69244,7 +69244,7 @@ tr3092: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -69279,7 +69279,7 @@ case 1030: tr3096: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -69288,7 +69288,7 @@ tr3096: tr3097: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -69305,7 +69305,7 @@ tr3089: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -69316,13 +69316,13 @@ tr3090: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -69334,13 +69334,13 @@ tr3091: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -69352,7 +69352,7 @@ tr3093: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -69397,7 +69397,7 @@ tr3098: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -69408,7 +69408,7 @@ tr3102: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -69436,7 +69436,7 @@ tr3101: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {goto st246;} } } @@ -69459,7 +69459,7 @@ tr3094: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -69512,7 +69512,7 @@ tr3103: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -69528,7 +69528,7 @@ tr3107: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {goto st246;} } } @@ -69563,7 +69563,7 @@ case 1035: tr3111: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -69572,7 +69572,7 @@ tr3111: tr3112: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -69589,7 +69589,7 @@ tr3104: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -69600,13 +69600,13 @@ tr3105: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {goto st246;} } s->multiline = true; @@ -69618,13 +69618,13 @@ tr3106: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {goto st246;} } s->multiline = false; @@ -69636,7 +69636,7 @@ tr3108: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -69685,7 +69685,7 @@ tr3113: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -69727,7 +69727,7 @@ tr3117: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -69781,7 +69781,7 @@ tr3121: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -69823,7 +69823,7 @@ tr3123: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -69868,7 +69868,7 @@ tr3126: } { if (s->item_length != 4) { - WARN(ZSCANNER_EBAD_L64_LENGTH); + WARN(ZS_BAD_L64_LENGTH); p--; {goto st246;} } } @@ -69887,7 +69887,7 @@ tr3109: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {goto st246;} } } @@ -69940,7 +69940,7 @@ tr3127: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -69994,7 +69994,7 @@ tr3131: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -70039,7 +70039,7 @@ tr3133: } { if (s->item_length != 6) { - WARN(ZSCANNER_EBAD_EUI_LENGTH); + WARN(ZS_BAD_EUI_LENGTH); p--; {goto st246;} } } @@ -70073,7 +70073,7 @@ tr3134: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -70127,7 +70127,7 @@ tr3137: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {goto st246;} } } @@ -70172,7 +70172,7 @@ tr3139: } { if (s->item_length != 8) { - WARN(ZSCANNER_EBAD_EUI_LENGTH); + WARN(ZS_BAD_EUI_LENGTH); p--; {goto st246;} } } @@ -71346,7 +71346,7 @@ case 1143: case 299: case 306: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -71357,27 +71357,27 @@ case 1143: case 256: case 257: { - WARN(ZSCANNER_EBAD_DNAME_CHAR); + WARN(ZS_BAD_DNAME_CHAR); p--; {goto st246;} } break; case 146: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } break; case 265: { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {goto st246;} } break; case 270: case 278: { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } break; @@ -71387,13 +71387,13 @@ case 1143: case 285: case 291: { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {goto st246;} } break; case 293: { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } break; @@ -71401,7 +71401,7 @@ case 1143: case 300: case 307: { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {goto st246;} } break; @@ -71428,7 +71428,7 @@ case 1143: case 187: case 188: { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); p--; {goto st246;} } break; @@ -71440,7 +71440,7 @@ case 1143: case 315: case 316: { - WARN(ZSCANNER_EBAD_BASE64_CHAR); + WARN(ZS_BAD_BASE64_CHAR); p--; {goto st246;} } break; @@ -71565,7 +71565,7 @@ case 1143: case 435: case 436: { - WARN(ZSCANNER_EBAD_BITMAP); + WARN(ZS_BAD_BITMAP); p--; {goto st246;} } break; @@ -71576,7 +71576,7 @@ case 1143: case 453: case 455: { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } break; @@ -71676,7 +71676,7 @@ case 1143: case 549: case 550: { - WARN(ZSCANNER_EBAD_ALGORITHM); + WARN(ZS_BAD_ALGORITHM); p--; {goto st246;} } break; @@ -71722,7 +71722,7 @@ case 1143: case 590: case 591: { - WARN(ZSCANNER_EBAD_CERT_TYPE); + WARN(ZS_BAD_CERT_TYPE); p--; {goto st246;} } break; @@ -71835,7 +71835,7 @@ case 1143: case 1033: case 1046: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -71927,18 +71927,18 @@ case 1143: case 218: case 220: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } break; case 273: case 274: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } break; @@ -71947,11 +71947,11 @@ case 1143: case 284: case 290: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {goto st246;} } break; @@ -71960,11 +71960,11 @@ case 1143: case 254: case 255: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_DNAME_CHAR); + WARN(ZS_BAD_DNAME_CHAR); p--; {goto st246;} } break; @@ -71973,11 +71973,11 @@ case 1143: case 288: case 289: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {goto st246;} } break; @@ -71986,22 +71986,22 @@ case 1143: case 303: case 304: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {goto st246;} } break; case 208: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72021,21 +72021,21 @@ case 1143: case 244: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } break; case 271: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } break; @@ -72045,11 +72045,11 @@ case 1143: case 448: case 454: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } break; @@ -72116,11 +72116,11 @@ case 1143: case 1034: case 1035: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72129,11 +72129,11 @@ case 1143: case 147: case 150: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } break; @@ -72142,11 +72142,11 @@ case 1143: case 826: case 827: { - WARN(ZSCANNER_EBAD_TIMESTAMP_CHAR); + WARN(ZS_BAD_TIMESTAMP_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72154,21 +72154,21 @@ case 1143: case 259: case 264: { - WARN(ZSCANNER_EBAD_TEXT_CHAR); + WARN(ZS_BAD_TEXT_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {goto st246;} } break; case 294: { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -72176,11 +72176,11 @@ case 1143: case 297: case 305: { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -72191,11 +72191,11 @@ case 1143: case 1031: case 1032: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72206,11 +72206,11 @@ case 1143: case 749: case 751: { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72251,11 +72251,11 @@ case 1143: case 1056: case 1057: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72274,11 +72274,11 @@ case 1143: case 995: case 996: { - WARN(ZSCANNER_EBAD_BASE32HEX_CHAR); + WARN(ZS_BAD_BASE32HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72298,11 +72298,11 @@ case 1143: case 813: case 814: { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72314,11 +72314,11 @@ case 1143: case 790: case 791: { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72439,11 +72439,11 @@ case 1143: case 954: case 955: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72503,11 +72503,11 @@ case 1143: case 702: case 703: { - WARN(ZSCANNER_EBAD_LOC_DATA); + WARN(ZS_BAD_LOC_DATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72526,11 +72526,11 @@ case 1143: case 226: case 228: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -72539,11 +72539,11 @@ case 1143: case 243: case 245: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -72586,41 +72586,41 @@ case 1143: case 219: case 221: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 189: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; case 156: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72633,30 +72633,30 @@ case 1143: case 809: case 810: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 956: case 957: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72665,44 +72665,44 @@ case 1143: case 160: case 191: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; case 126: case 157: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 276: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } break; @@ -72723,15 +72723,15 @@ case 1143: case 623: case 624: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72744,15 +72744,15 @@ case 1143: case 153: case 154: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } break; @@ -72765,15 +72765,15 @@ case 1143: case 268: case 269: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TEXT_CHAR); + WARN(ZS_BAD_TEXT_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {goto st246;} } break; @@ -72782,30 +72782,30 @@ case 1143: case 752: case 753: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 797: case 804: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72818,44 +72818,44 @@ case 1143: case 451: case 452: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {goto st246;} } break; case 1040: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_CHAR_COLON); + WARN(ZS_BAD_CHAR_COLON); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 784: case 812: { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; @@ -72864,43 +72864,43 @@ case 1143: case 1055: case 1058: { - WARN(ZSCANNER_EBAD_CHAR_DASH); + WARN(ZS_BAD_CHAR_DASH); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 1045: { - WARN(ZSCANNER_EBAD_CHAR_COLON); + WARN(ZS_BAD_CHAR_COLON); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 179: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); p--; {goto st246;} } break; @@ -72919,34 +72919,34 @@ case 1143: case 176: case 177: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; case 149: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } break; @@ -72966,19 +72966,19 @@ case 1143: case 207: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -72987,19 +72987,19 @@ case 1143: case 194: case 209: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -73007,87 +73007,87 @@ case 1143: case 275: case 277: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {goto st246;} } break; case 798: case 805: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } break; case 14: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; case 190: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {goto st246;} } { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {goto st246;} } { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {goto st246;} } break; @@ -73100,7 +73100,7 @@ case 1143: // Check if scanner state machine is in uncovered state. if (cs == zone_scanner_error) { - ERR(ZSCANNER_UNCOVERED_STATE); + ERR(ZS_UNCOVERED_STATE); s->error_counter++; // Fill error context data. @@ -73127,7 +73127,7 @@ case 1143: // Check unclosed multiline record. if (is_complete && s->multiline) { - ERR(ZSCANNER_UNCLOSED_MULTILINE); + ERR(ZS_UNCLOSED_MULTILINE); s->error_counter++; s->process_error(s); } diff --git a/src/zscanner/scanner.c.t0 b/src/zscanner/scanner.c.t0 index f63d315839..9d2aae7949 100644 --- a/src/zscanner/scanner.c.t0 +++ b/src/zscanner/scanner.c.t0 @@ -29,20 +29,20 @@ #include <arpa/inet.h> // inet_pton #include "zscanner/scanner.h" -#include "zscanner/error.h" // error codes -#include "zscanner/file_loader.h" // file_loader -#include "zscanner/scanner_functions.h" // Base64 -#include "common/descriptor.h" // KNOT_RRTYPE_A +#include "zscanner/loader.h" // loader in includes +#include "zscanner/error.h" +#include "zscanner/functions.h" +#include "common/descriptor.h" /*! \brief Shorthand for setting warning data. */ #define WARN(code) { s->error_code = code; } /*! \brief Shorthand for setting error data. */ -#define ERR(code) { s->error_code = code; s->stop = true; } +#define ERR(code) { s->error_code = code; s->stop = true; } /*! * \brief Empty function which is called if no callback function is specified. */ -static inline void noop(const scanner_t *s) +static inline void noop(const zs_scanner_t *s) { (void)s; } @@ -65,7 +65,7 @@ static inline void type_num(const uint16_t type, uint8_t **rdata_tail) * \param type Type number. * \param s Scanner context. */ -static inline void window_add_bit(const uint16_t type, scanner_t *s) { +static inline void window_add_bit(const uint16_t type, zs_scanner_t *s) { uint8_t win = type / 256; uint8_t bit_pos = type % 256; uint8_t byte_pos = bit_pos / 8; @@ -4925,17 +4925,17 @@ static const int zone_scanner_en_main = 1059; -scanner_t* scanner_create(const char *file_name, - const char *origin, - const uint16_t rclass, - const uint32_t ttl, - void (*process_record)(const scanner_t *), - void (*process_error)(const scanner_t *), - void *data) +zs_scanner_t* zs_scanner_create(const char *file_name, + const char *origin, + const uint16_t rclass, + const uint32_t ttl, + void (*process_record)(const zs_scanner_t *), + void (*process_error)(const zs_scanner_t *), + void *data) { char settings[1024]; - scanner_t *s = calloc(1, sizeof(scanner_t)); + zs_scanner_t *s = calloc(1, sizeof(zs_scanner_t)); if (s == NULL) { return NULL; } @@ -4974,8 +4974,8 @@ scanner_t* scanner_create(const char *file_name, } int ret = snprintf(settings, sizeof(settings), format, origin); if (ret <= 0 || (size_t)ret >= sizeof(settings) || - scanner_process(settings, settings + ret, true, s) != 0) { - scanner_free(s); + zs_scanner_process(settings, settings + ret, true, s) != 0) { + zs_scanner_free(s); return NULL; } @@ -4990,7 +4990,7 @@ scanner_t* scanner_create(const char *file_name, return s; } -void scanner_free(scanner_t *s) +void zs_scanner_free(zs_scanner_t *s) { if (s != NULL) { free(s->file_name); @@ -4999,10 +4999,10 @@ void scanner_free(scanner_t *s) } } -int scanner_process(const char *start, - const char *end, - const bool is_complete, - scanner_t *s) +int zs_scanner_process(const char *start, + const char *end, + const bool is_complete, + zs_scanner_t *s) { // Necessary scanner variables. const char *p = start; @@ -5240,7 +5240,7 @@ _match: case 2: { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); p--; {cs = 246; goto _again;} } s->multiline = true; @@ -5249,7 +5249,7 @@ _match: case 3: { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); p--; {cs = 246; goto _again;} } s->multiline = false; @@ -5257,7 +5257,7 @@ _match: break; case 4: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {cs = 246; goto _again;} } break; @@ -5269,7 +5269,7 @@ _match: case 6: { if ((*p) == '\r') { - ERR(ZSCANNER_DOS_NEWLINE); + ERR(ZS_DOS_NEWLINE); } if (s->buffer_length < sizeof(s->buffer) - 1) { @@ -5292,7 +5292,7 @@ _match: s->process_error(s); // Reset. - s->error_code = ZSCANNER_OK; + s->error_code = ZS_OK; s->multiline = false; // In case of serious error, stop scanner. @@ -5316,7 +5316,7 @@ _match: (s->dname)[s->dname_tmp_length++] = (*p); s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5327,7 +5327,7 @@ _match: (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5338,7 +5338,7 @@ _match: (s->dname)[s->dname_tmp_length] = 0; s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5356,7 +5356,7 @@ _match: break; case 15: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } break; @@ -5374,7 +5374,7 @@ _match: s->dname_tmp_length += s->zone_origin_length; if (s->dname_tmp_length > MAX_DNAME_LENGTH) { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5396,7 +5396,7 @@ _match: break; case 20: { - WARN(ZSCANNER_EBAD_DNAME_CHAR); + WARN(ZS_BAD_DNAME_CHAR); p--; {cs = 246; goto _again;} } break; @@ -5415,7 +5415,7 @@ _match: if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5434,7 +5434,7 @@ _match: case 26: { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); p--; {cs = 246; goto _again;} } } @@ -5442,7 +5442,7 @@ _match: case 27: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {cs = 246; goto _again;} } break; @@ -5467,7 +5467,7 @@ _match: s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5479,7 +5479,7 @@ _match: break; case 32: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } break; @@ -5507,7 +5507,7 @@ _match: s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5528,7 +5528,7 @@ _match: *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5539,7 +5539,7 @@ _match: *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5550,7 +5550,7 @@ _match: *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5560,7 +5560,7 @@ _match: if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5570,14 +5570,14 @@ _match: if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {cs = 246; goto _again;} } } break; case 44: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {cs = 246; goto _again;} } break; @@ -5585,7 +5585,7 @@ _match: { if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5594,7 +5594,7 @@ _match: { if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5603,7 +5603,7 @@ _match: { if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5612,7 +5612,7 @@ _match: { if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5627,7 +5627,7 @@ _match: if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5642,7 +5642,7 @@ _match: if (s->buffer_length < MAX_RDATA_LENGTH) { s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5654,7 +5654,7 @@ _match: if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -5667,7 +5667,7 @@ _match: s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); p--; {cs = 246; goto _again;} } @@ -5675,18 +5675,18 @@ _match: *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); p--; {cs = 246; goto _again;} } } break; case 54: { - WARN(ZSCANNER_EBAD_TIMESTAMP_CHAR); + WARN(ZS_BAD_TIMESTAMP_CHAR); p--; {cs = 246; goto _again;} } break; @@ -5695,20 +5695,20 @@ _match: if (rdata_tail <= rdata_stop) { *(rdata_tail++) = (*p); } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {cs = 246; goto _again;} } } break; case 56: { - WARN(ZSCANNER_EBAD_TEXT_CHAR); + WARN(ZS_BAD_TEXT_CHAR); p--; {cs = 246; goto _again;} } break; case 57: { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {cs = 246; goto _again;} } break; @@ -5718,7 +5718,7 @@ _match: *rdata_tail = 0; s->item_length++; } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5733,7 +5733,7 @@ _match: *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5745,7 +5745,7 @@ _match: break; case 61: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } break; @@ -5757,14 +5757,14 @@ _match: if (s->number64 <= UINT32_MAX) { s->default_ttl = (uint32_t)(s->number64); } else { - ERR(ZSCANNER_ENUMBER32_OVERFLOW); + ERR(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } break; case 64: { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {cs = 246; goto _again;} } break; @@ -5783,7 +5783,7 @@ _match: break; case 68: { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {cs = 246; goto _again;} } break; @@ -5804,7 +5804,7 @@ _match: // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {cs = 246; goto _again;} } @@ -5814,7 +5814,7 @@ _match: break; case 72: { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {cs = 246; goto _again;} } break; @@ -5830,7 +5830,7 @@ _match: break; case 75: { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {cs = 246; goto _again;} } break; @@ -5859,24 +5859,24 @@ _match: } // Create new file loader for included zone file. - file_loader_t *fl = file_loader_create((char*)(s->buffer), - text_origin, - s->default_class, - s->default_ttl, - s->process_record, - s->process_error, - s->data); + zs_loader_t *fl = zs_loader_create((char*)(s->buffer), + text_origin, + s->default_class, + s->default_ttl, + s->process_record, + s->process_error, + s->data); if (fl != NULL) { // Process included zone file. - ret = file_loader_process(fl); - file_loader_free(fl); + ret = zs_loader_process(fl); + zs_loader_free(fl); if (ret != 0) { - ERR(ZSCANNER_EUNPROCESSED_INCLUDE); + ERR(ZS_UNPROCESSED_INCLUDE); p--; {cs = 246; goto _again;} } } else { - ERR(ZSCANNER_EUNOPENED_INCLUDE); + ERR(ZS_UNOPENED_INCLUDE); p--; {cs = 246; goto _again;} } } @@ -5896,7 +5896,7 @@ _match: break; case 80: { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); p--; {cs = 246; goto _again;} } break; @@ -5920,7 +5920,7 @@ _match: if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -5936,14 +5936,14 @@ _match: s->buffer[s->buffer_length++] = (*p); } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } break; case 87: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {cs = 246; goto _again;} } break; @@ -5952,7 +5952,7 @@ _match: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); p--; {cs = 246; goto _again;} } } @@ -5968,7 +5968,7 @@ _match: s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); p--; {cs = 246; goto _again;} } } @@ -6005,7 +6005,7 @@ _match: (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {cs = 246; goto _again;} } } @@ -6030,7 +6030,7 @@ _match: memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {cs = 246; goto _again;} } // Find prefix without trailing zeroes. @@ -6050,7 +6050,7 @@ _match: break; case 98: { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {cs = 246; goto _again;} } break; @@ -6059,7 +6059,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6072,21 +6072,21 @@ _match: break; case 101: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {cs = 246; goto _again;} } break; case 102: { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); p--; {cs = 246; goto _again;} } } break; case 103: { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {cs = 246; goto _again;} } break; @@ -6095,7 +6095,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = first_base64_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6107,7 +6107,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = second_right_base64_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6119,7 +6119,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = third_right_base64_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6131,7 +6131,7 @@ _match: break; case 108: { - WARN(ZSCANNER_EBAD_BASE64_CHAR); + WARN(ZS_BAD_BASE64_CHAR); p--; {cs = 246; goto _again;} } break; @@ -6143,7 +6143,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = first_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6155,7 +6155,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = second_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6172,7 +6172,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = fourth_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6184,7 +6184,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = fifth_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6201,7 +6201,7 @@ _match: if (rdata_tail <= rdata_stop) { *rdata_tail = seventh_right_base32hex_to_num[(uint8_t)(*p)]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6213,7 +6213,7 @@ _match: break; case 118: { - WARN(ZSCANNER_EBAD_BASE32HEX_CHAR); + WARN(ZS_BAD_BASE32HEX_CHAR); p--; {cs = 246; goto _again;} } break; @@ -6354,19 +6354,19 @@ _match: break; case 144: { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {cs = 246; goto _again;} } break; case 145: { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {cs = 246; goto _again;} } break; case 146: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {cs = 246; goto _again;} } break; @@ -6489,7 +6489,7 @@ _match: if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6632,7 +6632,7 @@ _match: (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } } @@ -6641,7 +6641,7 @@ _match: break; case 226: { - WARN(ZSCANNER_EBAD_BITMAP); + WARN(ZS_BAD_BITMAP); p--; {cs = 246; goto _again;} } break; @@ -6653,7 +6653,7 @@ _match: if (s->number64 <= 90) { s->loc.d1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6663,7 +6663,7 @@ _match: if (s->number64 <= 180) { s->loc.d2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6673,7 +6673,7 @@ _match: if (s->number64 <= 59) { s->loc.m1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6683,7 +6683,7 @@ _match: if (s->number64 <= 59) { s->loc.m2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6693,7 +6693,7 @@ _match: if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6703,7 +6703,7 @@ _match: if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6715,7 +6715,7 @@ _match: { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6725,7 +6725,7 @@ _match: if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6735,7 +6735,7 @@ _match: if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6745,7 +6745,7 @@ _match: if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } } @@ -6807,13 +6807,13 @@ _match: break; case 243: { - WARN(ZSCANNER_EBAD_LOC_DATA); + WARN(ZS_BAD_LOC_DATA); p--; {cs = 246; goto _again;} } break; case 244: { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {cs = 246; goto _again;} } break; @@ -6830,7 +6830,7 @@ _match: case 247: { if (s->item_length != 6) { - WARN(ZSCANNER_EBAD_EUI_LENGTH); + WARN(ZS_BAD_EUI_LENGTH); p--; {cs = 246; goto _again;} } } @@ -6838,14 +6838,14 @@ _match: case 248: { if (s->item_length != 8) { - WARN(ZSCANNER_EBAD_EUI_LENGTH); + WARN(ZS_BAD_EUI_LENGTH); p--; {cs = 246; goto _again;} } } break; case 249: { - WARN(ZSCANNER_EBAD_CHAR_DASH); + WARN(ZS_BAD_CHAR_DASH); p--; {cs = 246; goto _again;} } break; @@ -6862,26 +6862,26 @@ _match: case 252: { if (s->item_length != 4) { - WARN(ZSCANNER_EBAD_L64_LENGTH); + WARN(ZS_BAD_L64_LENGTH); p--; {cs = 246; goto _again;} } } break; case 253: { - WARN(ZSCANNER_EBAD_CHAR_COLON); + WARN(ZS_BAD_CHAR_COLON); p--; {cs = 246; goto _again;} } break; case 254: { - WARN(ZSCANNER_EBAD_ALGORITHM); + WARN(ZS_BAD_ALGORITHM); p--; {cs = 246; goto _again;} } break; case 255: { - WARN(ZSCANNER_EBAD_CERT_TYPE); + WARN(ZS_BAD_CERT_TYPE); p--; {cs = 246; goto _again;} } break; @@ -6898,7 +6898,7 @@ _match: break; case 259: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {cs = 246; goto _again;} } break; @@ -6972,7 +6972,7 @@ _match: case KNOT_RRTYPE_EUI64: {stack[top++] = cs; cs = 1053; goto _again;} default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); {cs = 246; goto _again;} } } @@ -7031,7 +7031,7 @@ _match: break; case 263: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {cs = 246; goto _again;} } break; @@ -7152,7 +7152,7 @@ _match: case 302: { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); p--; {cs = 246; goto _again;} } s->r_data_length = rdata_tail - s->r_data; @@ -7177,86 +7177,86 @@ _again: switch ( *__acts++ ) { case 4: { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); p--; {cs = 246; goto _again;} } break; case 15: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } break; case 20: { - WARN(ZSCANNER_EBAD_DNAME_CHAR); + WARN(ZS_BAD_DNAME_CHAR); p--; {cs = 246; goto _again;} } break; case 27: { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); p--; {cs = 246; goto _again;} } break; case 32: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } break; case 44: { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); p--; {cs = 246; goto _again;} } break; case 54: { - WARN(ZSCANNER_EBAD_TIMESTAMP_CHAR); + WARN(ZS_BAD_TIMESTAMP_CHAR); p--; {cs = 246; goto _again;} } break; case 56: { - WARN(ZSCANNER_EBAD_TEXT_CHAR); + WARN(ZS_BAD_TEXT_CHAR); p--; {cs = 246; goto _again;} } break; case 57: { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); p--; {cs = 246; goto _again;} } break; case 61: { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); p--; {cs = 246; goto _again;} } break; case 64: { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); p--; {cs = 246; goto _again;} } break; case 68: { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); p--; {cs = 246; goto _again;} } break; case 72: { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); p--; {cs = 246; goto _again;} } break; case 75: { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); p--; {cs = 246; goto _again;} } break; @@ -7267,115 +7267,115 @@ _again: break; case 80: { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); p--; {cs = 246; goto _again;} } break; case 87: { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); p--; {cs = 246; goto _again;} } break; case 98: { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); p--; {cs = 246; goto _again;} } break; case 101: { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); p--; {cs = 246; goto _again;} } break; case 103: { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {cs = 246; goto _again;} } break; case 108: { - WARN(ZSCANNER_EBAD_BASE64_CHAR); + WARN(ZS_BAD_BASE64_CHAR); p--; {cs = 246; goto _again;} } break; case 118: { - WARN(ZSCANNER_EBAD_BASE32HEX_CHAR); + WARN(ZS_BAD_BASE32HEX_CHAR); p--; {cs = 246; goto _again;} } break; case 144: { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); p--; {cs = 246; goto _again;} } break; case 145: { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); p--; {cs = 246; goto _again;} } break; case 146: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {cs = 246; goto _again;} } break; case 226: { - WARN(ZSCANNER_EBAD_BITMAP); + WARN(ZS_BAD_BITMAP); p--; {cs = 246; goto _again;} } break; case 243: { - WARN(ZSCANNER_EBAD_LOC_DATA); + WARN(ZS_BAD_LOC_DATA); p--; {cs = 246; goto _again;} } break; case 244: { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); p--; {cs = 246; goto _again;} } break; case 249: { - WARN(ZSCANNER_EBAD_CHAR_DASH); + WARN(ZS_BAD_CHAR_DASH); p--; {cs = 246; goto _again;} } break; case 253: { - WARN(ZSCANNER_EBAD_CHAR_COLON); + WARN(ZS_BAD_CHAR_COLON); p--; {cs = 246; goto _again;} } break; case 254: { - WARN(ZSCANNER_EBAD_ALGORITHM); + WARN(ZS_BAD_ALGORITHM); p--; {cs = 246; goto _again;} } break; case 255: { - WARN(ZSCANNER_EBAD_CERT_TYPE); + WARN(ZS_BAD_CERT_TYPE); p--; {cs = 246; goto _again;} } break; case 259: { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); p--; {cs = 246; goto _again;} } break; case 263: { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); p--; {cs = 246; goto _again;} } break; @@ -7389,7 +7389,7 @@ _again: // Check if scanner state machine is in uncovered state. if (cs == zone_scanner_error) { - ERR(ZSCANNER_UNCOVERED_STATE); + ERR(ZS_UNCOVERED_STATE); s->error_counter++; // Fill error context data. @@ -7416,7 +7416,7 @@ _again: // Check unclosed multiline record. if (is_complete && s->multiline) { - ERR(ZSCANNER_UNCLOSED_MULTILINE); + ERR(ZS_UNCLOSED_MULTILINE); s->error_counter++; s->process_error(s); } diff --git a/src/zscanner/scanner.rl b/src/zscanner/scanner.rl index 3cffd8f860..af38167116 100644 --- a/src/zscanner/scanner.rl +++ b/src/zscanner/scanner.rl @@ -202,7 +202,7 @@ int zs_scanner_process(const char *start, // Check if scanner state machine is in uncovered state. if (cs == zone_scanner_error) { - ERR(ZSCANNER_UNCOVERED_STATE); + ERR(ZS_UNCOVERED_STATE); s->error_counter++; // Fill error context data. @@ -229,7 +229,7 @@ int zs_scanner_process(const char *start, // Check unclosed multiline record. if (is_complete && s->multiline) { - ERR(ZSCANNER_UNCLOSED_MULTILINE); + ERR(ZS_UNCLOSED_MULTILINE); s->error_counter++; s->process_error(s); } diff --git a/src/zscanner/scanner_body.rl b/src/zscanner/scanner_body.rl index 9eb488f46c..34d44b0d5d 100644 --- a/src/zscanner/scanner_body.rl +++ b/src/zscanner/scanner_body.rl @@ -28,21 +28,21 @@ action _check_multiline_begin { if (s->multiline == true) { - ERR(ZSCANNER_ELEFT_PARENTHESIS); + ERR(ZS_LEFT_PARENTHESIS); fhold; fgoto err_line; } s->multiline = true; } action _check_multiline_end { if (s->multiline == false) { - ERR(ZSCANNER_ERIGHT_PARENTHESIS); + ERR(ZS_RIGHT_PARENTHESIS); fhold; fgoto err_line; } s->multiline = false; } action _rest_error { - WARN(ZSCANNER_EBAD_REST); + WARN(ZS_BAD_REST); fhold; fgoto err_line; } @@ -69,7 +69,7 @@ } action _err_line { if (fc == '\r') { - ERR(ZSCANNER_DOS_NEWLINE); + ERR(ZS_DOS_NEWLINE); } if (s->buffer_length < sizeof(s->buffer) - 1) { @@ -90,7 +90,7 @@ s->process_error(s); // Reset. - s->error_code = ZSCANNER_OK; + s->error_code = ZS_OK; s->multiline = false; // In case of serious error, stop scanner. @@ -114,7 +114,7 @@ (s->dname)[s->dname_tmp_length++] = fc; s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); fhold; fgoto err_line; } } @@ -123,7 +123,7 @@ (s->dname)[s->item_length_position] = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); fhold; fgoto err_line; } } @@ -133,7 +133,7 @@ (s->dname)[s->dname_tmp_length] = 0; s->item_length++; } else { - WARN(ZSCANNER_ELABEL_OVERFLOW); + WARN(ZS_LABEL_OVERFLOW); fhold; fgoto err_line; } } @@ -145,7 +145,7 @@ s->dname_tmp_length++; } action _label_dec_error { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } @@ -174,7 +174,7 @@ s->dname_tmp_length += s->zone_origin_length; if (s->dname_tmp_length > MAX_DNAME_LENGTH) { - WARN(ZSCANNER_EDNAME_OVERFLOW); + WARN(ZS_DNAME_OVERFLOW); fhold; fgoto err_line; } } @@ -191,7 +191,7 @@ s->dname_tmp_length = 0; } action _dname_error { - WARN(ZSCANNER_EBAD_DNAME_CHAR); + WARN(ZS_BAD_DNAME_CHAR); fhold; fgoto err_line; } @@ -215,7 +215,7 @@ if (s->item_length <= MAX_ITEM_LENGTH) { *(s->item_length_location) = (uint8_t)(s->item_length); } else { - WARN(ZSCANNER_EITEM_OVERFLOW); + WARN(ZS_ITEM_OVERFLOW); fhold; fgoto err_line; } } @@ -231,13 +231,13 @@ } action _r_owner_empty_exit { if (s->r_owner_length == 0) { - WARN(ZSCANNER_EBAD_PREVIOUS_OWNER); + WARN(ZS_BAD_PREVIOUS_OWNER); fhold; fgoto err_line; } } action _r_owner_error { s->r_owner_length = 0; - WARN(ZSCANNER_EBAD_OWNER); + WARN(ZS_BAD_OWNER); fhold; fgoto err_line; } @@ -268,7 +268,7 @@ s->number64 *= 10; s->number64 += digit_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ENUMBER64_OVERFLOW); + WARN(ZS_NUMBER64_OVERFLOW); fhold; fgoto err_line; } } @@ -279,7 +279,7 @@ s->number64 = 0; } action _number_error { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } @@ -304,7 +304,7 @@ s->number64 *= pow(10, s->decimals - s->decimal_counter); s->number64 += s->number64_tmp * pow(10, s->decimals); } else { - WARN(ZSCANNER_EFLOAT_OVERFLOW); + WARN(ZS_FLOAT_OVERFLOW); fhold; fgoto err_line; } } @@ -330,7 +330,7 @@ *rdata_tail = (uint8_t)(s->number64); rdata_tail += 1; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); fhold; fgoto err_line; } } @@ -339,7 +339,7 @@ *((uint16_t *)rdata_tail) = htons((uint16_t)(s->number64)); rdata_tail += 2; } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); fhold; fgoto err_line; } } @@ -348,7 +348,7 @@ *((uint32_t *)rdata_tail) = htonl((uint32_t)(s->number64)); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } @@ -357,7 +357,7 @@ if (s->number64 <= UINT16_MAX) { s->r_type = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); fhold; fgoto err_line; } } @@ -366,7 +366,7 @@ if (s->number64 <= UINT16_MAX) { s->r_data_length = (uint16_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); fhold; fgoto err_line; } } @@ -380,7 +380,7 @@ # BEGIN - Time processing action _time_unit_error { - WARN(ZSCANNER_EBAD_TIME_UNIT); + WARN(ZS_BAD_TIME_UNIT); fhold; fgoto err_line; } @@ -389,28 +389,28 @@ | 'm'i ${ if (s->number64 <= (UINT32_MAX / 60)) { s->number64 *= 60; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } | 'h'i ${ if (s->number64 <= (UINT32_MAX / 3600)) { s->number64 *= 3600; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } | 'd'i ${ if (s->number64 <= (UINT32_MAX / 86400)) { s->number64 *= 86400; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } | 'w'i ${ if (s->number64 <= (UINT32_MAX / 604800)) { s->number64 *= 604800; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } @@ -424,7 +424,7 @@ if (s->number64 + s->number64_tmp < UINT32_MAX) { s->number64 += s->number64_tmp; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } @@ -445,7 +445,7 @@ if (s->buffer_length < MAX_RDATA_LENGTH) { s->buffer[s->buffer_length++] = fc; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -455,7 +455,7 @@ if (s->buffer_length == 14) { // Date; 14 = len("YYYYMMDDHHmmSS"). ret = date_to_timestamp(s->buffer, ×tamp); - if (ret == ZSCANNER_OK) { + if (ret == ZS_OK) { *((uint32_t *)rdata_tail) = htonl(timestamp); rdata_tail += 4; } else { @@ -468,7 +468,7 @@ s->number64 = strtoull((char *)(s->buffer), &end, 10); if (end == (char *)(s->buffer) || *end != '\0') { - WARN(ZSCANNER_EBAD_TIMESTAMP); + WARN(ZS_BAD_TIMESTAMP); fhold; fgoto err_line; } @@ -476,16 +476,16 @@ *((uint32_t *)rdata_tail) = htonl((uint32_t)s->number64); rdata_tail += 4; } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } else { - WARN(ZSCANNER_EBAD_TIMESTAMP_LENGTH); + WARN(ZS_BAD_TIMESTAMP_LENGTH); fhold; fgoto err_line; } } action _timestamp_error { - WARN(ZSCANNER_EBAD_TIMESTAMP_CHAR); + WARN(ZS_BAD_TIMESTAMP_CHAR); fhold; fgoto err_line; } @@ -498,16 +498,16 @@ if (rdata_tail <= rdata_stop) { *(rdata_tail++) = fc; } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); fhold; fgoto err_line; } } action _text_char_error { - WARN(ZSCANNER_EBAD_TEXT_CHAR); + WARN(ZS_BAD_TEXT_CHAR); fhold; fgoto err_line; } action _text_error { - WARN(ZSCANNER_EBAD_TEXT); + WARN(ZS_BAD_TEXT); fhold; fgoto err_line; } @@ -516,7 +516,7 @@ *rdata_tail = 0; s->item_length++; } else { - WARN(ZSCANNER_ETEXT_OVERFLOW); + WARN(ZS_TEXT_OVERFLOW); fhold; fgoto err_line; } } @@ -529,7 +529,7 @@ *rdata_tail *= 10; *rdata_tail += digit_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ENUMBER8_OVERFLOW); + WARN(ZS_NUMBER8_OVERFLOW); fhold; fgoto err_line; } } @@ -537,7 +537,7 @@ rdata_tail++; } action _text_dec_error { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } @@ -572,12 +572,12 @@ if (s->number64 <= UINT32_MAX) { s->default_ttl = (uint32_t)(s->number64); } else { - ERR(ZSCANNER_ENUMBER32_OVERFLOW); + ERR(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } action _default_ttl_error { - ERR(ZSCANNER_EBAD_TTL); + ERR(ZS_BAD_TTL); fhold; fgoto err_line; } @@ -594,7 +594,7 @@ s->zone_origin_length = s->dname_tmp_length; } action _zone_origin_error { - ERR(ZSCANNER_EBAD_ORIGIN); + ERR(ZS_BAD_ORIGIN); fhold; fgoto err_line; } @@ -615,7 +615,7 @@ // Check for correct string copy. if (strlen(s->include_filename) != (size_t)(rdata_tail - s->r_data)) { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); fhold; fgoto err_line; } @@ -623,7 +623,7 @@ s->dname = NULL; } action _incl_filename_error { - ERR(ZSCANNER_EBAD_INCLUDE_FILENAME); + ERR(ZS_BAD_INCLUDE_FILENAME); fhold; fgoto err_line; } @@ -634,7 +634,7 @@ s->r_data_length = s->dname_tmp_length; } action _incl_origin_error { - ERR(ZSCANNER_EBAD_INCLUDE_ORIGIN); + ERR(ZS_BAD_INCLUDE_ORIGIN); fhold; fgoto err_line; } @@ -675,11 +675,11 @@ zs_loader_free(fl); if (ret != 0) { - ERR(ZSCANNER_EUNPROCESSED_INCLUDE); + ERR(ZS_UNPROCESSED_INCLUDE); fhold; fgoto err_line; } } else { - ERR(ZSCANNER_EUNOPENED_INCLUDE); + ERR(ZS_UNOPENED_INCLUDE); fhold; fgoto err_line; } } @@ -705,7 +705,7 @@ s->stop = false; } action _directive_error { - ERR(ZSCANNER_EBAD_DIRECTIVE); + ERR(ZS_BAD_DIRECTIVE); fhold; fgoto err_line; } @@ -732,7 +732,7 @@ if (s->number64 <= UINT32_MAX) { s->r_ttl = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_ENUMBER32_OVERFLOW); + WARN(ZS_NUMBER32_OVERFLOW); fhold; fgoto err_line; } } @@ -751,12 +751,12 @@ s->buffer[s->buffer_length++] = fc; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } action _addr_error { - WARN(ZSCANNER_EBAD_ADDRESS_CHAR); + WARN(ZS_BAD_ADDRESS_CHAR); fhold; fgoto err_line; } @@ -764,7 +764,7 @@ s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET, (char *)s->buffer, &addr4) <= 0) { - WARN(ZSCANNER_EBAD_IPV4); + WARN(ZS_BAD_IPV4); fhold; fgoto err_line; } } @@ -777,7 +777,7 @@ s->buffer[s->buffer_length] = 0; if (inet_pton(AF_INET6, (char *)s->buffer, &addr6) <= 0) { - WARN(ZSCANNER_EBAD_IPV6); + WARN(ZS_BAD_IPV6); fhold; fgoto err_line; } } @@ -815,7 +815,7 @@ (s->apl.addr_family == 2 && s->number64 <= 128)) { s->apl.prefix_length = (uint8_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); fhold; fgoto err_line; } } @@ -838,7 +838,7 @@ memcpy(s->buffer, &(addr6.s6_addr), len); break; default: - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); fhold; fgoto err_line; } // Find prefix without trailing zeroes. @@ -856,7 +856,7 @@ rdata_tail += len; } action _apl_error { - WARN(ZSCANNER_EBAD_APL); + WARN(ZS_BAD_APL); fhold; fgoto err_line; } @@ -877,7 +877,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = first_hex_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -886,7 +886,7 @@ rdata_tail++; } action _hex_char_error { - WARN(ZSCANNER_EBAD_HEX_CHAR); + WARN(ZS_BAD_HEX_CHAR); fhold; fgoto err_line; } @@ -901,13 +901,13 @@ action _type_data_exit { if ((rdata_tail - s->r_data) != s->r_data_length) { - WARN(ZSCANNER_EBAD_RDATA_LENGTH); + WARN(ZS_BAD_RDATA_LENGTH); fhold; fgoto err_line; } } action _type_data_error { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); fhold; fgoto err_line; } @@ -920,7 +920,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = first_base64_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -930,7 +930,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = second_right_base64_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -940,7 +940,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = third_right_base64_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -949,7 +949,7 @@ } action _base64_char_error { - WARN(ZSCANNER_EBAD_BASE64_CHAR); + WARN(ZS_BAD_BASE64_CHAR); fhold; fgoto err_line; } @@ -978,7 +978,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = first_base32hex_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -988,7 +988,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = second_right_base32hex_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -1001,7 +1001,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = fourth_right_base32hex_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -1011,7 +1011,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = fifth_right_base32hex_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -1024,7 +1024,7 @@ if (rdata_tail <= rdata_stop) { *rdata_tail = seventh_right_base32hex_to_num[(uint8_t)fc]; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } @@ -1033,7 +1033,7 @@ } action _base32hex_char_error { - WARN(ZSCANNER_EBAD_BASE32HEX_CHAR); + WARN(ZS_BAD_BASE32HEX_CHAR); fhold; fgoto err_line; } @@ -1157,11 +1157,11 @@ # BEGIN - Gateway action _gateway_error { - WARN(ZSCANNER_EBAD_GATEWAY); + WARN(ZS_BAD_GATEWAY); fhold; fgoto err_line; } action _gateway_key_error { - WARN(ZSCANNER_EBAD_GATEWAY_KEY); + WARN(ZS_BAD_GATEWAY_KEY); fhold; fgoto err_line; } @@ -1179,7 +1179,7 @@ # BEGIN - Type processing action _type_error { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); fhold; fgoto err_line; } @@ -1231,7 +1231,7 @@ if (s->number64 <= UINT16_MAX) { window_add_bit(s->number64, s); } else { - WARN(ZSCANNER_ENUMBER16_OVERFLOW); + WARN(ZS_NUMBER16_OVERFLOW); fhold; fgoto err_line; } } @@ -1302,14 +1302,14 @@ (s->windows[window]).length); rdata_tail += (s->windows[window]).length; } else { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } } } } action _bitmap_error { - WARN(ZSCANNER_EBAD_BITMAP); + WARN(ZS_BAD_BITMAP); fhold; fgoto err_line; } @@ -1324,7 +1324,7 @@ if (s->number64 <= 90) { s->loc.d1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1332,7 +1332,7 @@ if (s->number64 <= 180) { s->loc.d2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1340,7 +1340,7 @@ if (s->number64 <= 59) { s->loc.m1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1348,7 +1348,7 @@ if (s->number64 <= 59) { s->loc.m2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1356,7 +1356,7 @@ if (s->number64 <= 59999) { s->loc.s1 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1364,7 +1364,7 @@ if (s->number64 <= 59999) { s->loc.s2 = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1374,7 +1374,7 @@ { s->loc.alt = (uint32_t)(s->number64); } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1382,7 +1382,7 @@ if (s->number64 <= 9000000000ULL) { s->loc.siz = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1390,7 +1390,7 @@ if (s->number64 <= 9000000000ULL) { s->loc.hp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1398,7 +1398,7 @@ if (s->number64 <= 9000000000ULL) { s->loc.vp = s->number64; } else { - WARN(ZSCANNER_EBAD_NUMBER); + WARN(ZS_BAD_NUMBER); fhold; fgoto err_line; } } @@ -1462,7 +1462,7 @@ rdata_tail += 4; } action _loc_error { - WARN(ZSCANNER_EBAD_LOC_DATA); + WARN(ZS_BAD_LOC_DATA); fhold; fgoto err_line; } @@ -1475,7 +1475,7 @@ # BEGIN - Hexadecimal rdata processing action _hex_r_data_error { - WARN(ZSCANNER_EBAD_HEX_RDATA); + WARN(ZS_BAD_HEX_RDATA); fhold; fgoto err_line; } @@ -1500,18 +1500,18 @@ } action _eui48_exit { if (s->item_length != 6) { - WARN(ZSCANNER_EBAD_EUI_LENGTH); + WARN(ZS_BAD_EUI_LENGTH); fhold; fgoto err_line; } } action _eui64_exit { if (s->item_length != 8) { - WARN(ZSCANNER_EBAD_EUI_LENGTH); + WARN(ZS_BAD_EUI_LENGTH); fhold; fgoto err_line; } } action _eui_sep_error { - WARN(ZSCANNER_EBAD_CHAR_DASH); + WARN(ZS_BAD_CHAR_DASH); fhold; fgoto err_line; } @@ -1533,12 +1533,12 @@ } action _l64_exit { if (s->item_length != 4) { - WARN(ZSCANNER_EBAD_L64_LENGTH); + WARN(ZS_BAD_L64_LENGTH); fhold; fgoto err_line; } } action _l64_sep_error { - WARN(ZSCANNER_EBAD_CHAR_COLON); + WARN(ZS_BAD_CHAR_COLON); fhold; fgoto err_line; } @@ -1551,11 +1551,11 @@ # BEGIN - Mnemomic names processing action _dns_alg_error { - WARN(ZSCANNER_EBAD_ALGORITHM); + WARN(ZS_BAD_ALGORITHM); fhold; fgoto err_line; } action _cert_type_error { - WARN(ZSCANNER_EBAD_CERT_TYPE); + WARN(ZS_BAD_CERT_TYPE); fhold; fgoto err_line; } @@ -1599,7 +1599,7 @@ rdata_tail = s->r_data; } action _r_data_error { - WARN(ZSCANNER_EBAD_RDATA); + WARN(ZS_BAD_RDATA); fhold; fgoto err_line; } @@ -1785,7 +1785,7 @@ case KNOT_RRTYPE_EUI64: fcall r_data_eui64; default: - WARN(ZSCANNER_ECANNOT_TEXT_DATA); + WARN(ZS_CANNOT_TEXT_DATA); fgoto err_line; } } @@ -1848,7 +1848,7 @@ # BEGIN - Record type processing action _r_type_error { - WARN(ZSCANNER_EUNSUPPORTED_TYPE); + WARN(ZS_UNSUPPORTED_TYPE); fhold; fgoto err_line; } @@ -1898,7 +1898,7 @@ # BEGIN - The highest level processing action _record_exit { if (rdata_tail - s->r_data > UINT16_MAX) { - WARN(ZSCANNER_ERDATA_OVERFLOW); + WARN(ZS_RDATA_OVERFLOW); fhold; fgoto err_line; } s->r_data_length = rdata_tail - s->r_data; diff --git a/src/zscanner/tests/data/00-0_general.out b/src/zscanner/tests/data/00-0_general.out index c9c6a43e44..9acf1cbf23 100644 --- a/src/zscanner/tests/data/00-0_general.out +++ b/src/zscanner/tests/data/00-0_general.out @@ -64,5 +64,5 @@ RRTTL=00000001 RTYPE=0002 RDATA=00 ------ -ERROR=ZSCANNER_ELEFT_PARENTHESIS +ERROR=ZS_LEFT_PARENTHESIS ------ diff --git a/src/zscanner/tests/data/00-1_general.out b/src/zscanner/tests/data/00-1_general.out index 81d503c903..85b0653c35 100644 --- a/src/zscanner/tests/data/00-1_general.out +++ b/src/zscanner/tests/data/00-1_general.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_UNCLOSED_MULTILINE +ERROR=ZS_UNCLOSED_MULTILINE ------ diff --git a/src/zscanner/tests/data/01_owner.out b/src/zscanner/tests/data/01_owner.out index d68d468550..63ca633e79 100644 --- a/src/zscanner/tests/data/01_owner.out +++ b/src/zscanner/tests/data/01_owner.out @@ -100,25 +100,25 @@ RRTTL=00000001 RTYPE=0002 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_OWNER +WARNG=ZS_BAD_OWNER ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_PREVIOUS_OWNER +WARNG=ZS_BAD_PREVIOUS_OWNER ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_ELABEL_OVERFLOW +WARNG=ZS_LABEL_OVERFLOW ------ -WARNG=ZSCANNER_EDNAME_OVERFLOW +WARNG=ZS_DNAME_OVERFLOW ------ -WARNG=ZSCANNER_EDNAME_OVERFLOW +WARNG=ZS_DNAME_OVERFLOW ------ diff --git a/src/zscanner/tests/data/02_class.out b/src/zscanner/tests/data/02_class.out index 6002cc3f45..69daae31df 100644 --- a/src/zscanner/tests/data/02_class.out +++ b/src/zscanner/tests/data/02_class.out @@ -10,7 +10,7 @@ RRTTL=00000001 RTYPE=0002 RDATA=00 ------ -WARNG=ZSCANNER_EUNSUPPORTED_TYPE +WARNG=ZS_UNSUPPORTED_TYPE ------ -WARNG=ZSCANNER_EUNSUPPORTED_TYPE +WARNG=ZS_UNSUPPORTED_TYPE ------ diff --git a/src/zscanner/tests/data/03_rrttl.out b/src/zscanner/tests/data/03_rrttl.out index bdc0b6e357..f5cc907679 100644 --- a/src/zscanner/tests/data/03_rrttl.out +++ b/src/zscanner/tests/data/03_rrttl.out @@ -88,13 +88,13 @@ RRTTL=00000079 RTYPE=0002 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_TIME_UNIT +WARNG=ZS_BAD_TIME_UNIT ------ diff --git a/src/zscanner/tests/data/04-0_ORIGIN.out b/src/zscanner/tests/data/04-0_ORIGIN.out index e2135d377c..92dc459fe9 100644 --- a/src/zscanner/tests/data/04-0_ORIGIN.out +++ b/src/zscanner/tests/data/04-0_ORIGIN.out @@ -82,5 +82,5 @@ RRTTL=00000001 RTYPE=0002 RDATA=00 ------ -ERROR=ZSCANNER_EBAD_ORIGIN +ERROR=ZS_BAD_ORIGIN ------ diff --git a/src/zscanner/tests/data/04-1_ORIGIN.out b/src/zscanner/tests/data/04-1_ORIGIN.out index 43d27c37a7..467de10a85 100644 --- a/src/zscanner/tests/data/04-1_ORIGIN.out +++ b/src/zscanner/tests/data/04-1_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_ORIGIN +ERROR=ZS_BAD_ORIGIN ------ diff --git a/src/zscanner/tests/data/04-2_ORIGIN.out b/src/zscanner/tests/data/04-2_ORIGIN.out index 43d27c37a7..467de10a85 100644 --- a/src/zscanner/tests/data/04-2_ORIGIN.out +++ b/src/zscanner/tests/data/04-2_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_ORIGIN +ERROR=ZS_BAD_ORIGIN ------ diff --git a/src/zscanner/tests/data/04-3_ORIGIN.out b/src/zscanner/tests/data/04-3_ORIGIN.out index 16950a81d6..b7d67e5101 100644 --- a/src/zscanner/tests/data/04-3_ORIGIN.out +++ b/src/zscanner/tests/data/04-3_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_REST +ERROR=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/04-4_ORIGIN.out b/src/zscanner/tests/data/04-4_ORIGIN.out index f30b92943b..03a073855b 100644 --- a/src/zscanner/tests/data/04-4_ORIGIN.out +++ b/src/zscanner/tests/data/04-4_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_NUMBER +ERROR=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/04-5_ORIGIN.out b/src/zscanner/tests/data/04-5_ORIGIN.out index f30b92943b..03a073855b 100644 --- a/src/zscanner/tests/data/04-5_ORIGIN.out +++ b/src/zscanner/tests/data/04-5_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_NUMBER +ERROR=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/04-6_ORIGIN.out b/src/zscanner/tests/data/04-6_ORIGIN.out index 16950a81d6..b7d67e5101 100644 --- a/src/zscanner/tests/data/04-6_ORIGIN.out +++ b/src/zscanner/tests/data/04-6_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_REST +ERROR=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/04-7_ORIGIN.out b/src/zscanner/tests/data/04-7_ORIGIN.out index 16950a81d6..b7d67e5101 100644 --- a/src/zscanner/tests/data/04-7_ORIGIN.out +++ b/src/zscanner/tests/data/04-7_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_REST +ERROR=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/04-8_ORIGIN.out b/src/zscanner/tests/data/04-8_ORIGIN.out index ee4139a93e..788a4958a1 100644 --- a/src/zscanner/tests/data/04-8_ORIGIN.out +++ b/src/zscanner/tests/data/04-8_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_ELABEL_OVERFLOW +ERROR=ZS_LABEL_OVERFLOW ------ diff --git a/src/zscanner/tests/data/04-9_ORIGIN.out b/src/zscanner/tests/data/04-9_ORIGIN.out index 2ed0a4c1ad..eef0ab560b 100644 --- a/src/zscanner/tests/data/04-9_ORIGIN.out +++ b/src/zscanner/tests/data/04-9_ORIGIN.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EDNAME_OVERFLOW +ERROR=ZS_DNAME_OVERFLOW ------ diff --git a/src/zscanner/tests/data/05-0_TTL.out b/src/zscanner/tests/data/05-0_TTL.out index 5e87bb0391..93c765161f 100644 --- a/src/zscanner/tests/data/05-0_TTL.out +++ b/src/zscanner/tests/data/05-0_TTL.out @@ -88,5 +88,5 @@ RRTTL=00000079 RTYPE=0002 RDATA=00 ------ -ERROR=ZSCANNER_EBAD_NUMBER +ERROR=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/05-1_TTL.out b/src/zscanner/tests/data/05-1_TTL.out index bbdc638fcd..18492671de 100644 --- a/src/zscanner/tests/data/05-1_TTL.out +++ b/src/zscanner/tests/data/05-1_TTL.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_ENUMBER32_OVERFLOW +ERROR=ZS_NUMBER32_OVERFLOW ------ diff --git a/src/zscanner/tests/data/05-2_TTL.out b/src/zscanner/tests/data/05-2_TTL.out index bbdc638fcd..18492671de 100644 --- a/src/zscanner/tests/data/05-2_TTL.out +++ b/src/zscanner/tests/data/05-2_TTL.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_ENUMBER32_OVERFLOW +ERROR=ZS_NUMBER32_OVERFLOW ------ diff --git a/src/zscanner/tests/data/05-3_TTL.out b/src/zscanner/tests/data/05-3_TTL.out index bbdc638fcd..18492671de 100644 --- a/src/zscanner/tests/data/05-3_TTL.out +++ b/src/zscanner/tests/data/05-3_TTL.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_ENUMBER32_OVERFLOW +ERROR=ZS_NUMBER32_OVERFLOW ------ diff --git a/src/zscanner/tests/data/05-4_TTL.out b/src/zscanner/tests/data/05-4_TTL.out index d0a0c651b0..d4bef98953 100644 --- a/src/zscanner/tests/data/05-4_TTL.out +++ b/src/zscanner/tests/data/05-4_TTL.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_TIME_UNIT +ERROR=ZS_BAD_TIME_UNIT ------ diff --git a/src/zscanner/tests/data/06-1_INCLUDE.out b/src/zscanner/tests/data/06-1_INCLUDE.out index 25883e7fdb..663492132a 100644 --- a/src/zscanner/tests/data/06-1_INCLUDE.out +++ b/src/zscanner/tests/data/06-1_INCLUDE.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_INCLUDE_ORIGIN +ERROR=ZS_BAD_INCLUDE_ORIGIN ------ diff --git a/src/zscanner/tests/data/06-2_INCLUDE.out b/src/zscanner/tests/data/06-2_INCLUDE.out index 25883e7fdb..663492132a 100644 --- a/src/zscanner/tests/data/06-2_INCLUDE.out +++ b/src/zscanner/tests/data/06-2_INCLUDE.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EBAD_INCLUDE_ORIGIN +ERROR=ZS_BAD_INCLUDE_ORIGIN ------ diff --git a/src/zscanner/tests/data/06-3_INCLUDE.out b/src/zscanner/tests/data/06-3_INCLUDE.out index 6a45d67c1e..965597d62c 100644 --- a/src/zscanner/tests/data/06-3_INCLUDE.out +++ b/src/zscanner/tests/data/06-3_INCLUDE.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EUNPROCESSED_INCLUDE +ERROR=ZS_UNPROCESSED_INCLUDE ------ diff --git a/src/zscanner/tests/data/06-4_INCLUDE.out b/src/zscanner/tests/data/06-4_INCLUDE.out index 2d4fff27e5..5fec4afbdd 100644 --- a/src/zscanner/tests/data/06-4_INCLUDE.out +++ b/src/zscanner/tests/data/06-4_INCLUDE.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EUNOPENED_INCLUDE +ERROR=ZS_UNOPENED_INCLUDE ------ diff --git a/src/zscanner/tests/data/06-5_INCLUDE.out b/src/zscanner/tests/data/06-5_INCLUDE.out index 6a45d67c1e..965597d62c 100644 --- a/src/zscanner/tests/data/06-5_INCLUDE.out +++ b/src/zscanner/tests/data/06-5_INCLUDE.out @@ -1,2 +1,2 @@ -ERROR=ZSCANNER_EUNPROCESSED_INCLUDE +ERROR=ZS_UNPROCESSED_INCLUDE ------ diff --git a/src/zscanner/tests/data/06-6_INCLUDE.out b/src/zscanner/tests/data/06-6_INCLUDE.out index 80f23edb15..a9c0259b47 100644 --- a/src/zscanner/tests/data/06-6_INCLUDE.out +++ b/src/zscanner/tests/data/06-6_INCLUDE.out @@ -1,4 +1,4 @@ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -ERROR=ZSCANNER_EUNPROCESSED_INCLUDE +ERROR=ZS_UNPROCESSED_INCLUDE ------ diff --git a/src/zscanner/tests/data/06-7_INCLUDE.out b/src/zscanner/tests/data/06-7_INCLUDE.out index c94b02fb94..cbbb0c188c 100644 --- a/src/zscanner/tests/data/06-7_INCLUDE.out +++ b/src/zscanner/tests/data/06-7_INCLUDE.out @@ -1,4 +1,4 @@ -ERROR=ZSCANNER_EBAD_NUMBER +ERROR=ZS_BAD_NUMBER ------ -ERROR=ZSCANNER_EUNPROCESSED_INCLUDE +ERROR=ZS_UNPROCESSED_INCLUDE ------ diff --git a/src/zscanner/tests/data/10_A.out b/src/zscanner/tests/data/10_A.out index b4dee87a24..dda68abbd1 100644 --- a/src/zscanner/tests/data/10_A.out +++ b/src/zscanner/tests/data/10_A.out @@ -34,17 +34,17 @@ RRTTL=00000001 RTYPE=0001 RDATA=00000000 ------ -WARNG=ZSCANNER_EBAD_ADDRESS_CHAR +WARNG=ZS_BAD_ADDRESS_CHAR ------ -WARNG=ZSCANNER_EBAD_ADDRESS_CHAR +WARNG=ZS_BAD_ADDRESS_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_IPV4 +WARNG=ZS_BAD_IPV4 ------ -WARNG=ZSCANNER_EBAD_IPV4 +WARNG=ZS_BAD_IPV4 ------ -WARNG=ZSCANNER_EBAD_ADDRESS_CHAR +WARNG=ZS_BAD_ADDRESS_CHAR ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/11_AAAA.out b/src/zscanner/tests/data/11_AAAA.out index 0003ddbdef..0cb174a497 100644 --- a/src/zscanner/tests/data/11_AAAA.out +++ b/src/zscanner/tests/data/11_AAAA.out @@ -46,17 +46,17 @@ RRTTL=00000001 RTYPE=001C RDATA=00000000000000000000000000000000 ------ -WARNG=ZSCANNER_EBAD_ADDRESS_CHAR +WARNG=ZS_BAD_ADDRESS_CHAR ------ -WARNG=ZSCANNER_EBAD_ADDRESS_CHAR +WARNG=ZS_BAD_ADDRESS_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_IPV6 +WARNG=ZS_BAD_IPV6 ------ -WARNG=ZSCANNER_EBAD_IPV6 +WARNG=ZS_BAD_IPV6 ------ -WARNG=ZSCANNER_EBAD_ADDRESS_CHAR +WARNG=ZS_BAD_ADDRESS_CHAR ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/12_TXT.out b/src/zscanner/tests/data/12_TXT.out index 3110fa7e6f..bbe44d25a1 100644 --- a/src/zscanner/tests/data/12_TXT.out +++ b/src/zscanner/tests/data/12_TXT.out @@ -112,17 +112,17 @@ RRTTL=00000001 RTYPE=0010 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_TEXT +WARNG=ZS_BAD_TEXT ------ -WARNG=ZSCANNER_EITEM_OVERFLOW +WARNG=ZS_ITEM_OVERFLOW ------ diff --git a/src/zscanner/tests/data/13_SPF.out b/src/zscanner/tests/data/13_SPF.out index 273e92e834..be7fb35827 100644 --- a/src/zscanner/tests/data/13_SPF.out +++ b/src/zscanner/tests/data/13_SPF.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0063 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/14_NS.out b/src/zscanner/tests/data/14_NS.out index f73f34371f..9ef0c732d7 100644 --- a/src/zscanner/tests/data/14_NS.out +++ b/src/zscanner/tests/data/14_NS.out @@ -112,29 +112,29 @@ RRTTL=00000001 RTYPE=0002 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_ELABEL_OVERFLOW +WARNG=ZS_LABEL_OVERFLOW ------ -WARNG=ZSCANNER_EDNAME_OVERFLOW +WARNG=ZS_DNAME_OVERFLOW ------ -WARNG=ZSCANNER_EDNAME_OVERFLOW +WARNG=ZS_DNAME_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/15_CNAME.out b/src/zscanner/tests/data/15_CNAME.out index a5411265c7..3c3a55dc00 100644 --- a/src/zscanner/tests/data/15_CNAME.out +++ b/src/zscanner/tests/data/15_CNAME.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0005 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/16_PTR.out b/src/zscanner/tests/data/16_PTR.out index d983296202..55d94b9abc 100644 --- a/src/zscanner/tests/data/16_PTR.out +++ b/src/zscanner/tests/data/16_PTR.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=000C RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/17_DNAME.out b/src/zscanner/tests/data/17_DNAME.out index ee67972485..35f11d88a8 100644 --- a/src/zscanner/tests/data/17_DNAME.out +++ b/src/zscanner/tests/data/17_DNAME.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0027 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/18_MX.out b/src/zscanner/tests/data/18_MX.out index 0cae318089..0a5003852d 100644 --- a/src/zscanner/tests/data/18_MX.out +++ b/src/zscanner/tests/data/18_MX.out @@ -46,17 +46,17 @@ RRTTL=00000001 RTYPE=000F RDATA=000100 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/19_AFSDB.out b/src/zscanner/tests/data/19_AFSDB.out index a6dcd0d780..b5c77eb877 100644 --- a/src/zscanner/tests/data/19_AFSDB.out +++ b/src/zscanner/tests/data/19_AFSDB.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0012 RDATA=000100 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/20_RT.out b/src/zscanner/tests/data/20_RT.out index d3f8cb0dc0..8be89a3e4d 100644 --- a/src/zscanner/tests/data/20_RT.out +++ b/src/zscanner/tests/data/20_RT.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0015 RDATA=000100 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/21_KX.out b/src/zscanner/tests/data/21_KX.out index 8ccd2e4638..1bc91e6951 100644 --- a/src/zscanner/tests/data/21_KX.out +++ b/src/zscanner/tests/data/21_KX.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0024 RDATA=000100 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/22_HINFO.out b/src/zscanner/tests/data/22_HINFO.out index 8cb034d32a..fa66729632 100644 --- a/src/zscanner/tests/data/22_HINFO.out +++ b/src/zscanner/tests/data/22_HINFO.out @@ -70,19 +70,19 @@ RRTTL=00000001 RTYPE=000D RDATA=0000 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_TEXT +WARNG=ZS_BAD_TEXT ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ -WARNG=ZSCANNER_EITEM_OVERFLOW +WARNG=ZS_ITEM_OVERFLOW ------ diff --git a/src/zscanner/tests/data/23_MINFO.out b/src/zscanner/tests/data/23_MINFO.out index b0ff2dff4e..8154c0c253 100644 --- a/src/zscanner/tests/data/23_MINFO.out +++ b/src/zscanner/tests/data/23_MINFO.out @@ -40,9 +40,9 @@ RRTTL=00000001 RTYPE=000E RDATA=0000 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ diff --git a/src/zscanner/tests/data/24_RP.out b/src/zscanner/tests/data/24_RP.out index 7f1d08c681..d13b1ba821 100644 --- a/src/zscanner/tests/data/24_RP.out +++ b/src/zscanner/tests/data/24_RP.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0011 RDATA=0000 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/25_SOA.out b/src/zscanner/tests/data/25_SOA.out index 9bdd69d683..f65844217b 100644 --- a/src/zscanner/tests/data/25_SOA.out +++ b/src/zscanner/tests/data/25_SOA.out @@ -52,23 +52,23 @@ RRTTL=00000001 RTYPE=0006 RDATA=00000000000000000000000000000000000000000000 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/26_SRV.out b/src/zscanner/tests/data/26_SRV.out index 7db652bdc9..eadb80413c 100644 --- a/src/zscanner/tests/data/26_SRV.out +++ b/src/zscanner/tests/data/26_SRV.out @@ -40,27 +40,27 @@ RRTTL=00000001 RTYPE=0021 RDATA=00000000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/27_NAPTR.out b/src/zscanner/tests/data/27_NAPTR.out index 5db20ab7ae..cc34e26fdd 100644 --- a/src/zscanner/tests/data/27_NAPTR.out +++ b/src/zscanner/tests/data/27_NAPTR.out @@ -40,17 +40,17 @@ RRTTL=00000001 RTYPE=0023 RDATA=0000000000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/28_TYPE.out b/src/zscanner/tests/data/28_TYPE.out index 8f6e10ecd0..0aa409af18 100644 --- a/src/zscanner/tests/data/28_TYPE.out +++ b/src/zscanner/tests/data/28_TYPE.out @@ -46,19 +46,19 @@ RRTTL=00000001 RTYPE=D903 RDATA= ------ -WARNG=ZSCANNER_ECANNOT_TEXT_DATA +WARNG=ZS_CANNOT_TEXT_DATA ------ -WARNG=ZSCANNER_ECANNOT_TEXT_DATA +WARNG=ZS_CANNOT_TEXT_DATA ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_RDATA_LENGTH +WARNG=ZS_BAD_RDATA_LENGTH ------ -WARNG=ZSCANNER_EBAD_RDATA_LENGTH +WARNG=ZS_BAD_RDATA_LENGTH ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ diff --git a/src/zscanner/tests/data/29_CERT.out b/src/zscanner/tests/data/29_CERT.out index 4e579efd26..6bd3674a89 100644 --- a/src/zscanner/tests/data/29_CERT.out +++ b/src/zscanner/tests/data/29_CERT.out @@ -196,37 +196,37 @@ RRTTL=00000001 RTYPE=0025 RDATA=000000000000 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_CERT_TYPE +WARNG=ZS_BAD_CERT_TYPE ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/30_KEY.out b/src/zscanner/tests/data/30_KEY.out index fb48735f66..1ec998b175 100644 --- a/src/zscanner/tests/data/30_KEY.out +++ b/src/zscanner/tests/data/30_KEY.out @@ -52,35 +52,35 @@ RRTTL=00000001 RTYPE=0019 RDATA=0000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/31_DNSKEY.out b/src/zscanner/tests/data/31_DNSKEY.out index df897ffc6f..fa034c5dd3 100644 --- a/src/zscanner/tests/data/31_DNSKEY.out +++ b/src/zscanner/tests/data/31_DNSKEY.out @@ -58,35 +58,35 @@ RRTTL=00000001 RTYPE=0030 RDATA=0000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/32_APL.out b/src/zscanner/tests/data/32_APL.out index 07579c2ff3..e7db44ff6c 100644 --- a/src/zscanner/tests/data/32_APL.out +++ b/src/zscanner/tests/data/32_APL.out @@ -76,19 +76,19 @@ RRTTL=00000001 RTYPE=002A RDATA=00010000 ------ -WARNG=ZSCANNER_EBAD_APL +WARNG=ZS_BAD_APL ------ -WARNG=ZSCANNER_EBAD_APL +WARNG=ZS_BAD_APL ------ -WARNG=ZSCANNER_EBAD_APL +WARNG=ZS_BAD_APL ------ -WARNG=ZSCANNER_EBAD_APL +WARNG=ZS_BAD_APL ------ -WARNG=ZSCANNER_EBAD_APL +WARNG=ZS_BAD_APL ------ -WARNG=ZSCANNER_EBAD_IPV6 +WARNG=ZS_BAD_IPV6 ------ -WARNG=ZSCANNER_EBAD_APL +WARNG=ZS_BAD_APL ------ -WARNG=ZSCANNER_EBAD_APL +WARNG=ZS_BAD_APL ------ diff --git a/src/zscanner/tests/data/33_DS.out b/src/zscanner/tests/data/33_DS.out index 803d409cf7..2257119a7e 100644 --- a/src/zscanner/tests/data/33_DS.out +++ b/src/zscanner/tests/data/33_DS.out @@ -40,23 +40,23 @@ RRTTL=00000001 RTYPE=002B RDATA=0000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ diff --git a/src/zscanner/tests/data/34_SSHFP.out b/src/zscanner/tests/data/34_SSHFP.out index 4b6c7d6c9c..da8ce6d8e3 100644 --- a/src/zscanner/tests/data/34_SSHFP.out +++ b/src/zscanner/tests/data/34_SSHFP.out @@ -34,21 +34,21 @@ RRTTL=00000001 RTYPE=002C RDATA=000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ diff --git a/src/zscanner/tests/data/35_IPSECKEY.out b/src/zscanner/tests/data/35_IPSECKEY.out index 8432557a3b..718ce22f7a 100644 --- a/src/zscanner/tests/data/35_IPSECKEY.out +++ b/src/zscanner/tests/data/35_IPSECKEY.out @@ -70,25 +70,25 @@ RRTTL=00000001 RTYPE=002D RDATA=00000100 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_GATEWAY +WARNG=ZS_BAD_GATEWAY ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_GATEWAY_KEY +WARNG=ZS_BAD_GATEWAY_KEY ------ -WARNG=ZSCANNER_EBAD_GATEWAY +WARNG=ZS_BAD_GATEWAY ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_GATEWAY_KEY +WARNG=ZS_BAD_GATEWAY_KEY ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/36_RRSIG.out b/src/zscanner/tests/data/36_RRSIG.out index 15d1ca897a..b3d48be8db 100644 --- a/src/zscanner/tests/data/36_RRSIG.out +++ b/src/zscanner/tests/data/36_RRSIG.out @@ -82,53 +82,53 @@ RRTTL=00000001 RTYPE=002E RDATA=0001000000000000000000000000000000000000 ------ -WARNG=ZSCANNER_EUNSUPPORTED_TYPE +WARNG=ZS_UNSUPPORTED_TYPE ------ -WARNG=ZSCANNER_EUNSUPPORTED_TYPE +WARNG=ZS_UNSUPPORTED_TYPE ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EUNSUPPORTED_TYPE +WARNG=ZS_UNSUPPORTED_TYPE ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER32_OVERFLOW +WARNG=ZS_NUMBER32_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_DATE +WARNG=ZS_BAD_DATE ------ -WARNG=ZSCANNER_EBAD_TIMESTAMP_CHAR +WARNG=ZS_BAD_TIMESTAMP_CHAR ------ -WARNG=ZSCANNER_EBAD_TIMESTAMP_LENGTH +WARNG=ZS_BAD_TIMESTAMP_LENGTH ------ -WARNG=ZSCANNER_EBAD_DNAME_CHAR +WARNG=ZS_BAD_DNAME_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/37_NSEC.out b/src/zscanner/tests/data/37_NSEC.out index 29ec7493c0..7a62def60c 100644 --- a/src/zscanner/tests/data/37_NSEC.out +++ b/src/zscanner/tests/data/37_NSEC.out @@ -52,13 +52,13 @@ RRTTL=00000001 RTYPE=002F RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_BITMAP +WARNG=ZS_BAD_BITMAP ------ diff --git a/src/zscanner/tests/data/38_DHCID.out b/src/zscanner/tests/data/38_DHCID.out index 288e863f4a..8dc8ec915c 100644 --- a/src/zscanner/tests/data/38_DHCID.out +++ b/src/zscanner/tests/data/38_DHCID.out @@ -46,27 +46,27 @@ RRTTL=00000001 RTYPE=0031 RDATA=00 ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE64_CHAR +WARNG=ZS_BAD_BASE64_CHAR ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ -WARNG=ZSCANNER_EBAD_RDATA +WARNG=ZS_BAD_RDATA ------ diff --git a/src/zscanner/tests/data/39_NSEC3.out b/src/zscanner/tests/data/39_NSEC3.out index 35ee74a107..1aaec4f359 100644 --- a/src/zscanner/tests/data/39_NSEC3.out +++ b/src/zscanner/tests/data/39_NSEC3.out @@ -94,51 +94,51 @@ RRTTL=00000001 RTYPE=0032 RDATA=00000000000100 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BASE32HEX_CHAR +WARNG=ZS_BAD_BASE32HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_BITMAP +WARNG=ZS_BAD_BITMAP ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_BITMAP +WARNG=ZS_BAD_BITMAP ------ diff --git a/src/zscanner/tests/data/40_NSEC3PARAM.out b/src/zscanner/tests/data/40_NSEC3PARAM.out index 0fbc44807e..83b9bb19e6 100644 --- a/src/zscanner/tests/data/40_NSEC3PARAM.out +++ b/src/zscanner/tests/data/40_NSEC3PARAM.out @@ -34,25 +34,25 @@ RRTTL=00000001 RTYPE=0033 RDATA=0000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ diff --git a/src/zscanner/tests/data/41_TLSA.out b/src/zscanner/tests/data/41_TLSA.out index 8bbc0d4796..6f5b6a154f 100644 --- a/src/zscanner/tests/data/41_TLSA.out +++ b/src/zscanner/tests/data/41_TLSA.out @@ -34,21 +34,21 @@ RRTTL=00000001 RTYPE=0034 RDATA=00000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_ENUMBER8_OVERFLOW +WARNG=ZS_NUMBER8_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ diff --git a/src/zscanner/tests/data/42_LOC.out b/src/zscanner/tests/data/42_LOC.out index 5418c32586..730cc3b9f3 100644 --- a/src/zscanner/tests/data/42_LOC.out +++ b/src/zscanner/tests/data/42_LOC.out @@ -196,53 +196,53 @@ RRTTL=00000001 RTYPE=001D RDATA=00121613800000008000000000989680 ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ -WARNG=ZSCANNER_EBAD_LOC_DATA +WARNG=ZS_BAD_LOC_DATA ------ diff --git a/src/zscanner/tests/data/43_EUI48.out b/src/zscanner/tests/data/43_EUI48.out index 1b06bb3993..a54a31472b 100644 --- a/src/zscanner/tests/data/43_EUI48.out +++ b/src/zscanner/tests/data/43_EUI48.out @@ -40,21 +40,21 @@ RRTTL=00000001 RTYPE=006C RDATA=000000000000 ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_EUI_LENGTH +WARNG=ZS_BAD_EUI_LENGTH ------ -WARNG=ZSCANNER_EBAD_EUI_LENGTH +WARNG=ZS_BAD_EUI_LENGTH ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_CHAR_DASH +WARNG=ZS_BAD_CHAR_DASH ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/44_EUI64.out b/src/zscanner/tests/data/44_EUI64.out index a25974bd5d..4cce5f532f 100644 --- a/src/zscanner/tests/data/44_EUI64.out +++ b/src/zscanner/tests/data/44_EUI64.out @@ -40,21 +40,21 @@ RRTTL=00000001 RTYPE=006D RDATA=0000000000000000 ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_EUI_LENGTH +WARNG=ZS_BAD_EUI_LENGTH ------ -WARNG=ZSCANNER_EBAD_EUI_LENGTH +WARNG=ZS_BAD_EUI_LENGTH ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_CHAR_DASH +WARNG=ZS_BAD_CHAR_DASH ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/45_NID.out b/src/zscanner/tests/data/45_NID.out index e3da3ed01e..a2bfb4c44b 100644 --- a/src/zscanner/tests/data/45_NID.out +++ b/src/zscanner/tests/data/45_NID.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=0068 RDATA=00000000000000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/data/46_L32.out b/src/zscanner/tests/data/46_L32.out index a05fc47c6e..e9c77b5f63 100644 --- a/src/zscanner/tests/data/46_L32.out +++ b/src/zscanner/tests/data/46_L32.out @@ -34,21 +34,21 @@ RRTTL=00000001 RTYPE=0069 RDATA=000000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_IPV4 +WARNG=ZS_BAD_IPV4 ------ -WARNG=ZSCANNER_EBAD_IPV4 +WARNG=ZS_BAD_IPV4 ------ -WARNG=ZSCANNER_EBAD_IPV4 +WARNG=ZS_BAD_IPV4 ------ -WARNG=ZSCANNER_EBAD_ADDRESS_CHAR +WARNG=ZS_BAD_ADDRESS_CHAR ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/47_L64.out b/src/zscanner/tests/data/47_L64.out index aaa53c2ae0..106ee588bd 100644 --- a/src/zscanner/tests/data/47_L64.out +++ b/src/zscanner/tests/data/47_L64.out @@ -40,23 +40,23 @@ RRTTL=00000001 RTYPE=006A RDATA=00000000000000000000 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_ENUMBER16_OVERFLOW +WARNG=ZS_NUMBER16_OVERFLOW ------ -WARNG=ZSCANNER_EBAD_L64_LENGTH +WARNG=ZS_BAD_L64_LENGTH ------ -WARNG=ZSCANNER_EBAD_L64_LENGTH +WARNG=ZS_BAD_L64_LENGTH ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_CHAR_COLON +WARNG=ZS_BAD_CHAR_COLON ------ -WARNG=ZSCANNER_EBAD_HEX_CHAR +WARNG=ZS_BAD_HEX_CHAR ------ -WARNG=ZSCANNER_EBAD_REST +WARNG=ZS_BAD_REST ------ diff --git a/src/zscanner/tests/data/48_LP.out b/src/zscanner/tests/data/48_LP.out index 2dcf142a3a..4961c7e905 100644 --- a/src/zscanner/tests/data/48_LP.out +++ b/src/zscanner/tests/data/48_LP.out @@ -28,5 +28,5 @@ RRTTL=00000001 RTYPE=006B RDATA=000100 ------ -WARNG=ZSCANNER_EBAD_NUMBER +WARNG=ZS_BAD_NUMBER ------ diff --git a/src/zscanner/tests/zscanner-tool.c b/src/zscanner/tests/zscanner-tool.c index fdb5040823..baec051f83 100644 --- a/src/zscanner/tests/zscanner-tool.c +++ b/src/zscanner/tests/zscanner-tool.c @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) ret = zs_loader_process(fl); switch (ret) { - case ZSCANNER_OK: + case ZS_OK: if (mode == DEFAULT_MODE) { printf("Zone file has been processed " "successfully\n"); @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) zs_loader_free(fl); break; - case FLOADER_ESCANNER: + case ZS_LOADER_SCANNER: if (mode == DEFAULT_MODE) { printf("Zone processing has stopped with " "%"PRIu64" warnings/errors!\n", -- GitLab