From 0485554d44d61a6fb3cd5107f87e2e3bc6f30fc4 Mon Sep 17 00:00:00 2001 From: Yuansheng Date: Sat, 20 Jul 2019 07:06:56 +0800 Subject: [PATCH 1/2] change(tests/check_slug): avoided compiling warning. --- tests/check_slug.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/check_slug.c b/tests/check_slug.c index d445c0b..c9e0f28 100644 --- a/tests/check_slug.c +++ b/tests/check_slug.c @@ -52,7 +52,7 @@ END_TEST START_TEST (test_r3_slug_find_pattern) { - int len; + unsigned int len; char *test_str = "{name:\\s+}"; const char * namerex = r3_slug_find_pattern(test_str, strlen(test_str), &len); ck_assert( strncmp(namerex, "\\s+", len) == 0 ); @@ -61,7 +61,7 @@ END_TEST START_TEST (test_r3_slug_find_name) { - int len; + unsigned int len; char *test_str = "{name:\\s+}"; const char * namerex = r3_slug_find_name(test_str, strlen(test_str), &len); ck_assert( strncmp(namerex, "name", len) == 0 ); @@ -70,7 +70,7 @@ END_TEST START_TEST (test_r3_slug_find_name_without_pattern) { - int len; + unsigned int len; char *test_str = "{name}"; const char * namerex = r3_slug_find_name(test_str, strlen(test_str), &len); ck_assert( strncmp(namerex, "name", len) == 0 ); @@ -79,7 +79,7 @@ END_TEST START_TEST (test_r3_slug_find_name_with_multiple_slug) { - int len; + unsigned int len; char *test_str = "{name}/{name2}"; const char * namerex = r3_slug_find_name(test_str, strlen(test_str), &len); ck_assert( strncmp(namerex, "name", len) == 0 ); @@ -88,7 +88,7 @@ END_TEST START_TEST (test_r3_slug_find_placeholder) { - int slug_len = 0; + unsigned int slug_len = 0; const char * slug; char *test_str = "/user/{name:\\s+}/to/{id}"; slug = r3_slug_find_placeholder(test_str, strlen(test_str), &slug_len); @@ -118,7 +118,7 @@ START_TEST (test_incomplete_slug) char * pattern = "/user/{name:\\d{3}}/to/{id"; cnt = r3_slug_count(pattern, strlen(pattern), &errstr); ck_assert_int_eq(cnt, -1); - ck_assert(errstr); + ck_assert(errstr != NULL); printf("%s\n",errstr); free(errstr); } @@ -190,7 +190,7 @@ END_TEST START_TEST (test_r3_slug_find_placeholder_with_broken_slug) { - int slug_len = 0; + unsigned int slug_len = 0; char *sl_test = "/user/{name:\\s+/to/{id"; const char * slug = r3_slug_find_placeholder(sl_test, strlen(sl_test), &slug_len); ck_assert(slug == 0); @@ -214,7 +214,7 @@ Suite* r3_suite (void) { tcase_add_test(tcase, test_r3_slug_find_name); tcase_add_test(tcase, test_r3_slug_find_name_without_pattern); tcase_add_test(tcase, test_r3_slug_find_name_with_multiple_slug); - + // tcase_add_test(tcase, test_slug_parse_with_pattern); // tcase_add_test(tcase, test_slug_parse_without_pattern); From fdc698f924189d75c5e77e3802c1832bdaeb44f9 Mon Sep 17 00:00:00 2001 From: Yuansheng Date: Sat, 20 Jul 2019 07:12:37 +0800 Subject: [PATCH 2/2] change: avoided compiling warning message. --- src/node.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node.c b/src/node.c index 8ccf79c..452ef13 100644 --- a/src/node.c +++ b/src/node.c @@ -285,8 +285,8 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l const char *pp; const char *pp_end; - info("n->compare_type: %d\n",n->compare_type); - info("n->pcre_pattern: %s\n",n->pcre_pattern); + info("n->compare_type: %d\n", n->compare_type); + info("n->pcre_pattern: %s\n", (char *)n->pcre_pattern); if (n->compare_type == NODE_COMPARE_OPCODE) { info("NODE_COMPARE_OPCODE\n");