File renaming

include/r3.h

@@ -1,5 +1,5 @@
 /*
- * node.h
+ * r3.h
  * Copyright (C) 2014 c9s <c9s@c9smba.local>
  *
  * Distributed under terms of the MIT license.
@@ -14,7 +14,7 @@
 #include <assert.h>
 #include <pcre.h>
 
-#include "token.h"
+#include "str_array.h"
 
 #define node_edge_pattern(node,i) node->edges[i]->pattern
 #define node_edge_pattern_len(node,i) node->edges[i]->pattern_len

include/r3_define.h

@@ -1,5 +1,5 @@
 /*
- * define.h
+ * r3_define.h
  * Copyright (C) 2014 c9s <c9s@c9smba.local>
  *
  * Distributed under terms of the MIT license.

include/r3_list.h

@@ -1,5 +1,5 @@
 /*
- * list.h
+ * r3_list.h
  * Copyright (C) 2014 c9s <c9s@c9smba.local>
  *
  * Distributed under terms of the MIT license.

include/r3_str.h

@@ -1,5 +1,5 @@
 /*
- * str.h
+ * r3_str.h
  * Copyright (C) 2014 c9s <c9s@c9smba.local>
  *
  * Distributed under terms of the MIT license.
@@ -7,7 +7,7 @@
 #ifndef STR_H
 #define STR_H
 
-#include "define.h"
+#include "r3_define.h"
 
 int strndiff(char * d1, char * d2, unsigned int n);
 

include/str_array.h

@@ -1,5 +1,5 @@
 /*
- * token.h
+ * str_array.h
  * Copyright (C) 2014 c9s <c9s@c9smba.local>
  *
  * Distributed under terms of the MIT license.
@@ -8,7 +8,7 @@
 #ifndef TOKEN_H
 #define TOKEN_H
 
-#include "define.h"
+#include "r3_define.h"
 
 typedef struct _str_array {
   char **tokens;

src/list.c

@@ -5,7 +5,7 @@
  * Distributed under terms of the MIT license.
  */
 #include <stdlib.h>
-#include "list.h"
+#include "r3_list.h"
  
 /* Naive linked list implementation */
  

src/node.c

@@ -12,10 +12,10 @@
 // Judy array
 #include <Judy.h>
 
-#include "define.h"
-#include "str.h"
-#include "node.h"
-#include "token.h"
+#include "r3_define.h"
+#include "r3_str.h"
+#include "r3.h"
+#include "str_array.h"
 
 
 // String value as the index http://judy.sourceforge.net/doc/JudySL_3x.htm
@@ -28,7 +28,7 @@ node * r3_tree_create(int cap) {
 
     n->edges = (edge**) malloc( sizeof(edge*) * 10 );
     n->r3_edge_len = 0;
-    n->r3_edge_cap = 10;
+    n->r3_edge_cap = cap;
     n->endpoint = 0;
     n->combined_pattern = NULL;
     return n;
@@ -477,8 +477,6 @@ void r3_edge_free(edge * e) {
 }
 
 
-
-
 void r3_tree_dump(node * n, int level) {
     if ( n->r3_edge_len ) {
         if ( n->combined_pattern ) {

src/str.c

@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "str.h"
-#include "token.h"
-#include "define.h"
+#include "r3_str.h"
+#include "str_array.h"
+#include "r3_define.h"
 
 int strndiff(char * d1, char * d2, unsigned int n) {
     char * o = d1;

src/token.c

@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#include "token.h"
+#include "str_array.h"
 
 
 str_array * str_array_create(int cap) {

tests/test_tree.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <check.h>
 #include <stdlib.h>
-#include "str.h"
-#include "node.h"
-#include "token.h"
+#include "r3_str.h"
+#include "r3.h"
+#include "str_array.h"
 
 #include <sys/time.h>