From 5ca345d570005f13b5f4444729447731954e6bfb Mon Sep 17 00:00:00 2001 From: c9s Date: Sun, 18 May 2014 11:05:01 +0800 Subject: [PATCH] Rename route_info to route --- include/r3.h | 6 +++--- src/node.c | 8 ++++---- tests/bench_str.csv | 1 + tests/check_tree.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/r3.h b/include/r3.h index 089f6c4..f303094 100644 --- a/include/r3.h +++ b/include/r3.h @@ -81,7 +81,7 @@ typedef struct { char * remote_addr_pattern; int remote_addr_pattern_len; -} route_info; +} route; node * r3_tree_create(int cap); @@ -136,8 +136,8 @@ match_entry * match_entry_createl(char * path, int path_len); void match_entry_free(match_entry * entry); -route_info * route_info_create(char * path); +route * route_create(char * path); -route_info * route_info_createl(char * path, int path_len); +route * route_createl(char * path, int path_len); #endif /* !NODE_H */ diff --git a/src/node.c b/src/node.c index bbfa7fd..4caa63f 100644 --- a/src/node.c +++ b/src/node.c @@ -194,12 +194,12 @@ void r3_tree_compile_patterns(node * n) { } } -route_info * route_info_create(char * path) { - return route_info_createl(path, strlen(path)); +route * route_create(char * path) { + return route_createl(path, strlen(path)); } -route_info * route_info_createl(char * path, int path_len) { - route_info * info = malloc(sizeof(route_info)); +route * route_createl(char * path, int path_len) { + route * info = malloc(sizeof(route)); info->path = path; info->path_len = path_len; info->request_method = 0; // can be (GET || POST) diff --git a/tests/bench_str.csv b/tests/bench_str.csv index 40eb2c2..5e20d40 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -87,3 +87,4 @@ 1400373185,13716181.30 1400374415,13164892.40 1400382244,12226293.04 +1400382299,11775631.24 diff --git a/tests/check_tree.c b/tests/check_tree.c index cef6503..1caf5a6 100644 --- a/tests/check_tree.c +++ b/tests/check_tree.c @@ -267,7 +267,7 @@ START_TEST(test_insert_route) node * tree = r3_tree_create(2); - // route_info *info = route_info_create("/blog/post", strlen("/blog/post") ); + // route *info = route_create("/blog/post", strlen("/blog/post") ); // r3_tree_insert_route(n, "/foo/bar/baz", NULL);