From 4303ebccd836d668cc694ff7c139d1a9631b449b Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Tue, 21 Jun 2011 15:51:32 -0700 Subject: [PATCH] Forgot to remove some debug output from the release build. Grrr. --- src/handler.c | 2 -- src/server.c | 1 - tests/tnetstrings_tests.c | 3 ++- tools/m2sh/src/parser.c | 44 +++++++++++++++++++-------------------- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/handler.c b/src/handler.c index 4f880320..dacc759c 100644 --- a/src/handler.c +++ b/src/handler.c @@ -1,5 +1,3 @@ -#undef NDEBUG - /** * * Copyright (c) 2010, Zed A. Shaw and Mongrel2 Project Contributors. diff --git a/src/server.c b/src/server.c index 1cc219b3..05b79b6c 100644 --- a/src/server.c +++ b/src/server.c @@ -1,4 +1,3 @@ -#undef NDEBUG /** * * Copyright (c) 2010, Zed A. Shaw and Mongrel2 Project Contributors. diff --git a/tests/tnetstrings_tests.c b/tests/tnetstrings_tests.c index 3ddd3615..a86267e1 100644 --- a/tests/tnetstrings_tests.c +++ b/tests/tnetstrings_tests.c @@ -12,7 +12,8 @@ char *test_tnetstring_numbers() tns_value_t max = {.type = tns_tag_number, .value.number = LONG_MAX}; result = tns_render(&max, &len); - mu_assert(len == 23, "Wrong length on LONG_MAX"); + debug("Got a length from LONG_MAX of: %d", len); + mu_assert(len == 23 || len == 14, "Wrong length on LONG_MAX"); free(result); // WARNING: LONG_MIN is an edge case diff --git a/tools/m2sh/src/parser.c b/tools/m2sh/src/parser.c index c584eaa4..68a7f6e9 100644 --- a/tools/m2sh/src/parser.c +++ b/tools/m2sh/src/parser.c @@ -157,40 +157,40 @@ static const YYMINORTYPE yyzerominor = { 0 }; ** yy_default[] Default action for each state. */ static const YYACTIONTYPE yy_action[] = { - /* 0 */ 26, 27, 28, 32, 15, 14, 6, 1, 3, 13, - /* 10 */ 37, 12, 26, 27, 28, 32, 11, 14, 67, 7, - /* 20 */ 23, 13, 4, 12, 33, 29, 30, 31, 5, 19, - /* 30 */ 29, 30, 31, 16, 17, 20, 29, 30, 31, 40, - /* 40 */ 25, 9, 16, 17, 15, 39, 22, 29, 30, 31, - /* 50 */ 38, 29, 30, 31, 15, 21, 2, 24, 34, 10, - /* 60 */ 18, 36, 35, 68, 68, 68, 68, 68, 8, + /* 0 */ 20, 21, 22, 26, 14, 15, 37, 18, 3, 12, + /* 10 */ 31, 13, 20, 21, 22, 26, 30, 15, 67, 7, + /* 20 */ 39, 12, 34, 13, 38, 23, 24, 25, 1, 27, + /* 30 */ 23, 24, 25, 32, 23, 24, 25, 6, 35, 23, + /* 40 */ 24, 25, 36, 23, 24, 25, 16, 17, 40, 19, + /* 50 */ 29, 14, 8, 14, 9, 28, 10, 2, 33, 16, + /* 60 */ 17, 11, 4, 68, 5, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 2, 3, 4, 5, 5, 7, 26, 25, 10, 11, - /* 10 */ 12, 13, 2, 3, 4, 5, 8, 7, 17, 18, - /* 20 */ 19, 11, 6, 13, 20, 21, 22, 23, 15, 20, - /* 30 */ 21, 22, 23, 2, 3, 20, 21, 22, 23, 0, - /* 40 */ 1, 10, 2, 3, 5, 14, 20, 21, 22, 23, - /* 50 */ 20, 21, 22, 23, 5, 27, 15, 19, 9, 10, - /* 60 */ 27, 19, 19, 28, 28, 28, 28, 28, 24, + /* 0 */ 2, 3, 4, 5, 5, 7, 27, 19, 10, 11, + /* 10 */ 12, 13, 2, 3, 4, 5, 19, 7, 17, 18, + /* 20 */ 19, 11, 27, 13, 20, 21, 22, 23, 25, 20, + /* 30 */ 21, 22, 23, 20, 21, 22, 23, 26, 20, 21, + /* 40 */ 22, 23, 20, 21, 22, 23, 2, 3, 0, 1, + /* 50 */ 19, 5, 24, 5, 10, 9, 10, 6, 14, 2, + /* 60 */ 3, 8, 15, 28, 15, }; #define YY_SHIFT_USE_DFLT (-3) #define YY_SHIFT_MAX 17 static const signed char yy_shift_ofst[] = { - /* 0 */ -1, -2, 10, 10, 10, 10, 31, 39, 49, 40, - /* 10 */ -1, -3, -3, -3, 8, 16, 13, 41, + /* 0 */ -1, -2, 10, 10, 10, 10, 44, 48, 46, 57, + /* 10 */ -1, -3, -3, -3, 51, 53, 47, 49, }; -#define YY_REDUCE_USE_DFLT (-21) +#define YY_REDUCE_USE_DFLT (-22) #define YY_REDUCE_MAX 13 static const signed char yy_reduce_ofst[] = { - /* 0 */ 1, 26, 15, 30, 4, 9, 28, 38, 42, 33, - /* 10 */ 43, 44, -20, -18, + /* 0 */ 1, 4, 9, 13, 18, 22, -21, -12, -3, -5, + /* 10 */ 31, 28, 3, 11, }; static const YYACTIONTYPE yy_default[] = { /* 0 */ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66, - /* 10 */ 66, 55, 63, 59, 66, 66, 66, 66, 61, 64, - /* 20 */ 65, 62, 58, 42, 41, 43, 44, 45, 46, 47, - /* 30 */ 48, 49, 50, 51, 52, 53, 54, 56, 57, 60, + /* 10 */ 66, 55, 59, 63, 66, 66, 66, 66, 41, 43, + /* 20 */ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + /* 30 */ 54, 56, 57, 60, 61, 64, 65, 62, 58, 42, }; #define YY_SZ_ACTTAB (int)(sizeof(yy_action)/sizeof(yy_action[0]))