haiwan
/
http-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coding style improvment

Browse Source
v0.10
Bertrand Paquet 13 years ago
parent e42aa93b52
commit bb29f43741
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File

19
http_parser.c
Unescape View File

@ -354,8 +354,12 @@ enum http_host_state
#define IS_NUM(c) ((c) >= '0' && (c) <= '9') #define IS_NUM(c) ((c) >= '0' && (c) <= '9')
#define IS_ALPHANUM(c) (IS_ALPHA(c) || IS_NUM(c)) #define IS_ALPHANUM(c) (IS_ALPHA(c) || IS_NUM(c))
#define IS_HEX(c) (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f')) #define IS_HEX(c) (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f'))
#define IS_MARK(c) ((c) == '-' || (c) == '_' || (c) == '.' || (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || (c) == ')') #define IS_MARK(c) ((c) == '-' || (c) == '_' || (c) == '.' || \
#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || (c) == '$' || (c) == ',') (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || \
(c) == ')')
#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || \
(c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \
(c) == '$' || (c) == ',')
#if HTTP_PARSER_STRICT #if HTTP_PARSER_STRICT
#define TOKEN(c) (tokens[(unsigned char)c]) #define TOKEN(c) (tokens[(unsigned char)c])
@ -970,7 +974,7 @@ size_t http_parser_execute (http_parser *parser,
parser->state = s_req_host_start; parser->state = s_req_host_start;
} }
parser->state = parse_url_char((enum state)parser->state, ch, 0); parser->state = parse_url_char((enum state)parser->state, ch, NULL);
if (parser->state == s_dead) { if (parser->state == s_dead) {
SET_ERRNO(HPE_INVALID_URL); SET_ERRNO(HPE_INVALID_URL);
goto error; goto error;
@ -992,7 +996,7 @@ size_t http_parser_execute (http_parser *parser,
SET_ERRNO(HPE_INVALID_URL); SET_ERRNO(HPE_INVALID_URL);
goto error; goto error;
default: default:
parser->state = parse_url_char((enum state)parser->state, ch, 0); parser->state = parse_url_char((enum state)parser->state, ch, NULL);
if (parser->state == s_dead) { if (parser->state == s_dead) {
SET_ERRNO(HPE_INVALID_URL); SET_ERRNO(HPE_INVALID_URL);
goto error; goto error;
@ -1024,7 +1028,7 @@ size_t http_parser_execute (http_parser *parser,
CALLBACK_DATA(url); CALLBACK_DATA(url);
break; break;
default: default:
parser->state = parse_url_char((enum state)parser->state, ch, 0); parser->state = parse_url_char((enum state)parser->state, ch, NULL);
if (parser->state == s_dead) { if (parser->state == s_dead) {
SET_ERRNO(HPE_INVALID_URL); SET_ERRNO(HPE_INVALID_URL);
goto error; goto error;
@ -1927,7 +1931,6 @@ http_parse_host_char(enum http_host_state s, const char ch) {
break; break;
case s_http_host: case s_http_host:
if (IS_HOST_CHAR(ch)) { if (IS_HOST_CHAR(ch)) {
return s_http_host; return s_http_host;
} }
@ -1967,8 +1970,6 @@ http_parse_host_char(enum http_host_state s, const char ch) {
return s_http_host_dead; return s_http_host_dead;
} }
#include <stdio.h>
static int static int
http_parse_host(const char * buf, struct http_parser_url *u, int found_at) { http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
enum http_host_state s; enum http_host_state s;
@ -2109,7 +2110,7 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
old_uf = uf; old_uf = uf;
} }
// host must be present if there is a schema /* host must be present if there is a schema */
if ((u->field_set & ((1 << UF_SCHEMA) | (1 << UF_HOST))) != 0) { if ((u->field_set & ((1 << UF_SCHEMA) | (1 << UF_HOST))) != 0) {
if (http_parse_host(buf, u, found_at) != 0) { if (http_parse_host(buf, u, found_at) != 0) {
return 1; return 1;

16
test.c
Unescape View File

@ -2109,7 +2109,9 @@ const struct url_test url_tests[] =
} }
, {.name="extra ? in query string" , {.name="extra ? in query string"
,.url="http://a.tbcdn.cn/p/fp/2010c/??fp-header-min.css,fp-base-min.css,fp-channel-min.css,fp-product-min.css,fp-mall-min.css,fp-category-min.css,fp-sub-min.css,fp-gdp4p-min.css,fp-css3-min.css,fp-misc-min.css?t=20101022.css" ,.url="http://a.tbcdn.cn/p/fp/2010c/??fp-header-min.css,fp-base-min.css,"
"fp-channel-min.css,fp-product-min.css,fp-mall-min.css,fp-category-min.css,"
"fp-sub-min.css,fp-gdp4p-min.css,fp-css3-min.css,fp-misc-min.css?t=20101022.css"
,.is_connect=0 ,.is_connect=0
,.u= ,.u=
{.field_set=(1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY) {.field_set=(1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY)
@ -2167,10 +2169,12 @@ const struct url_test url_tests[] =
} }
, {.name="complex URL fragment" , {.name="complex URL fragment"
,.url="http://www.webmasterworld.com/r.cgi?f=21&d=8405&url=http://www.example.com/index.html?foo=bar&hello=world#midpage" ,.url="http://www.webmasterworld.com/r.cgi?f=21&d=8405&url="
"http://www.example.com/index.html?foo=bar&hello=world#midpage"
,.is_connect=0 ,.is_connect=0
,.u= ,.u=
{.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY) | (1<<UF_FRAGMENT) {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY) |\
(1<<UF_FRAGMENT)
,.port=0 ,.port=0
,.field_data= ,.field_data=
{{ 0, 4 } /* UF_SCHEMA */ {{ 0, 4 } /* UF_SCHEMA */
@ -2189,7 +2193,8 @@ const struct url_test url_tests[] =
,.url="http://host.com:8080/p/a/t/h?query=string#hash" ,.url="http://host.com:8080/p/a/t/h?query=string#hash"
,.is_connect=0 ,.is_connect=0
,.u= ,.u=
{.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) | (1<<UF_QUERY) | (1<<UF_FRAGMENT) {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) |\
(1<<UF_QUERY) | (1<<UF_FRAGMENT)
,.port=8080 ,.port=8080
,.field_data= ,.field_data=
{{ 0, 4 } /* UF_SCHEMA */ {{ 0, 4 } /* UF_SCHEMA */
@ -2208,7 +2213,8 @@ const struct url_test url_tests[] =
,.url="http://a:b@host.com:8080/p/a/t/h?query=string#hash" ,.url="http://a:b@host.com:8080/p/a/t/h?query=string#hash"
,.is_connect=0 ,.is_connect=0
,.u= ,.u=
{.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) | (1<<UF_QUERY) | (1<<UF_FRAGMENT) | (1<<UF_USERINFO) {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) |\
(1<<UF_QUERY) | (1<<UF_FRAGMENT) | (1<<UF_USERINFO)
,.port=8080 ,.port=8080
,.field_data= ,.field_data=
{{ 0, 4 } /* UF_SCHEMA */ {{ 0, 4 } /* UF_SCHEMA */

Write Preview
Loading…
Cancel
Save