From 5bd1757e5f01b3e22715ade280cf6f673fe17ff5 Mon Sep 17 00:00:00 2001 From: c9s Date: Wed, 21 May 2014 00:47:09 +0800 Subject: [PATCH] function name fix --- CHANGES.md | 2 +- README.md | 8 ++++---- include/r3.h | 10 ++++------ src/node.c | 12 ++++++------ tests/bench_str.csv | 1 + tests/check_tree.c | 4 ++-- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 630e277..ab6017d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,7 +10,7 @@ API changes: r3_tree_insert_path(n, "/user2/{id:\\d+}", &var2); -2. The original `r3_tree_insert_pathl_` has been moved to `_r3_tree_insert_pathl_` as a private API. +2. The original `r3_tree_insert_pathl_` has been moved to `r3_tree_insert_pathl_` as a private API. 3. Moved `r3_tree_matchl` to `r3_tree_matchl` since it require the length of the path string. diff --git a/README.md b/README.md index 8d4162f..0cb4045 100644 --- a/README.md +++ b/README.md @@ -43,12 +43,12 @@ int route_data = 3; // insert the route path into the router tree r3_tree_insert_path(n, "/bar", &route_data); // ignore the length of path -r3_tree_insert_pathl_(n, "/zoo", strlen("/zoo"), &route_data ); -r3_tree_insert_pathl_(n, "/foo/bar", strlen("/foo/bar"), &route_data ); +r3_tree_insert_pathl(n, "/zoo", strlen("/zoo"), &route_data ); +r3_tree_insert_pathl(n, "/foo/bar", strlen("/foo/bar"), &route_data ); -r3_tree_insert_pathl_(n ,"/post/{id}", strlen("/post/{id}") , &route_data ); +r3_tree_insert_pathl(n ,"/post/{id}", strlen("/post/{id}") , &route_data ); -r3_tree_insert_pathl_(n, "/user/{id:\\d+}", strlen("/user/{id:\\d+}"), &route_data ); +r3_tree_insert_pathl(n, "/user/{id:\\d+}", strlen("/user/{id:\\d+}"), &route_data ); // let's compile the tree! r3_tree_compile(n); diff --git a/include/r3.h b/include/r3.h index 770dd98..14ec6ba 100644 --- a/include/r3.h +++ b/include/r3.h @@ -108,17 +108,15 @@ edge * r3_node_find_edge(node * n, char * pat); void r3_node_append_edge(node *n, edge *child); -node * r3_tree_insert_pathl_(node *tree, char *path, int path_len, void * data); +node * r3_tree_insert_pathl(node *tree, char *path, int path_len, void * data); -#define r3_tree_insert_path(n,p,d) _r3_tree_insert_pathl_(n,p,strlen(p), NULL, d) - -// node * r3_tree_insert_route(node *tree, route * route, void * data); -#define r3_tree_insert_route(n,r,d) _r3_tree_insert_pathl_(n, r->path, r->path_len, r, d) +#define r3_tree_insert_path(n,p,d) r3_tree_insert_pathl_(n,p,strlen(p), NULL, d) +#define r3_tree_insert_route(n,r,d) r3_tree_insert_pathl_(n, r->path, r->path_len, r, d) /** * The private API to insert a path */ -node * _r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * route, void * data); +node * r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * route, void * data); void r3_tree_dump(node * n, int level); diff --git a/src/node.c b/src/node.c index 3fa0a8b..27da599 100644 --- a/src/node.c +++ b/src/node.c @@ -403,16 +403,16 @@ route * r3_route_createl(char * path, int path_len) { return info; } -node * r3_tree_insert_pathl_(node *tree, char *path, int path_len, void * data) +node * r3_tree_insert_pathl(node *tree, char *path, int path_len, void * data) { - return _r3_tree_insert_pathl_(tree, path, path_len, NULL , data); + return r3_tree_insert_pathl_(tree, path, path_len, NULL , data); } /** * Return the last inserted node. */ -node * _r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * route, void * data) +node * r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * route, void * data) { node * n = tree; edge * e = NULL; @@ -461,7 +461,7 @@ node * _r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * rout r3_node_add_child(n, strndup(path, (int)(p - path)), child); // and insert the rest part to the child - return _r3_tree_insert_pathl_(child, p, path_len - (int)(p - path), route, data); + return r3_tree_insert_pathl_(child, p, path_len - (int)(p - path), route, data); } else { node * child = r3_tree_create(3); r3_node_add_child(n, strndup(path, path_len) , child); @@ -482,7 +482,7 @@ node * _r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * rout // there are something more we can insert if ( subpath_len > 0 ) { - return _r3_tree_insert_pathl_(e->child, subpath, subpath_len, route, data); + return r3_tree_insert_pathl_(e->child, subpath, subpath_len, route, data); } else { // there are no more path to insert @@ -510,7 +510,7 @@ node * _r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * rout char * s2 = path + prefix_len; int s2_len = path_len - prefix_len; r3_edge_branch(e, prefix_len); - return _r3_tree_insert_pathl_(e->child, s2 , s2_len, route , data); + return r3_tree_insert_pathl_(e->child, s2 , s2_len, route , data); } else { printf("unexpected route."); return NULL; diff --git a/tests/bench_str.csv b/tests/bench_str.csv index 78d27f8..9af561a 100644 --- a/tests/bench_str.csv +++ b/tests/bench_str.csv @@ -397,3 +397,4 @@ 1400603778,13736212.66 1400603800,13715365.00 1400603827,12742770.05 +1400604427,13725403.62 diff --git a/tests/check_tree.c b/tests/check_tree.c index d28bdeb..3fbf2c8 100644 --- a/tests/check_tree.c +++ b/tests/check_tree.c @@ -159,7 +159,7 @@ END_TEST -START_TEST (test_r3_tree_insert_pathl_) +START_TEST (testr3_tree_insert_pathl) { node * n = r3_tree_create(10); @@ -717,7 +717,7 @@ Suite* r3_suite (void) { tcase_add_test(tcase, test_str_array); tcase_add_test(tcase, test_ltrim_slash); tcase_add_test(tcase, test_r3_node_find_edge); - tcase_add_test(tcase, test_r3_tree_insert_pathl_); + tcase_add_test(tcase, testr3_tree_insert_pathl); tcase_add_test(tcase, test_compile); tcase_add_test(tcase, test_route_cmp); tcase_add_test(tcase, test_insert_route);