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

Reuse restlen

Browse source
This commit is contained in:
c9s 2015-11-10 19:48:22 +08:00
parent 34269aa045
commit a2994cfdac
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/node.c
View file

@ -308,14 +308,14 @@ node * r3_tree_matchl(const node * n, const char * path, int path_len, match_ent
} }
// check match // check match
if ( (pp - path) > 0) { if ( (pp - path) > 0) {
restlen = pp_end - pp;
if (entry) { if (entry) {
str_array_append(entry->vars , zstrndup(path, pp - path)); str_array_append(entry->vars , zstrndup(path, pp - path));
} }
restlen = pp_end - pp;
if (restlen == 0) { if (restlen == 0) {
return e->child && e->child->endpoint > 0 ? e->child : NULL; return e->child && e->child->endpoint > 0 ? e->child : NULL;
} }
return r3_tree_matchl(e->child, pp, pp_end - pp, entry); return r3_tree_matchl(e->child, pp, restlen, entry);
} }
} }
} }
@ -442,9 +442,9 @@ inline edge * r3_node_find_edge_str(const node * n, const char * str, int str_le
char firstbyte = *str; char firstbyte = *str;
unsigned int i; unsigned int i;
for (i = n->edge_len; i--; ) { for (i = n->edge_len; i--; ) {
if ( firstbyte == *(n->edges[i]->pattern) ) { edge *e = n->edges[i];
info("matching '%s' with '%s'\n", str, r3_node_edge_pattern(n,i) ); if (firstbyte == e->pattern[0]) {
if ( strncmp( r3_node_edge_pattern(n,i), str, r3_node_edge_pattern_len(n,i) ) == 0 ) { if (strncmp(e->pattern, str, e->pattern_len) == 0 ) {
return n->edges[i]; return n->edges[i];
} }
return NULL; return NULL;