From 54698275423cda03191cd3ed3163a4a4e8d8f47f Mon Sep 17 00:00:00 2001 From: Peter Griess Date: Sat, 9 Jul 2011 13:56:18 -0500 Subject: [PATCH] Get rid of CALLBACK_NOCLEAR(). - This was only used by CALLBACK() (which then cleared the mark anyway), and the end of the http_parser_execute() body (after which they go out of scope). --- http_parser.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/http_parser.c b/http_parser.c index 2f4cd59..205006d 100644 --- a/http_parser.c +++ b/http_parser.c @@ -58,7 +58,7 @@ do { \ FOR##_mark = p; \ } while (0) -#define CALLBACK_NOCLEAR(FOR) \ +#define CALLBACK(FOR) \ do { \ if (FOR##_mark) { \ if (settings->on_##FOR) { \ @@ -70,17 +70,11 @@ do { \ return (p - data); \ } \ } \ + FOR##_mark = NULL; \ } \ } while (0) -#define CALLBACK(FOR) \ -do { \ - CALLBACK_NOCLEAR(FOR); \ - FOR##_mark = NULL; \ -} while (0) - - #define PROXY_CONNECTION "proxy-connection" #define CONNECTION "connection" #define CONTENT_LENGTH "content-length" @@ -1736,12 +1730,12 @@ size_t http_parser_execute (http_parser *parser, } } - CALLBACK_NOCLEAR(header_field); - CALLBACK_NOCLEAR(header_value); - CALLBACK_NOCLEAR(fragment); - CALLBACK_NOCLEAR(query_string); - CALLBACK_NOCLEAR(path); - CALLBACK_NOCLEAR(url); + CALLBACK(header_field); + CALLBACK(header_value); + CALLBACK(fragment); + CALLBACK(query_string); + CALLBACK(path); + CALLBACK(url); parser->state = state; parser->header_state = header_state;