From da1ca3aad06323024012224b377ec74d97c8b298 Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Thu, 10 Sep 2020 15:37:15 +0200 Subject: [PATCH] Fixes 32 bit compile issue, #135 Gbp-Pq: Name 0001-Fixes-32-bit-compile-issue-135.patch --- include/llist/llist.h | 2 ++ include/siri/db/query.h | 8 +++++ include/siri/grammar/gramp.h | 5 ++++ include/siri/inc.h | 14 +++++++++ include/siri/version.h | 4 +-- src/llist/llist.c | 19 ++++++++++++ src/siri/db/query.c | 71 ++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 include/siri/inc.h diff --git a/include/llist/llist.h b/include/llist/llist.h index e5c57250..b49bc6fe 100644 --- a/include/llist/llist.h +++ b/include/llist/llist.h @@ -11,9 +11,11 @@ typedef struct llist_node_s llist_node_t; #include typedef int (*llist_cb)(void * data, void * args); +typedef void (*llist_destroy_cb)(void * data); llist_t * llist_new(void); void llist_free_cb(llist_t * llist, llist_cb cb, void * args); +void llist_destroy(llist_t * llist, llist_destroy_cb cb); int llist_append(llist_t * llist, void * data); int llist_walk(llist_t * llist, llist_cb cb, void * args); void llist_walkn(llist_t * llist, size_t * n, llist_cb cb, void * args); diff --git a/include/siri/db/query.h b/include/siri/db/query.h index fbe2ef76..b7f8971f 100644 --- a/include/siri/db/query.h +++ b/include/siri/db/query.h @@ -44,6 +44,11 @@ typedef struct siridb_query_s siridb_query_t; #include #include #include +#include + +#if SIRIDB_EXPR_ALLOC +#include +#endif void siridb_query_run( uint16_t pid, @@ -83,6 +88,9 @@ struct siridb_query_s cleri_parse_t * pr; siridb_nodes_t * nodes; struct timespec start; +#if SIRIDB_EXPR_ALLOC + llist_t * expr_cache; +#endif }; #endif /* SIRIDB_QUERY_H_ */ diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h index 1c1826f9..f2796951 100644 --- a/include/siri/grammar/gramp.h +++ b/include/siri/grammar/gramp.h @@ -26,9 +26,14 @@ #if CLERI_VERSION_MINOR >= 12 +#if SIRIDB_IS64BIT #define CLERI_NODE_DATA(__node) ((int64_t)(__node)->data) #define CLERI_NODE_DATA_ADDR(__node) ((int64_t *) &(__node)->data) #else +#define CLERI_NODE_DATA(__node) *((int64_t *)(__node)->data) +#define CLERI_NODE_DATA_ADDR(__node) ((int64_t *)(__node)->data) +#endif +#else #define CLERI_NODE_DATA(__node) (__node)->result #define CLERI_NODE_DATA_ADDR(__node) &(__node)->result #endif diff --git a/include/siri/inc.h b/include/siri/inc.h new file mode 100644 index 00000000..c55c7c12 --- /dev/null +++ b/include/siri/inc.h @@ -0,0 +1,14 @@ +#if UINTPTR_MAX == 0xffffffff +#define SIRIDB_IS64BIT 0 +#elif UINTPTR_MAX == 0xffffffffffffffff +#define SIRIDB_IS64BIT 1 +#else +#define SIRIDB_IS64BIT __WORDSIZE == 64 +#endif + + +#if SIRIDB_IS64BIT +#define SIRIDB_EXPR_ALLOC 0 +#else +#define SIRIDB_EXPR_ALLOC CLERI_VERSION_MINOR >= 12 +#endif diff --git a/include/siri/version.h b/include/siri/version.h index ac332a39..26b90996 100644 --- a/include/siri/version.h +++ b/include/siri/version.h @@ -6,7 +6,7 @@ #define SIRIDB_VERSION_MAJOR 2 #define SIRIDB_VERSION_MINOR 0 -#define SIRIDB_VERSION_PATCH 38 +#define SIRIDB_VERSION_PATCH 39 /* * Use SIRIDB_VERSION_PRE_RELEASE for alpha release versions. @@ -15,7 +15,7 @@ * Note that debian alpha packages should use versions like this: * 2.0.34-0alpha0 */ -#define SIRIDB_VERSION_PRE_RELEASE "" +#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0" #ifndef NDEBUG #define SIRIDB_VERSION_BUILD_RELEASE "+debug" diff --git a/src/llist/llist.c b/src/llist/llist.c index 893ed363..adb8aa91 100644 --- a/src/llist/llist.c +++ b/src/llist/llist.c @@ -42,6 +42,25 @@ void llist_free_cb(llist_t * llist, llist_cb cb, void * args) free(llist); } +/* + * Destroys the linked list and calls a call-back function on each item. + * The result of the call back function will be ignored. + */ +void llist_destroy(llist_t * llist, llist_destroy_cb cb) +{ + llist_node_t * node = llist->first; + llist_node_t * next; + + while (node != NULL) + { + cb(node->data); + next = node->next; + free(node); + node = next; + } + free(llist); +} + /* * Appends to the end of the list. * diff --git a/src/siri/db/query.c b/src/siri/db/query.c index ae744d09..941614a7 100644 --- a/src/siri/db/query.c +++ b/src/siri/db/query.c @@ -25,6 +25,11 @@ #include #include +#if SIRIDB_EXPR_ALLOC +#include +#endif + + #define QUERY_TOO_LONG -1 #define QUERY_MAX_LENGTH 8192 #define QUERY_EXTRA_ALLOC_SIZE 200 @@ -32,7 +37,12 @@ static void QUERY_send_invalid_error(uv_async_t * handle); static void QUERY_parse(uv_async_t * handle); -static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker); +static int QUERY_walk( +#if SIRIDB_EXPR_ALLOC + siridb_query_t * query, +#endif + cleri_node_t * node, + siridb_walker_t * walker); static int QUERY_to_packer(qp_packer_t * packer, siridb_query_t * query); static int QUERY_time_expr( cleri_node_t * node, @@ -82,6 +92,17 @@ void siridb_query_run( return; } + #if SIRIDB_EXPR_ALLOC + if ((query->expr_cache = llist_new()) == NULL) + { + ERR_ALLOC + free(query->q); + free(query); + free(handle); + return; + } + #endif + /* * Set start time. * (must be real time since we translate now with this value) @@ -160,6 +181,13 @@ void siridb_query_free(uv_handle_t * handle) cleri_parse_free(query->pr); } + #if SIRIDB_EXPR_ALLOC + if (query->expr_cache != NULL) + { + llist_destroy(query->expr_cache, (llist_destroy_cb) free); + } + #endif + /* decrement client reference counter */ sirinet_stream_decref(query->client); @@ -589,6 +617,9 @@ static void QUERY_parse(uv_async_t * handle) } if ((rc = QUERY_walk( +#if SIRIDB_EXPR_ALLOC + query, +#endif query->pr->tree->children->node, walker))) { @@ -678,7 +709,12 @@ static int QUERY_to_packer(qp_packer_t * packer, siridb_query_t * query) return 0; } -static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) +static int QUERY_walk( +#if SIRIDB_EXPR_ALLOC + siridb_query_t * query, +#endif + cleri_node_t * node, + siridb_walker_t * walker) { int rc; uint32_t gid; @@ -723,6 +759,18 @@ static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) /* terminate buffer */ buffer[EXPR_MAX_SIZE - size] = 0; + #if SIRIDB_EXPR_ALLOC + { + int64_t * itmp = malloc(sizeof(int64_t)); + if (itmp == NULL || llist_append(query->expr_cache, itmp)) + { + free(itmp); + return EXPR_MEM_ALLOC_ERR; + } + node->data = itmp; + } + #endif + /* evaluate the expression */ if ((rc = expr_parse(CLERI_NODE_DATA_ADDR(node), buffer))) { @@ -751,6 +799,18 @@ static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) /* terminate buffer */ buffer[EXPR_MAX_SIZE - size] = 0; + #if SIRIDB_EXPR_ALLOC + { + int64_t * itmp = malloc(sizeof(int64_t)); + if (itmp == NULL || llist_append(query->expr_cache, itmp)) + { + free(itmp); + return EXPR_MEM_ALLOC_ERR; + } + node->data = itmp; + } + #endif + /* evaluate the expression */ if ((rc = expr_parse(CLERI_NODE_DATA_ADDR(node), buffer))) { @@ -770,7 +830,12 @@ static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) { current = current->node->children; } - if ((rc = QUERY_walk(current->node, walker))) + if ((rc = QUERY_walk( +#if SIRIDB_EXPR_ALLOC + query, +#endif + current->node, + walker))) { return rc; } -- cgit v1.2.3 From b6ebdeb8f6f5a575c464219f3430691741d9078a Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Thu, 10 Sep 2020 16:47:25 +0200 Subject: [PATCH] Added missing import Gbp-Pq: Name 0001-Added-missing-import.patch --- include/siri/grammar/gramp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h index f2796951..df8d81f9 100644 --- a/include/siri/grammar/gramp.h +++ b/include/siri/grammar/gramp.h @@ -11,6 +11,7 @@ #define SIRI_GRAMP_H_ #include +#include /* keywords */ #define KW_OFFSET CLERI_GID_K_ACCESS -- cgit v1.2.3 From d73265f7d0e0769555c10ec5d6bd08472aeccb04 Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Thu, 10 Sep 2020 15:37:15 +0200 Subject: [PATCH] Fixes 32 bit compile issue, #135 Gbp-Pq: Name 0001-Fixes-32-bit-compile-issue-135.patch --- include/llist/llist.h | 2 ++ include/siri/db/query.h | 8 +++++ include/siri/grammar/gramp.h | 5 ++++ include/siri/inc.h | 14 +++++++++ include/siri/version.h | 4 +-- src/llist/llist.c | 19 ++++++++++++ src/siri/db/query.c | 71 ++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 include/siri/inc.h diff --git a/include/llist/llist.h b/include/llist/llist.h index e5c57250..b49bc6fe 100644 --- a/include/llist/llist.h +++ b/include/llist/llist.h @@ -11,9 +11,11 @@ typedef struct llist_node_s llist_node_t; #include typedef int (*llist_cb)(void * data, void * args); +typedef void (*llist_destroy_cb)(void * data); llist_t * llist_new(void); void llist_free_cb(llist_t * llist, llist_cb cb, void * args); +void llist_destroy(llist_t * llist, llist_destroy_cb cb); int llist_append(llist_t * llist, void * data); int llist_walk(llist_t * llist, llist_cb cb, void * args); void llist_walkn(llist_t * llist, size_t * n, llist_cb cb, void * args); diff --git a/include/siri/db/query.h b/include/siri/db/query.h index fbe2ef76..b7f8971f 100644 --- a/include/siri/db/query.h +++ b/include/siri/db/query.h @@ -44,6 +44,11 @@ typedef struct siridb_query_s siridb_query_t; #include #include #include +#include + +#if SIRIDB_EXPR_ALLOC +#include +#endif void siridb_query_run( uint16_t pid, @@ -83,6 +88,9 @@ struct siridb_query_s cleri_parse_t * pr; siridb_nodes_t * nodes; struct timespec start; +#if SIRIDB_EXPR_ALLOC + llist_t * expr_cache; +#endif }; #endif /* SIRIDB_QUERY_H_ */ diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h index 1c1826f9..f2796951 100644 --- a/include/siri/grammar/gramp.h +++ b/include/siri/grammar/gramp.h @@ -26,9 +26,14 @@ #if CLERI_VERSION_MINOR >= 12 +#if SIRIDB_IS64BIT #define CLERI_NODE_DATA(__node) ((int64_t)(__node)->data) #define CLERI_NODE_DATA_ADDR(__node) ((int64_t *) &(__node)->data) #else +#define CLERI_NODE_DATA(__node) *((int64_t *)(__node)->data) +#define CLERI_NODE_DATA_ADDR(__node) ((int64_t *)(__node)->data) +#endif +#else #define CLERI_NODE_DATA(__node) (__node)->result #define CLERI_NODE_DATA_ADDR(__node) &(__node)->result #endif diff --git a/include/siri/inc.h b/include/siri/inc.h new file mode 100644 index 00000000..c55c7c12 --- /dev/null +++ b/include/siri/inc.h @@ -0,0 +1,14 @@ +#if UINTPTR_MAX == 0xffffffff +#define SIRIDB_IS64BIT 0 +#elif UINTPTR_MAX == 0xffffffffffffffff +#define SIRIDB_IS64BIT 1 +#else +#define SIRIDB_IS64BIT __WORDSIZE == 64 +#endif + + +#if SIRIDB_IS64BIT +#define SIRIDB_EXPR_ALLOC 0 +#else +#define SIRIDB_EXPR_ALLOC CLERI_VERSION_MINOR >= 12 +#endif diff --git a/include/siri/version.h b/include/siri/version.h index ac332a39..26b90996 100644 --- a/include/siri/version.h +++ b/include/siri/version.h @@ -6,7 +6,7 @@ #define SIRIDB_VERSION_MAJOR 2 #define SIRIDB_VERSION_MINOR 0 -#define SIRIDB_VERSION_PATCH 38 +#define SIRIDB_VERSION_PATCH 39 /* * Use SIRIDB_VERSION_PRE_RELEASE for alpha release versions. @@ -15,7 +15,7 @@ * Note that debian alpha packages should use versions like this: * 2.0.34-0alpha0 */ -#define SIRIDB_VERSION_PRE_RELEASE "" +#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0" #ifndef NDEBUG #define SIRIDB_VERSION_BUILD_RELEASE "+debug" diff --git a/src/llist/llist.c b/src/llist/llist.c index 893ed363..adb8aa91 100644 --- a/src/llist/llist.c +++ b/src/llist/llist.c @@ -42,6 +42,25 @@ void llist_free_cb(llist_t * llist, llist_cb cb, void * args) free(llist); } +/* + * Destroys the linked list and calls a call-back function on each item. + * The result of the call back function will be ignored. + */ +void llist_destroy(llist_t * llist, llist_destroy_cb cb) +{ + llist_node_t * node = llist->first; + llist_node_t * next; + + while (node != NULL) + { + cb(node->data); + next = node->next; + free(node); + node = next; + } + free(llist); +} + /* * Appends to the end of the list. * diff --git a/src/siri/db/query.c b/src/siri/db/query.c index ae744d09..941614a7 100644 --- a/src/siri/db/query.c +++ b/src/siri/db/query.c @@ -25,6 +25,11 @@ #include #include +#if SIRIDB_EXPR_ALLOC +#include +#endif + + #define QUERY_TOO_LONG -1 #define QUERY_MAX_LENGTH 8192 #define QUERY_EXTRA_ALLOC_SIZE 200 @@ -32,7 +37,12 @@ static void QUERY_send_invalid_error(uv_async_t * handle); static void QUERY_parse(uv_async_t * handle); -static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker); +static int QUERY_walk( +#if SIRIDB_EXPR_ALLOC + siridb_query_t * query, +#endif + cleri_node_t * node, + siridb_walker_t * walker); static int QUERY_to_packer(qp_packer_t * packer, siridb_query_t * query); static int QUERY_time_expr( cleri_node_t * node, @@ -82,6 +92,17 @@ void siridb_query_run( return; } + #if SIRIDB_EXPR_ALLOC + if ((query->expr_cache = llist_new()) == NULL) + { + ERR_ALLOC + free(query->q); + free(query); + free(handle); + return; + } + #endif + /* * Set start time. * (must be real time since we translate now with this value) @@ -160,6 +181,13 @@ void siridb_query_free(uv_handle_t * handle) cleri_parse_free(query->pr); } + #if SIRIDB_EXPR_ALLOC + if (query->expr_cache != NULL) + { + llist_destroy(query->expr_cache, (llist_destroy_cb) free); + } + #endif + /* decrement client reference counter */ sirinet_stream_decref(query->client); @@ -589,6 +617,9 @@ static void QUERY_parse(uv_async_t * handle) } if ((rc = QUERY_walk( +#if SIRIDB_EXPR_ALLOC + query, +#endif query->pr->tree->children->node, walker))) { @@ -678,7 +709,12 @@ static int QUERY_to_packer(qp_packer_t * packer, siridb_query_t * query) return 0; } -static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) +static int QUERY_walk( +#if SIRIDB_EXPR_ALLOC + siridb_query_t * query, +#endif + cleri_node_t * node, + siridb_walker_t * walker) { int rc; uint32_t gid; @@ -723,6 +759,18 @@ static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) /* terminate buffer */ buffer[EXPR_MAX_SIZE - size] = 0; + #if SIRIDB_EXPR_ALLOC + { + int64_t * itmp = malloc(sizeof(int64_t)); + if (itmp == NULL || llist_append(query->expr_cache, itmp)) + { + free(itmp); + return EXPR_MEM_ALLOC_ERR; + } + node->data = itmp; + } + #endif + /* evaluate the expression */ if ((rc = expr_parse(CLERI_NODE_DATA_ADDR(node), buffer))) { @@ -751,6 +799,18 @@ static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) /* terminate buffer */ buffer[EXPR_MAX_SIZE - size] = 0; + #if SIRIDB_EXPR_ALLOC + { + int64_t * itmp = malloc(sizeof(int64_t)); + if (itmp == NULL || llist_append(query->expr_cache, itmp)) + { + free(itmp); + return EXPR_MEM_ALLOC_ERR; + } + node->data = itmp; + } + #endif + /* evaluate the expression */ if ((rc = expr_parse(CLERI_NODE_DATA_ADDR(node), buffer))) { @@ -770,7 +830,12 @@ static int QUERY_walk(cleri_node_t * node, siridb_walker_t * walker) { current = current->node->children; } - if ((rc = QUERY_walk(current->node, walker))) + if ((rc = QUERY_walk( +#if SIRIDB_EXPR_ALLOC + query, +#endif + current->node, + walker))) { return rc; } -- cgit v1.2.3 From 15700a8b44920d659dc85b5f63e228565a11bc12 Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Thu, 10 Sep 2020 16:47:25 +0200 Subject: [PATCH] Added missing import Gbp-Pq: Name 0001-Added-missing-import.patch --- include/siri/grammar/gramp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h index f2796951..df8d81f9 100644 --- a/include/siri/grammar/gramp.h +++ b/include/siri/grammar/gramp.h @@ -11,6 +11,7 @@ #define SIRI_GRAMP_H_ #include +#include /* keywords */ #define KW_OFFSET CLERI_GID_K_ACCESS -- cgit v1.2.3 From fb30dbc6b840cf19e5c3cda80ea98dd549131b9d Mon Sep 17 00:00:00 2001 From: SiriDB Maintainers Date: Fri, 19 Feb 2021 20:37:54 +0100 Subject: cross =================================================================== Gbp-Pq: Name cross.patch --- Release/makefile | 2 +- Release/src/argparse/subdir.mk | 2 +- Release/src/base64/subdir.mk | 2 +- Release/src/cexpr/subdir.mk | 2 +- Release/src/cfgparser/subdir.mk | 2 +- Release/src/ctree/subdir.mk | 2 +- Release/src/expr/subdir.mk | 2 +- Release/src/imap/subdir.mk | 2 +- Release/src/iso8601/subdir.mk | 2 +- Release/src/lib/subdir.mk | 2 +- Release/src/llist/subdir.mk | 2 +- Release/src/lock/subdir.mk | 2 +- Release/src/logger/subdir.mk | 2 +- Release/src/omap/subdir.mk | 2 +- Release/src/owcrypt/subdir.mk | 2 +- Release/src/procinfo/subdir.mk | 2 +- Release/src/qpack/subdir.mk | 2 +- Release/src/qpjson/subdir.mk | 2 +- Release/src/siri/args/subdir.mk | 2 +- Release/src/siri/cfg/subdir.mk | 2 +- Release/src/siri/db/subdir.mk | 2 +- Release/src/siri/file/subdir.mk | 2 +- Release/src/siri/grammar/subdir.mk | 2 +- Release/src/siri/help/subdir.mk | 2 +- Release/src/siri/net/subdir.mk | 2 +- Release/src/siri/service/subdir.mk | 2 +- Release/src/siri/subdir.mk | 2 +- Release/src/timeit/subdir.mk | 2 +- Release/src/vec/subdir.mk | 2 +- Release/src/xmath/subdir.mk | 2 +- Release/src/xpath/subdir.mk | 2 +- Release/src/xstr/subdir.mk | 2 +- Release/subdir.mk | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Release/makefile b/Release/makefile index 497e4198..3600bbc8 100644 --- a/Release/makefile +++ b/Release/makefile @@ -68,7 +68,7 @@ all: siridb-server siridb-server: $(OBJS) $(USER_OBJS) @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' - gcc -o "siridb-server" $(OBJS) $(USER_OBJS) $(LDFLAGS) $(LIBS) $(CRYPT) $(UUID) + $(CC) -o "siridb-server" $(OBJS) $(USER_OBJS) $(LDFLAGS) $(LIBS) $(CRYPT) $(UUID) @echo 'Finished building target: $@' @echo ' ' diff --git a/Release/src/argparse/subdir.mk b/Release/src/argparse/subdir.mk index bd8ef4b9..54e27f54 100644 --- a/Release/src/argparse/subdir.mk +++ b/Release/src/argparse/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/argparse/%.o: ../src/argparse/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/base64/subdir.mk b/Release/src/base64/subdir.mk index 31aeb9c5..d4373c5d 100644 --- a/Release/src/base64/subdir.mk +++ b/Release/src/base64/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/base64/%.o: ../src/base64/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/cexpr/subdir.mk b/Release/src/cexpr/subdir.mk index b1998365..cc4f0689 100644 --- a/Release/src/cexpr/subdir.mk +++ b/Release/src/cexpr/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/cexpr/%.o: ../src/cexpr/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/cfgparser/subdir.mk b/Release/src/cfgparser/subdir.mk index ef970f57..417dbad7 100644 --- a/Release/src/cfgparser/subdir.mk +++ b/Release/src/cfgparser/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/cfgparser/%.o: ../src/cfgparser/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/ctree/subdir.mk b/Release/src/ctree/subdir.mk index 80336986..c5814dc9 100644 --- a/Release/src/ctree/subdir.mk +++ b/Release/src/ctree/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/ctree/%.o: ../src/ctree/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/expr/subdir.mk b/Release/src/expr/subdir.mk index 1206fe12..f4789cf4 100644 --- a/Release/src/expr/subdir.mk +++ b/Release/src/expr/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/expr/%.o: ../src/expr/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/imap/subdir.mk b/Release/src/imap/subdir.mk index c628b521..c19c81ce 100644 --- a/Release/src/imap/subdir.mk +++ b/Release/src/imap/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/imap/%.o: ../src/imap/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/iso8601/subdir.mk b/Release/src/iso8601/subdir.mk index 62a8ae2d..f4a095bb 100644 --- a/Release/src/iso8601/subdir.mk +++ b/Release/src/iso8601/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/iso8601/%.o: ../src/iso8601/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/lib/subdir.mk b/Release/src/lib/subdir.mk index c2b76c93..d7708c5a 100644 --- a/Release/src/lib/subdir.mk +++ b/Release/src/lib/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/lib/%.o: ../src/lib/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/llist/subdir.mk b/Release/src/llist/subdir.mk index a5678ab3..67db984f 100644 --- a/Release/src/llist/subdir.mk +++ b/Release/src/llist/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/llist/%.o: ../src/llist/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/lock/subdir.mk b/Release/src/lock/subdir.mk index 21cfa460..13f395ad 100644 --- a/Release/src/lock/subdir.mk +++ b/Release/src/lock/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/lock/%.o: ../src/lock/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/logger/subdir.mk b/Release/src/logger/subdir.mk index 7243d7c5..676db8a3 100644 --- a/Release/src/logger/subdir.mk +++ b/Release/src/logger/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/logger/%.o: ../src/logger/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/omap/subdir.mk b/Release/src/omap/subdir.mk index cd3db935..f17bc03e 100644 --- a/Release/src/omap/subdir.mk +++ b/Release/src/omap/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/omap/%.o: ../src/omap/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/owcrypt/subdir.mk b/Release/src/owcrypt/subdir.mk index a230cbfc..60220f5d 100644 --- a/Release/src/owcrypt/subdir.mk +++ b/Release/src/owcrypt/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/owcrypt/%.o: ../src/owcrypt/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/procinfo/subdir.mk b/Release/src/procinfo/subdir.mk index 1a326a7c..ab2e2f7b 100644 --- a/Release/src/procinfo/subdir.mk +++ b/Release/src/procinfo/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/procinfo/%.o: ../src/procinfo/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/qpack/subdir.mk b/Release/src/qpack/subdir.mk index cef1eca9..89ce709f 100644 --- a/Release/src/qpack/subdir.mk +++ b/Release/src/qpack/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/qpack/%.o: ../src/qpack/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/qpjson/subdir.mk b/Release/src/qpjson/subdir.mk index 515d5b6f..2ba87a9c 100644 --- a/Release/src/qpjson/subdir.mk +++ b/Release/src/qpjson/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/qpjson/%.o: ../src/qpjson/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/args/subdir.mk b/Release/src/siri/args/subdir.mk index 93f91086..b61843d8 100644 --- a/Release/src/siri/args/subdir.mk +++ b/Release/src/siri/args/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/siri/args/%.o: ../src/siri/args/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/cfg/subdir.mk b/Release/src/siri/cfg/subdir.mk index 9ab31cb4..f1296f3a 100644 --- a/Release/src/siri/cfg/subdir.mk +++ b/Release/src/siri/cfg/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/siri/cfg/%.o: ../src/siri/cfg/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/db/subdir.mk b/Release/src/siri/db/subdir.mk index 17bd2152..d641e350 100644 --- a/Release/src/siri/db/subdir.mk +++ b/Release/src/siri/db/subdir.mk @@ -139,7 +139,7 @@ C_DEPS += \ src/siri/db/%.o: ../src/siri/db/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/file/subdir.mk b/Release/src/siri/file/subdir.mk index f416aecb..9e56a084 100644 --- a/Release/src/siri/file/subdir.mk +++ b/Release/src/siri/file/subdir.mk @@ -16,7 +16,7 @@ C_DEPS += \ src/siri/file/%.o: ../src/siri/file/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/grammar/subdir.mk b/Release/src/siri/grammar/subdir.mk index c36948b7..0b8f3f3a 100644 --- a/Release/src/siri/grammar/subdir.mk +++ b/Release/src/siri/grammar/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/siri/grammar/%.o: ../src/siri/grammar/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/help/subdir.mk b/Release/src/siri/help/subdir.mk index 7e6fcd79..b168344a 100644 --- a/Release/src/siri/help/subdir.mk +++ b/Release/src/siri/help/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/siri/help/%.o: ../src/siri/help/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/net/subdir.mk b/Release/src/siri/net/subdir.mk index e47db3ff..8c9b63d7 100644 --- a/Release/src/siri/net/subdir.mk +++ b/Release/src/siri/net/subdir.mk @@ -37,6 +37,6 @@ C_DEPS += \ src/siri/net/%.o: ../src/siri/net/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/service/subdir.mk b/Release/src/siri/service/subdir.mk index 43faf517..9053e49c 100644 --- a/Release/src/siri/service/subdir.mk +++ b/Release/src/siri/service/subdir.mk @@ -19,7 +19,7 @@ C_DEPS += \ src/siri/args/%.o: ../src/siri/args/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/siri/subdir.mk b/Release/src/siri/subdir.mk index 7effb5cb..10fc189f 100644 --- a/Release/src/siri/subdir.mk +++ b/Release/src/siri/subdir.mk @@ -43,7 +43,7 @@ C_DEPS += \ src/siri/%.o: ../src/siri/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/timeit/subdir.mk b/Release/src/timeit/subdir.mk index db72799a..76530cfd 100644 --- a/Release/src/timeit/subdir.mk +++ b/Release/src/timeit/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/timeit/%.o: ../src/timeit/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/vec/subdir.mk b/Release/src/vec/subdir.mk index ce067aa5..50facc57 100644 --- a/Release/src/vec/subdir.mk +++ b/Release/src/vec/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/vec/%.o: ../src/vec/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/xmath/subdir.mk b/Release/src/xmath/subdir.mk index 943f3cee..17a2185d 100644 --- a/Release/src/xmath/subdir.mk +++ b/Release/src/xmath/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/xmath/%.o: ../src/xmath/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/xpath/subdir.mk b/Release/src/xpath/subdir.mk index 09230c18..092ea845 100644 --- a/Release/src/xpath/subdir.mk +++ b/Release/src/xpath/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/xpath/%.o: ../src/xpath/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/src/xstr/subdir.mk b/Release/src/xstr/subdir.mk index 146ac95a..674d936b 100644 --- a/Release/src/xstr/subdir.mk +++ b/Release/src/xstr/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ src/xstr/%.o: ../src/xstr/%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/Release/subdir.mk b/Release/subdir.mk index 8ba3e5f6..92aefa6e 100644 --- a/Release/subdir.mk +++ b/Release/subdir.mk @@ -13,7 +13,7 @@ C_DEPS += \ %.o: ../%.c @echo 'Building file: $<' @echo 'Invoking: GCC C Compiler' - gcc -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" + $(CC) -DNDEBUG -I../include -O3 -Wall -Wextra $(CPPFLAGS) $(CFLAGS) -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' -- cgit v1.2.3 From b1693de7175dec0d2b5dfc0f6945a1e1c8f8fe29 Mon Sep 17 00:00:00 2001 From: ildumi95 Date: Mon, 7 Feb 2022 15:47:57 +0100 Subject: [PATCH] link with libatomic for test Gbp-Pq: Name 0001-link-with-libatomic-for-test.patch --- test/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test.sh b/test/test.sh index 2683a52c..de9bd235 100755 --- a/test/test.sh +++ b/test/test.sh @@ -25,7 +25,7 @@ run () { OUT=$1.out rm "$OUT" 2> /dev/null - gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT" + gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -latomic -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT" if [[ "$NOMEMTEST" -ne "1" ]]; then valgrind --tool=memcheck --error-exitcode=1 --leak-check=full -q ./$OUT else @@ -45,4 +45,4 @@ else run "test_$name" fi -exit $RET \ No newline at end of file +exit $RET -- cgit v1.2.3 From 1f8789992e845ad358d02739d1103f3ccdee9f1b Mon Sep 17 00:00:00 2001 From: ildumi95 Date: Mon, 7 Feb 2022 15:47:57 +0100 Subject: [PATCH] link with libatomic for test Gbp-Pq: Name 0001-link-with-libatomic-for-test.patch --- test/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test.sh b/test/test.sh index 2683a52c..de9bd235 100755 --- a/test/test.sh +++ b/test/test.sh @@ -25,7 +25,7 @@ run () { OUT=$1.out rm "$OUT" 2> /dev/null - gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT" + gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -latomic -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT" if [[ "$NOMEMTEST" -ne "1" ]]; then valgrind --tool=memcheck --error-exitcode=1 --leak-check=full -q ./$OUT else @@ -45,4 +45,4 @@ else run "test_$name" fi -exit $RET \ No newline at end of file +exit $RET -- cgit v1.2.3 From 8629caf47894022b7dc8f181b7cbf39f41bac818 Mon Sep 17 00:00:00 2001 From: Nick Rosbrook Date: Thu, 25 Aug 2022 21:06:59 +0200 Subject: siri/db: add NULL check before calling siridb_tasks_dec Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/siridb-server/+bug/1987558 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1017748 Forwarded: https://github.com/SiriDB/siridb-server/pull/182 Last-Update: 2022-08-24 When built against libuv1 1.44.2, siridb_query_free may call siridb_tasks_dec on NULL, causing a segfault. Add a NULL check on siridb before calling siridb_tasks_dec to avoid this. Last-Update: 2022-08-24 Gbp-Pq: Name 0002-siri-db-add-NULL-check-before-calling-siridb_tasks_d.patch --- src/siri/db/query.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/siri/db/query.c b/src/siri/db/query.c index 3f9f7a0a..555628e4 100644 --- a/src/siri/db/query.c +++ b/src/siri/db/query.c @@ -156,7 +156,10 @@ void siridb_query_free(uv_handle_t * handle) siridb_t * siridb = query->client->siridb; /* decrement active tasks */ - siridb_tasks_dec(siridb->tasks); + if (siridb != NULL) + { + siridb_tasks_dec(siridb->tasks); + } /* free query */ free(query->q); -- cgit v1.2.3 From b669d9616c404d040db0f614cd072bf8aca24e77 Mon Sep 17 00:00:00 2001 From: ildumi95 Date: Mon, 7 Feb 2022 15:47:57 +0100 Subject: [PATCH] link with libatomic for test Gbp-Pq: Name 0001-link-with-libatomic-for-test.patch --- test/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test.sh b/test/test.sh index 2683a52c..de9bd235 100755 --- a/test/test.sh +++ b/test/test.sh @@ -25,7 +25,7 @@ run () { OUT=$1.out rm "$OUT" 2> /dev/null - gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT" + gcc -I"../include" -O0 -g3 -Wall -Wextra -Winline -std=gnu99 $SOURCE $C_SRC -lm -latomic -lpcre2-8 -lcleri -luuid -luv -lyajl $LCRYPT -o "$OUT" if [[ "$NOMEMTEST" -ne "1" ]]; then valgrind --tool=memcheck --error-exitcode=1 --leak-check=full -q ./$OUT else @@ -45,4 +45,4 @@ else run "test_$name" fi -exit $RET \ No newline at end of file +exit $RET -- cgit v1.2.3