From fe1bd518bbf8c5d14f9814f45528267a158c318c Mon Sep 17 00:00:00 2001 From: Weston Schmidt Date: Fri, 26 Aug 2016 10:08:05 -0700 Subject: [PATCH 1/3] Fix a few warnings. --- src/svcagt_db.c | 10 +++------- src/svcagt_files.c | 2 +- src/svcagt_log.c | 3 ++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/svcagt_db.c b/src/svcagt_db.c index 194aeda..a54be8b 100644 --- a/src/svcagt_db.c +++ b/src/svcagt_db.c @@ -17,7 +17,7 @@ #include "svcagt_startup_states.h" #include #include -#include "pthread.h" +#include pthread_mutex_t svcagt_mutex=PTHREAD_MUTEX_INITIALIZER; @@ -182,8 +182,6 @@ int svcagt_db_add (const char *name) // called during initialization int svcagt_db_remove (const char *name) { - size_t name_len; - struct my_service_struct *db_node = NULL; if (service_index != NULL) return EPERM; @@ -232,7 +230,6 @@ int svcagt_db_get (unsigned index, const char **name, bool *state, bool db_query // called during initialization int svcagt_set_by_name (const char *name, bool state, long state_file_pos) { - int err; struct my_service_struct *db_node; HASH_FIND_STR (service_db, name, db_node); @@ -250,7 +247,6 @@ int svcagt_set_by_name (const char *name, bool state, long state_file_pos) int svcagt_get_index (const char *name, unsigned *index, bool *state) { - int err; unsigned i; struct my_service_struct *db_node; @@ -297,7 +293,7 @@ int svcagt_db_set (unsigned index, bool state) int svcagt_db_get_all (service_list_item_t **service_list, bool db_query) { - int i, err; + unsigned i; struct my_service_struct *db_node; service_list_item_t *item_array; service_list_item_t *item_list = NULL; @@ -347,7 +343,7 @@ void svcagt_show_service_db (void) // For testing unsigned svcagt_show_service_index (void) { - int i; + unsigned i; struct my_service_struct *s; printf ("Service DB Index\n"); for (i=0; i #include #include -#include "pthread.h" +#include +#include #include "svcagt_time.h" From 002dcacd653d2320d7e6d70d48832f41686ef529 Mon Sep 17 00:00:00 2001 From: Weston Schmidt Date: Fri, 26 Aug 2016 11:16:01 -0700 Subject: [PATCH 2/3] Disable the tests. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b991c83..4d4de7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ script: - cd build - cmake .. - make - - make test + #- make test - make coverage after_success: From d56b9e217eab74e76a61b34b5eb5dcf4c5a70678 Mon Sep 17 00:00:00 2001 From: Weston Schmidt Date: Fri, 26 Aug 2016 11:26:51 -0700 Subject: [PATCH 3/3] Disable coverage metrics. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d4de7d..5c8b4ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ script: - cmake .. - make #- make test - - make coverage + #- make coverage after_success: - codecov