rename definitions to something more readable

diff --git a/src/common.c b/src/common.c
index 2bc0fd42ce6d1c648959ec70745f81b869b72788..0fd097d908d7bcc12ea4493f9c63b2b6b19d143c 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -184,16 +184,16 @@ uint64_t countercalc(const uint64_t *a, const uint64_t *b)
        /* flip exists */
        } else {
                /* original counter is 64bit */
-               if (*a>FP32) {
+               if (*a>MAX32) {
                        if (debug)
-                               printf("cc64: uint64 - %"PRIu64" + %"PRIu64" = %"PRIu64"\n", *a, *b, (uint64_t)FP64-*a+*b);
-                       return FP64-*a+*b;
+                               printf("cc64: uint64 - %"PRIu64" + %"PRIu64" = %"PRIu64"\n", *a, *b, (uint64_t)MAX64-*a+*b);
+                       return MAX64-*a+*b;
 
                /* original counter is 32bit */
                } else {
                        if (debug)
-                               printf("cc32: uint32 - %"PRIu64" + %"PRIu64" = %"PRIu64"\n", *a, *b, (uint64_t)FP32-*a+*b);
-                       return FP32-*a+*b;
+                               printf("cc32: uint32 - %"PRIu64" + %"PRIu64" = %"PRIu64"\n", *a, *b, (uint64_t)MAX32-*a+*b);
+                       return MAX32-*a+*b;
                }
        }
 }

diff --git a/src/common.h b/src/common.h
index e995784de4b57160d34e725d0f97547ad5a6192a..997b2352c3cdc488648175d8423c7433e25cb597 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -150,8 +150,8 @@ and most can be changed later from the config file.
 #define ONELINEVERSION 1
 
 /* integer limits */
-#define FP32 4294967295ULL
-#define FP64 18446744073709551615ULL
+#define MAX32 4294967295ULL
+#define MAX64 18446744073709551615ULL
 
 /* sampletime in seconds for live traffic */
 /* don't use values below 2 */

diff --git a/src/dbaccess.c b/src/dbaccess.c
index dbcf65eee917053fd16ad7dbb5e95418b6ee69a6..aef166382b176c80d5d5581625ff044e896fdcec 100644 (file)
--- a/src/dbaccess.c
+++ b/src/dbaccess.c
@@ -202,7 +202,7 @@ void initdb(void)
                data.month[0].month=current;
        }
 
-       data.btime=FP32;
+       data.btime=MAX32;
 }
 
 int writedb(const char *iface, const char *dirname, int newdb)

diff --git a/src/traffic.c b/src/traffic.c
index 5bdaf8cd93690f4b66963b90688702568a17e831..875dfc3eb6c9acb90087d34b4b1c15fd9710e4cb 100644 (file)
--- a/src/traffic.c
+++ b/src/traffic.c
@@ -100,7 +100,7 @@ void livetrafficmeter(char iface[32], int mode)
 
        /* set some defaults */
        rxtotal=txtotal=rxptotal=txptotal=rxpmax=txpmax=0;
-       rxpmin=txpmin=rxmin=txmin=FP64;
+       rxpmin=txpmin=rxmin=txmin=MAX64;
        rxmax=txmax=0;
 
        timespent = (uint64_t)time(NULL);

diff --git a/tests/common_tests.c b/tests/common_tests.c
index 884c142f6a39b7057a1b8230720284138cbbd32a..375abe6b12ee95f72a0658bac8fb3fd63e0a64bb 100644 (file)
--- a/tests/common_tests.c
+++ b/tests/common_tests.c
@@ -95,7 +95,7 @@ START_TEST(countercalc_32bit)
 
        a = 1;
        b = 0;
-       ck_assert(countercalc(&a, &b)==(FP32-1));
+       ck_assert(countercalc(&a, &b)==(MAX32-1));
 }
 END_TEST
 
@@ -103,9 +103,9 @@ START_TEST(countercalc_64bit)
 {
        uint64_t a, b;
 
-       a = FP32+1;
+       a = MAX32+1;
        b = 0;
-       ck_assert(countercalc(&a, &b)==(FP64-FP32-1));
+       ck_assert(countercalc(&a, &b)==(MAX64-MAX32-1));
 }
 END_TEST