collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reduce variables and add const char* to insert_pathl.

Browse source
This commit is contained in:
c9s 2014-06-01 14:33:56 +08:00
parent f5f24aa15e
commit 8ee11aaa6f
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/r3.h
View file

@ -111,7 +111,7 @@ route * r3_tree_insert_routel(node *tree, int method, char *path, int path_len,
/** /**
* The private API to insert a path * 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, const char *path, int path_len, route * route, void * data);
void r3_tree_dump(const node * n, int level); void r3_tree_dump(const node * n, int level);

16
src/node.c
View file

@ -472,7 +472,7 @@ node * r3_tree_insert_pathl(node *tree, char *path, int path_len, void * data)
/** /**
* Return the last inserted node. * 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, const char *path, int path_len, route * route, void * data)
{ {
node * n = tree; node * n = tree;
edge * e = NULL; edge * e = NULL;
@ -492,11 +492,14 @@ node * r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * route
} }
// branch the edge at correct position (avoid broken slugs) // branch the edge at correct position (avoid broken slugs)
char *slug_s; const char *slug_s;
if ( (slug_s = inside_slug(path, path_len, path + prefix_len)) != NULL ) { if ( (slug_s = inside_slug(path, path_len, (char*) path + prefix_len)) != NULL ) {
prefix_len = slug_s - path; prefix_len = slug_s - path;
} }
const char * subpath = path + prefix_len;
const int subpath_len = path_len - prefix_len;
// common prefix not found, insert a new edge for this pattern // common prefix not found, insert a new edge for this pattern
if ( prefix_len == 0 ) { if ( prefix_len == 0 ) {
// there are two more slugs, we should break them into several parts // there are two more slugs, we should break them into several parts
@ -591,9 +594,6 @@ node * r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * route
} }
} else if ( prefix_len == e->pattern_len ) { // fully-equal to the pattern of the edge } else if ( prefix_len == e->pattern_len ) { // fully-equal to the pattern of the edge
char * subpath = path + prefix_len;
int subpath_len = path_len - prefix_len;
// there are something more we can insert // there are something more we can insert
if ( subpath_len > 0 ) { 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);
@ -618,10 +618,8 @@ node * r3_tree_insert_pathl_(node *tree, char *path, int path_len, route * route
/* it's partially matched with the pattern, /* it's partially matched with the pattern,
* we should split the end point and make a branch here... * we should split the end point and make a branch here...
*/ */
char * s2 = path + prefix_len;
int s2_len = path_len - prefix_len;
r3_edge_branch(e, 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, subpath, subpath_len, route , data);
} else { } else {
printf("unexpected route."); printf("unexpected route.");
return NULL; return NULL;