From a29d1b9e3f8e81e51a3ae9d936c160e981cb7955 Mon Sep 17 00:00:00 2001 From: itamar Date: Fri, 9 Dec 2016 15:14:44 +0200 Subject: [PATCH 1/5] Takes redismodule.h from include directory --- rmutil/alloc.c | 2 -- rmutil/alloc.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rmutil/alloc.c b/rmutil/alloc.c index f272454..27f8ef1 100644 --- a/rmutil/alloc.c +++ b/rmutil/alloc.c @@ -1,8 +1,6 @@ #include #include #include - -#include "../redismodule.h" #include "alloc.h" /* A patched implementation of strdup that will use our patched calloc */ diff --git a/rmutil/alloc.h b/rmutil/alloc.h index 8c5cec6..3684288 100644 --- a/rmutil/alloc.h +++ b/rmutil/alloc.h @@ -17,7 +17,7 @@ */ #include -#include "../redismodule.h" +#include char *rmalloc_strndup(const char *s, size_t n); @@ -43,4 +43,4 @@ char *rmalloc_strndup(const char *s, size_t n); void RMUTil_InitAlloc(); #endif /* REDIS_MODULE_TARGET */ -#endif /* __RMUTIL_ALLOC__ */ \ No newline at end of file +#endif /* __RMUTIL_ALLOC__ */ From 63081f14c8b79c1c79f252aee6e355a945f8938f Mon Sep 17 00:00:00 2001 From: itamar Date: Fri, 9 Dec 2016 15:15:16 +0200 Subject: [PATCH 2/5] Removes redundant include for redismodule.h --- rmutil/util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rmutil/util.c b/rmutil/util.c index b2706fa..819dd83 100644 --- a/rmutil/util.c +++ b/rmutil/util.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "util.h" /** @@ -220,4 +219,4 @@ RedisModuleCallReply *RedisModule_CallReplyArrayElementByPath( } while ((ele != NULL) && (*e != '\0')); return ele; -} \ No newline at end of file +} From 7bbc414fed2b169c7820304b45b37b76c088a5a2 Mon Sep 17 00:00:00 2001 From: itamar Date: Fri, 9 Dec 2016 15:19:31 +0200 Subject: [PATCH 3/5] Includes stdio.h instead of printf.h --- rmutil/test_priority_queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rmutil/test_priority_queue.c b/rmutil/test_priority_queue.c index ce8faa7..ee63937 100644 --- a/rmutil/test_priority_queue.c +++ b/rmutil/test_priority_queue.c @@ -1,4 +1,4 @@ -#include +#include #include "assert.h" #include "priority_queue.h" @@ -34,4 +34,4 @@ int main(int argc, char **argv) { Priority_Queue_Free(pq); printf("PASS!"); return 0; -} \ No newline at end of file +} From 4fe29da394d08af1ed998544f78b644bcbfc9841 Mon Sep 17 00:00:00 2001 From: itamar Date: Fri, 9 Dec 2016 15:55:53 +0200 Subject: [PATCH 4/5] Adds newline to final output of tests --- rmutil/test_heap.c | 2 +- rmutil/test_priority_queue.c | 2 +- rmutil/test_vector.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rmutil/test_heap.c b/rmutil/test_heap.c index 515400f..820c299 100644 --- a/rmutil/test_heap.c +++ b/rmutil/test_heap.c @@ -32,7 +32,7 @@ int main(int argc, char **argv) { assert(99 == n); Vector_Free(v); - printf("PASS!"); + printf("PASS!\n"); return 0; } diff --git a/rmutil/test_priority_queue.c b/rmutil/test_priority_queue.c index ee63937..4a21c18 100644 --- a/rmutil/test_priority_queue.c +++ b/rmutil/test_priority_queue.c @@ -32,6 +32,6 @@ int main(int argc, char **argv) { assert(15 == n); Priority_Queue_Free(pq); - printf("PASS!"); + printf("PASS!\n"); return 0; } diff --git a/rmutil/test_vector.c b/rmutil/test_vector.c index 65be59c..8a6d849 100644 --- a/rmutil/test_vector.c +++ b/rmutil/test_vector.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) { assert (rc == 0); Vector_Free(v); - printf("PASS!"); + printf("PASS!\n"); return 0; //Vector_Push(v, "hello"); From c7735d948c7675fc29d08078d87794771d0949b6 Mon Sep 17 00:00:00 2001 From: itamar Date: Sun, 11 Dec 2016 10:59:10 +0200 Subject: [PATCH 5/5] Fixes call to test_priority_queue --- rmutil/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmutil/Makefile b/rmutil/Makefile index b3bb712..32a5dac 100644 --- a/rmutil/Makefile +++ b/rmutil/Makefile @@ -26,4 +26,4 @@ test_heap: test_heap.o heap.o vector.o test_priority_queue: test_priority_queue.o priority_queue.o heap.o vector.o $(CC) -Wall -o test_priority_queue priority_queue.o heap.o vector.o test_priority_queue.o -lc -O0 - @(sh -c ./test_heap) + @(sh -c ./test_priority_queue)