From bebe0ce7c7f40688171c946a4d51a270590c0a4e Mon Sep 17 00:00:00 2001
From: Greg Young <gregoryyoung1@gmail.com>
Date: Thu, 5 May 2016 19:59:09 +0300
Subject: [PATCH] fix makefile and some general clean up

---
 makefile                 |  2 +-
 src/es_client_internal.h |  2 --
 src/es_msg_parser.c      | 10 +++++-----
 src/es_proto_helper.c    |  1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/makefile b/makefile
index 449650c..0fb1afb 100644
--- a/makefile
+++ b/makefile
@@ -20,7 +20,7 @@ $(TARGET): $(OBJECTS)
 	$(CC) $(CFLAGS) $(OBJECTS) $(LIBS) -o $@
 
 clean:
-	-rm -f *.o
+	-rm -f src/*.o
 	-rm -f $(TARGET)
 test:
 	./es_tests
diff --git a/src/es_client_internal.h b/src/es_client_internal.h
index 43478f1..2de3fd5 100644
--- a/src/es_client_internal.h
+++ b/src/es_client_internal.h
@@ -12,6 +12,4 @@
 #include "es_proto_helper.h"
 
 
-#define TESTS
-
 #endif
diff --git a/src/es_msg_parser.c b/src/es_msg_parser.c
index 402d809..bdad80b 100644
--- a/src/es_msg_parser.c
+++ b/src/es_msg_parser.c
@@ -150,8 +150,8 @@ char data[24] = {0x0A,0,0,0,0,1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9};
 
 static void test_parser_create() {
     struct ParserState *state = create_parser_state(32);
-    CU_ASSERT_PTR_NOT_NULL (state->buffer_end);
-    CU_ASSERT_PTR_NOT_NULL (state->buffer_start);
+    CU_ASSERT_PTR_NOT_NULL_FATAL (state->buffer_end);
+    CU_ASSERT_PTR_NOT_NULL_FATAL (state->buffer_start);
     CU_ASSERT (state->parser_read == state->buffer_start);
     CU_ASSERT (state->buffer_start == state->buffer_write);
     destroy_parser_state (&state);
@@ -201,7 +201,7 @@ static void test_compress (void) {
     b.location[0] = 0x0B;
     add_data (state, &b);
     struct Buffer * read = read_next (state);
-    CU_ASSERT_PTR_NOT_NULL (read);
+    CU_ASSERT_PTR_NOT_NULL_FATAL (read);
     assert (state->buffer_write - state->buffer_start == 20);
     CU_ASSERT_EQUAL (state->parser_read, state->buffer_start + 14);
     compress_space (state);
@@ -236,7 +236,7 @@ static void test_perfect_fit_read (void) {
     CU_ASSERT_EQUAL (add_data (state, &b), 0);
     char *old_parser_read = state->parser_read;
     struct  Buffer *ret = read_next (state);
-    CU_ASSERT_PTR_NOT_NULL (ret);
+    CU_ASSERT_PTR_NOT_NULL_FATAL (ret);
     CU_ASSERT (ret->location == state->buffer_start + 4);
     CU_ASSERT_EQUAL (ret->length,10);
     CU_ASSERT (old_parser_read + 14 == state->parser_read);
@@ -252,7 +252,7 @@ static void test_too_much_data_read (void) {
     CU_ASSERT_EQUAL (add_data (state, &b), 0);
     char *old_parser_read = state->parser_read;
     struct  Buffer *ret = read_next (state);
-    CU_ASSERT_PTR_NOT_NULL (ret);
+    CU_ASSERT_PTR_NOT_NULL_FATAL (ret);
     CU_ASSERT (ret->location == state->buffer_start + 4);
     CU_ASSERT_EQUAL (ret->length,10);
     CU_ASSERT (old_parser_read + 14 == state->parser_read);
diff --git a/src/es_proto_helper.c b/src/es_proto_helper.c
index 86fa1aa..27c0886 100644
--- a/src/es_proto_helper.c
+++ b/src/es_proto_helper.c
@@ -793,6 +793,7 @@ void test_subscribe_to_stream (void) {
 void test_subscription_confirmation (void) {
 	struct SubscriptionConfirmation d;
 	d.last_commit_position = 1919;
+	d.last_commit_position = 1919;
 	d.last_event_number = 6;
 	struct Buffer buffer = get_test_buffer(1024);
 	int32_t len = es_pack_subscription_confirmation (&d, buffer);