Move private functions to private header files

Makefile.am

@@ -24,7 +24,7 @@ r3_include_HEADERS = \
 	include/r3.h \
 	include/r3_define.h \
 	include/r3_list.h \
-	include/r3_str.h \
+	include/r3_slug.h \
 	include/r3_gvc.h \
 	include/r3_json.h \
 	include/str_array.h \

gen_route_tests.rb

@@ -10,7 +10,7 @@ puts <<END
 #include <stdlib.h>
 #include <assert.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "zmalloc.h"
 
 START_TEST (test_routes)

include/r3.h

@@ -14,7 +14,7 @@
 #include <stdbool.h>
 #include "r3_define.h"
 #include "str_array.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 
 #ifdef __cplusplus
 extern "C" {

include/r3_slug.h

@@ -4,8 +4,8 @@
  *
  * Distributed under terms of the MIT license.
  */
-#ifndef R3_STR_H
-#define R3_STR_H
+#ifndef R3_SLUG_H
+#define R3_SLUG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,4 +27,4 @@ char * r3_inside_slug(const char * needle, int needle_len, char *offset, char **
 }
 #endif
 
-#endif /* !R3_STR_H */
+#endif /* !R3_SLUG_H */

package.json

@@ -5,5 +5,5 @@
   "description": "high-performance path dispatching library",
   "keywords": ["path", "dispatch", "performance", "r3", "c9s"],
   "license": "MIT",
-  "src": ["3rdparty/zmalloc.c", "3rdparty/zmalloc.h", "include/r3.h", "include/r3.hpp", "include/r3_define.h", "include/r3_gvc.h", "include/r3_json.h", "include/r3_list.h", "include/r3_str.h", "include/str_array.h", "src/edge.c", "src/gvc.c", "src/json.c", "src/list.c", "src/match_entry.c", "src/node.c", "src/slug.c", "src/slug.h", "src/str.c", "src/token.c"]
+  "src": ["3rdparty/zmalloc.c", "3rdparty/zmalloc.h", "include/r3.h", "include/r3.hpp", "include/r3_define.h", "include/r3_gvc.h", "include/r3_json.h", "include/r3_list.h", "include/r3_slug.h", "include/str_array.h", "src/edge.c", "src/gvc.c", "src/json.c", "src/list.c", "src/match_entry.c", "src/node.c", "src/slug.c", "src/slug.h", "src/str.c", "src/token.c"]
 }

src/edge.c

@@ -16,7 +16,7 @@
 // PCRE
 #include <pcre.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "slug.h"
 #include "zmalloc.h"
 

src/node.c

@@ -9,8 +9,9 @@
 #include <pcre.h>
 
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "slug.h"
+#include "str.h"
 #include "zmalloc.h"
 
 #ifdef __GNUC__

src/slug.c

@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "slug.h"
 #include "zmalloc.h"
 

src/slug.h

@@ -4,8 +4,8 @@
  *
  * Distributed under terms of the MIT license.
  */
-#ifndef R3_SLUG_H
-#define R3_SLUG_H
+#ifndef SLUG_H
+#define SLUG_H
 
 typedef struct {
     /**

src/str.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <assert.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "str.h"
 #include "slug.h"
 #include "zmalloc.h"
@@ -141,10 +141,10 @@ char * r3_slug_find_pattern(const char *s1, int *len) {
  * given a slug string, duplicate the parameter name string of the slug
  */
 char * r3_slug_find_name(const char *s1, int *len) {
-    char *c;
-    char *s2;
+    char * c;
+    char * s2;
     int cnt = 0;
-    c = s1;
+    c = (char*) s1;
     
     while(1) {
         if(*c == '{') cnt++;

src/token.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <assert.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "str_array.h"
 #include "zmalloc.h"
 

tests/bench.c

@@ -12,7 +12,7 @@
 #include <stdarg.h>     /* va_list, va_start, va_arg, va_end */
 
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "zmalloc.h"
 #include "bench.h"
 

tests/check_gvc.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include "r3.h"
 #include "r3_gvc.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "bench.h"
 
 START_TEST (test_gvc_render_dot)

tests/check_json.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <json-c/json.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "r3_json.h"
 #include "zmalloc.h"
 

tests/check_routes.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "zmalloc.h"
 
 START_TEST (test_routes)

tests/check_slug.c

@@ -9,7 +9,7 @@
 #include <check.h>
 #include <stdlib.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "zmalloc.h"
 #include "slug.h"
 

tests/check_str_array.c

@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <check.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "zmalloc.h"
 
 START_TEST (test_str_array)

tests/check_tree.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "r3.h"
-#include "r3_str.h"
+#include "r3_slug.h"
 #include "zmalloc.h"
 #include "bench.h"