From 0072b618b6d14081eb682cf90ff6d7d9abff409b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Tue, 12 Oct 2021 10:52:44 +0200 Subject: [PATCH 1/4] Check for existence of stdbool.h during CMake builds The headerfile is searched for during autogen/autoconf builds to determine when to include stdbool.h. This let CMake builds have the same behavior. --- CMakeLists.txt | 2 ++ config.h.cmake | 1 + 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4e42c9..5223166 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,10 @@ find_package(Check) find_package(PCRE REQUIRED) include(CheckSymbolExists) +include(CheckIncludeFile) check_symbol_exists(strdup string.h HAVE_STRDUP) check_symbol_exists(strndup string.h HAVE_STRNDUP) +check_include_file(stdbool.h HAVE_STDBOOL_H) configure_file(config.h.cmake config.h) add_subdirectory(src) diff --git a/config.h.cmake b/config.h.cmake index 4a3a9da..95111a4 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,2 +1,3 @@ #cmakedefine HAVE_STRDUP @HAVE_STRDUP@ #cmakedefine HAVE_STRNDUP @HAVE_STRNDUP@ +#cmakedefine HAVE_STDBOOL_H @HAVE_STDBOOL_H@ From 4babe735e846dc5ca079864d74e15f552e203e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Tue, 12 Oct 2021 11:18:45 +0200 Subject: [PATCH 2/4] Remove cyclic dependency between str_array.h and r3.h This also makes sure we dont get warnings regarding bool redefinitions when building with clang. --- include/r3.h | 19 +++++-------------- include/str_array.h | 10 +++++++++- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/r3.h b/include/r3.h index 0b6dde6..d2d226a 100644 --- a/include/r3.h +++ b/include/r3.h @@ -13,21 +13,12 @@ #include #ifdef HAVE_STDBOOL_H - -#include - -#else - -#if !defined(bool) && !defined(__cplusplus) +# include +#elif !defined(bool) && !defined(__cplusplus) typedef unsigned char bool; -#endif -#ifndef false -# define false 0 -#endif -#ifndef true -# define true 1 -#endif - +# define bool bool /* For redefinition guards */ +# define false 0 +# define true 1 #endif #include "str_array.h" diff --git a/include/str_array.h b/include/str_array.h index 778c807..b098436 100644 --- a/include/str_array.h +++ b/include/str_array.h @@ -8,9 +8,17 @@ #ifndef STR_ARRAY_H #define STR_ARRAY_H -#include "r3.h" #include "memory.h" +#ifdef HAVE_STDBOOL_H +# include +#elif !defined(bool) && !defined(__cplusplus) +typedef unsigned char bool; +# define bool bool /* For redefinition guards */ +# define false 0 +# define true 1 +#endif + typedef struct _str_array { R3_VECTOR(r3_iovec_t) slugs; R3_VECTOR(r3_iovec_t) tokens; From 673bb2f6d9a126b6fbdb3b770d71f68fb5175d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Tue, 12 Oct 2021 11:26:02 +0200 Subject: [PATCH 3/4] Remove declarations for nonexisting functions in str_array.h --- include/str_array.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/include/str_array.h b/include/str_array.h index b098436..aa10906 100644 --- a/include/str_array.h +++ b/include/str_array.h @@ -24,16 +24,6 @@ typedef struct _str_array { R3_VECTOR(r3_iovec_t) tokens; } str_array; -// str_array * str_array_create(int cap); - -bool str_array_slugs_full(const str_array * l); - -// bool str_array_tokens_full(const str_array * l); - -// bool str_array_resize(str_array *l, int new_cap); - -// bool str_array_append_slug(str_array * l, char * slug); - bool str_array_append(str_array * l, const char * token, unsigned int len); void str_array_free(str_array *l); @@ -42,8 +32,6 @@ void str_array_dump_slugs(const str_array *l); void str_array_dump(const str_array *l); -str_array * split_route_pattern(char *pattern, int pattern_len); - #define str_array_fetch(t,i) t->tokens[i] #define str_array_len(t) t->len #define str_array_cap(t) t->cap From 383717a8c7f67fd321fb078350ea9063bd872133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Svensson?= Date: Tue, 12 Oct 2021 11:34:05 +0200 Subject: [PATCH 4/4] Update the faulty access macros for str_array Adds a testcase for the usage of the access macros, and also updates the testsuite to only include what str_array requires. This shows that str_array can be used separately by users. --- include/str_array.h | 6 ++--- tests/check_str_array.c | 55 +++++++++++++++++++++++++++++++---------- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/include/str_array.h b/include/str_array.h index aa10906..309d39b 100644 --- a/include/str_array.h +++ b/include/str_array.h @@ -32,8 +32,8 @@ void str_array_dump_slugs(const str_array *l); void str_array_dump(const str_array *l); -#define str_array_fetch(t,i) t->tokens[i] -#define str_array_len(t) t->len -#define str_array_cap(t) t->cap +#define str_array_fetch(t,i) t->tokens.entries[i] +#define str_array_len(t) t->tokens.size +#define str_array_cap(t) t->tokens.capacity #endif /* !STR_ARRAY_H */ diff --git a/tests/check_str_array.c b/tests/check_str_array.c index d9c471d..231b0ac 100644 --- a/tests/check_str_array.c +++ b/tests/check_str_array.c @@ -8,31 +8,59 @@ #include #include #include -#include "r3.h" -#include "r3_slug.h" +#include "str_array.h" START_TEST (test_str_array) { - match_entry * entry = match_entry_create("/foo"); - ck_assert(entry); + str_array *vars = r3_mem_alloc(sizeof(str_array)); + memset(vars, 0, sizeof(*vars)); char *test_str = "abc"; - ck_assert( str_array_append(&entry->vars, test_str, strlen(test_str))); - ck_assert( entry->vars.tokens.size == 1 ); + ck_assert( str_array_append(vars, test_str, strlen(test_str))); + ck_assert( vars->tokens.size == 1 ); char *test_str1 = "foo"; - ck_assert( str_array_append(&entry->vars, test_str1, strlen(test_str))); - ck_assert( entry->vars.tokens.size == 2 ); + ck_assert( str_array_append(vars, test_str1, strlen(test_str1))); + ck_assert( vars->tokens.size == 2 ); char *test_str2 = "bar"; - ck_assert( str_array_append(&entry->vars, test_str2, strlen(test_str))); - ck_assert( entry->vars.tokens.size == 3 ); + ck_assert( str_array_append(vars, test_str2, strlen(test_str2))); + ck_assert( vars->tokens.size == 3 ); char *test_str3 = "zoo"; - ck_assert( str_array_append(&entry->vars, test_str3, strlen(test_str))); - ck_assert( entry->vars.tokens.size == 4 ); + ck_assert( str_array_append(vars, test_str3, strlen(test_str3))); + ck_assert( vars->tokens.size == 4 ); - match_entry_free(entry); + str_array_free(vars); + free(vars); +} +END_TEST + +START_TEST (test_access_macros) +{ + str_array *vars = r3_mem_alloc(sizeof(str_array)); + memset(vars, 0, sizeof(*vars)); + ck_assert( str_array_len(vars) == 0); + ck_assert( str_array_cap(vars) == 0); + + r3_vector_reserve(NULL, &vars->tokens, 4); + ck_assert( str_array_len(vars) == 0); + ck_assert( str_array_cap(vars) == 4); + + char *token1 = "first"; + char *token2 = "second"; + ck_assert( str_array_append(vars, token1, strlen(token1))); + ck_assert( str_array_append(vars, token2, strlen(token2))); + ck_assert( str_array_len(vars) == 2); + ck_assert( str_array_cap(vars) == 4); + + ck_assert( strncmp(str_array_fetch(vars,0).base, "first", 5) == 0); + ck_assert( str_array_fetch(vars,0).len == 5); + ck_assert( strncmp(str_array_fetch(vars,1).base, "second", 6) == 0); + ck_assert( str_array_fetch(vars,1).len == 6); + + str_array_free(vars); + free(vars); } END_TEST @@ -40,6 +68,7 @@ Suite* r3_suite (void) { Suite *suite = suite_create("str_array test"); TCase *tcase = tcase_create("testcase"); tcase_add_test(tcase, test_str_array); + tcase_add_test(tcase, test_access_macros); suite_add_tcase(suite, tcase); return suite; }