refactor pull request changes to use common style and same function calls in tests...

diff --git a/src/daemon.c b/src/daemon.c
index 83f54c8a50b4e3138eb13b6929269abddd429994..f087c4ecadc3365efb4fa966405a1ba89e897b2a 100644 (file)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -268,15 +268,6 @@ void initdstate(DSTATE *s)
        s->prevwaldbcheckpoint = time(NULL);
 }
 
-#ifdef CHECK_VNSTAT
-void destroystate(DSTATE *s)
-{
-       if (s->dcache) {
-               datacache_clear(&s->dcache);
-       }
-}
-#endif
-
 void preparedatabase(DSTATE *s)
 {
        s->dbifcount = db_getinterfacecount();

diff --git a/src/daemon.h b/src/daemon.h
index f60d11d49334b70ce3544876d72019d115ba0dba..44efb472158e40cad24637e24041719f75fd1c23 100644 (file)
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -19,9 +19,6 @@ void debugtimestamp(void);
 
 unsigned int addinterfaces(DSTATE *s);
 void initdstate(DSTATE *s);
-#ifdef CHECK_VNSTAT
-void destroystate(DSTATE *s);
-#endif
 void preparedatabase(DSTATE *s);
 unsigned int importlegacydbs(DSTATE *s);
 void setsignaltraps(void);

diff --git a/src/misc.c b/src/misc.c
index d0727642e8346a1ffc18b3f7da2b19c4e6497f5b..5d247422a8e3c60c2e2ee4bd2502b339ae8629c4 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -192,7 +192,7 @@ int getunitspacing(const int len, const int index)
 
        /* tune spacing according to unit */
        /* +1 for space between number and unit */
-       l -= (int) strlen(getunitprefix(index)) + 1;
+       l -= (int)strlen(getunitprefix(index)) + 1;
        if (l < 0) {
                l = 1;
        }
@@ -309,7 +309,7 @@ int getratespacing(const int len, const int unitmode, const int unitindex)
 {
        int l = len;
 
-       l -= (int) strlen(getrateunitprefix(unitmode, unitindex)) + 1;
+       l -= (int)strlen(getrateunitprefix(unitmode, unitindex)) + 1;
        if (l < 0) {
                l = 1;
        }

diff --git a/tests/daemon_tests.c b/tests/daemon_tests.c
index 0db7cce06f3badc79264103a7f61a45900111e7a..58a474558881800fc0edeb9c383319e3d7941f05 100644 (file)
--- a/tests/daemon_tests.c
+++ b/tests/daemon_tests.c
@@ -189,7 +189,7 @@ START_TEST(addinterfaces_adds_to_cache_when_running)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -353,7 +353,7 @@ START_TEST(filldatabaselist_adds_databases)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -387,7 +387,7 @@ START_TEST(adjustsaveinterval_with_filled_cache)
 
        ck_assert_int_eq(s.saveinterval, cfg.saveinterval * 60);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -497,7 +497,7 @@ START_TEST(processdatacache_can_process_things)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -759,7 +759,7 @@ START_TEST(interfacechangecheck_with_filled_cache)
        ck_assert_int_eq(datacache_count(&s.dcache), 2);
        ck_assert_int_eq(datacache_activecount(&s.dcache), 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -793,7 +793,7 @@ START_TEST(initcachevalues_does_not_init_without_database)
        ret = initcachevalues(&s, &s.dcache);
        ck_assert_int_eq(ret, 0);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -830,7 +830,7 @@ START_TEST(initcachevalues_does_init)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -904,7 +904,7 @@ START_TEST(waittimesync_does_not_wait_with_new_interfaces)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -940,7 +940,7 @@ START_TEST(waittimesync_knows_when_to_wait)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -976,7 +976,7 @@ START_TEST(waittimesync_knows_when_to_give_up)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -1182,7 +1182,7 @@ START_TEST(cleanremovedinterfaces_allows_interfaces_to_be_removed)
        ret = db_close();
        ck_assert_int_eq(ret, 1);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -1210,7 +1210,7 @@ START_TEST(processifinfo_syncs_when_needed)
        ck_assert_int_eq(s.dcache->currx, 11);
        ck_assert_int_eq(s.dcache->curtx, 22);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -1240,7 +1240,7 @@ START_TEST(processifinfo_skips_update_if_timestamps_make_no_sense)
        ck_assert_int_eq(s.dcache->currx, 0);
        ck_assert_int_eq(s.dcache->curtx, 0);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -1295,7 +1295,7 @@ START_TEST(processifinfo_syncs_if_timestamps_match)
        ck_assert_int_eq(s.dcache->curtx, 22);
        ck_assert_ptr_eq(s.dcache->log, NULL);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -1331,7 +1331,7 @@ START_TEST(processifinfo_adds_traffic)
        ck_assert_int_eq(s.dcache->curtx, 22);
        ck_assert_ptr_ne(s.dcache->log, NULL);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -1368,7 +1368,7 @@ START_TEST(processifinfo_does_not_add_traffic_when_over_limit)
        ck_assert_int_eq(s.dcache->curtx, 2222222);
        ck_assert_ptr_eq(s.dcache->log, NULL);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST
 
@@ -1407,7 +1407,7 @@ START_TEST(processifinfo_adds_zero_traffic_when_over_limit)
        ck_assert_int_eq(s.dcache->log->rx, 0);
        ck_assert_int_eq(s.dcache->log->tx, 0);
 
-       destroystate(&s);
+       datacache_clear(&s.dcache);
 }
 END_TEST