align variable name with configuration keyword name

diff --git a/src/cfg.c b/src/cfg.c
index 7bab5eb3cccab41019f547d8ed79b1f15cd6c8fc..27f5aec81ddf557ca0a6f8b25349639f788a6ad9 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -35,7 +35,7 @@ void printcfgfile(void)
        printf("# how units are prefixed when traffic is shown\n");
        printf("# 0 = IEC standard prefixes (KiB/MiB/GiB/TiB)\n");
        printf("# 1 = old style binary prefixes (KB/MB/GB/TB)\n");
-       printf("UnitMode %d\n\n", cfg.unit);
+       printf("UnitMode %d\n\n", cfg.unitmode);
 
        printf("# output style\n");
        printf("# 0 = minimal & narrow, 1 = bar column visible\n");
@@ -183,7 +183,7 @@ int loadcfg(const char *cfgfile)
                { "TXCharacter", cfg.txchar, 0, 2, 0 },
                { "RXHourCharacter", cfg.rxhourchar, 0, 2, 0 },
                { "TXHourCharacter", cfg.txhourchar, 0, 2, 0 },
-               { "UnitMode", 0, &cfg.unit, 0, 0 },
+               { "UnitMode", 0, &cfg.unitmode, 0, 0 },
                { "OutputStyle", 0, &cfg.ostyle, 0, 0 },
                { "RateUnit", 0, &cfg.rateunit, 0, 0 },
                { "BandwidthDetection", 0, &cfg.bwdetection, 0, 0 },
@@ -291,9 +291,9 @@ int loadcfg(const char *cfgfile)
 
 void validatecfg(void)
 {
-       if (cfg.unit<0 || cfg.unit>1) {
-               cfg.unit = UNITMODE;
-               snprintf(errorstring, 512, "Invalid value for UnitMode, resetting to \"%d\".", cfg.unit);
+       if (cfg.unitmode<0 || cfg.unitmode>1) {
+               cfg.unitmode = UNITMODE;
+               snprintf(errorstring, 512, "Invalid value for UnitMode, resetting to \"%d\".", cfg.unitmode);
                printe(PT_Config);
        }
 
@@ -468,7 +468,7 @@ void defaultcfg(void)
        cfg.qmode = DEFQMODE;
        cfg.sampletime = DEFSAMPTIME;
        cfg.monthrotate = MONTHROTATE;
-       cfg.unit = UNITMODE;
+       cfg.unitmode = UNITMODE;
        cfg.ostyle = OSTYLE;
        cfg.rateunit = RATEUNIT;
        cfg.bwdetection = BWDETECT;

diff --git a/src/common.h b/src/common.h
index 80a2056347475d52eb7d686530c6ac99c6108fde..6422a4a47238dc799d741ac1f5e2472eccc53622 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -222,7 +222,7 @@ typedef struct {
        char rxchar[2], txchar[2], rxhourchar[2], txhourchar[2];
        char cbg[8], cedge[8], cheader[8], cheadertitle[8], cheaderdate[8], ctext[8];
        char cline[8], clinel[8], cvnstat[8], crx[8], crxd[8], ctx[8], ctxd[8];
-       int32_t unit, ostyle, rateunit, bvar, qmode, sampletime, hourlyrate, summaryrate;
+       int32_t unitmode, ostyle, rateunit, bvar, qmode, sampletime, hourlyrate, summaryrate;
        int32_t monthrotate, maxbw, flock, spacecheck, traflessday, transbg, slayout;
        char logfile[512], pidfile[512];
        char daemonuser[33], daemongroup[33];

diff --git a/src/dbshow.c b/src/dbshow.c
index 9bd052a3c934e665aaad992f16979db2e1a469f8..03275ded55450afca389d83495a9046037db03a4 100644 (file)
--- a/src/dbshow.c
+++ b/src/dbshow.c
@@ -888,7 +888,7 @@ void showhours(void)
        /* structure */
        snprintf(matrix[11], 81, " -+--------------------------------------------------------------------------->");
        for (i=0;i<3;i++) {
-               snprintf(matrix[14]+(i*28), 25, " h %2$*1$srx (%3$s)  %2$*1$stx (%3$s)", 1+cfg.unit, " ", unit);
+               snprintf(matrix[14]+(i*28), 25, " h %2$*1$srx (%3$s)  %2$*1$stx (%3$s)", 1+cfg.unitmode, " ", unit);
        }
 
        for (i=10;i>1;i--)

diff --git a/src/image.c b/src/image.c
index b70f39e2733e40bec67f0de5e5a590cff9cb9002..a37fcb34f87a2743370608944882930eb84e8dbf 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1475,7 +1475,7 @@ char *getimagescale(uint64_t kb, int rate)
                                limit[0] = 1024;
                                limit[1] = 1024000;
                                limit[2] = 1048576000;
-                               unit = cfg.unit;
+                               unit = cfg.unitmode;
                        }
 
                        if (kb>=limit[2]) {

diff --git a/src/misc.c b/src/misc.c
index 7369916797938fa392cfa745d4794c6f2dbeb7da..2b26877527baddabe0a47be2f9dd984ab991ca70 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -215,7 +215,7 @@ char *getvalue(uint64_t mb, uint64_t kb, int len, int type)
        }
 
        if ( (type==2) && (kB==0) ){
-               snprintf(buffer, 64, "%*s    ", len-cfg.unit, "--");
+               snprintf(buffer, 64, "%*s    ", len-cfg.unitmode, "--");
        } else {
                /* try to figure out what unit to use */
                if (kB>=1048576000) { /* 1024*1024*1000 - value >=1000 GiB -> show in TiB */
@@ -243,7 +243,7 @@ char *getrate(uint64_t mb, uint64_t kb, uint32_t interval, int len)
 char *gettrafficrate(uint64_t bytes, uint32_t interval, int len)
 {
        static char buffer[64];
-       int unit, declen = 2;
+       int unitmode, declen = 2;
        uint64_t b;
 
        if (interval==0) {
@@ -254,16 +254,16 @@ char *gettrafficrate(uint64_t bytes, uint32_t interval, int len)
        /* convert to proper unit */
        if (cfg.rateunit) {
                b = bytes * 8;
-               unit = 2;
+               unitmode = 2;
                if (interval<5) {
                        declen = 0;
                }
        } else {
                b = bytes;
-               unit = cfg.unit;
+               unitmode = cfg.unitmode;
        }
 
-       return getratestring(b / interval, len, declen, unit);
+       return getratestring(b / interval, len, declen, unitmode);
 }
 
 uint64_t getscale(uint64_t kb)
@@ -308,7 +308,7 @@ char *getunit(int index)
        if (index>UNITCOUNT) {
                return unit[0];
        } else {
-               return unit[(cfg.unit*UNITCOUNT)+index];
+               return unit[(cfg.unitmode*UNITCOUNT)+index];
        }
 }
 

diff --git a/tests/misc_tests.c b/tests/misc_tests.c
index cea8c5b6c5374e3b87e5619430c0f73f02eb4a6e..c076c5e3063bd697c3693ac5cf52de1219b22545 100644 (file)
--- a/tests/misc_tests.c
+++ b/tests/misc_tests.c
@@ -14,7 +14,7 @@ START_TEST(getunit_returns_something_with_all_cfg_combinations)
        char *string;
        int j;
 
-       cfg.unit = _i;
+       cfg.unitmode = _i;
        for (j=1; j<=(UNITCOUNT+1); j++) {
                string = getunit(j);
                ck_assert_int_gt(strlen(string), 0);
@@ -73,12 +73,12 @@ END_TEST
 
 START_TEST(getvalue_normal)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getvalue(0, 100, 0, 1), "100 KiB");
        ck_assert_str_eq(getvalue(1, 0, 0, 1), "1.00 MiB");
        ck_assert_str_eq(getvalue(1024, 0, 0, 1), "1.00 GiB");
        ck_assert_str_eq(getvalue(1048576, 0, 0, 2), "1.00 TiB");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getvalue(0, 100, 0, 1), "100 KB");
        ck_assert_str_eq(getvalue(1, 0, 0, 1), "1.00 MB");
        ck_assert_str_eq(getvalue(1024, 0, 0, 1), "1.00 GB");
@@ -88,12 +88,12 @@ END_TEST
 
 START_TEST(getvalue_estimate)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getvalue(0, 100, 0, 2), "100 KiB");
        ck_assert_str_eq(getvalue(1, 0, 0, 2), "1 MiB");
        ck_assert_str_eq(getvalue(1024, 0, 0, 2), "1.00 GiB");
        ck_assert_str_eq(getvalue(1048576, 0, 0, 2), "1.00 TiB");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getvalue(0, 100, 0, 2), "100 KB");
        ck_assert_str_eq(getvalue(1, 0, 0, 2), "1 MB");
        ck_assert_str_eq(getvalue(1024, 0, 0, 2), "1.00 GB");
@@ -103,12 +103,12 @@ END_TEST
 
 START_TEST(getvalue_imagescale)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getvalue(0, 100, 0, 3), "100 KiB");
        ck_assert_str_eq(getvalue(1, 0, 0, 3), "1 MiB");
        ck_assert_str_eq(getvalue(1024, 0, 0, 3), "1 GiB");
        ck_assert_str_eq(getvalue(1048576, 0, 0, 3), "1 TiB");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getvalue(0, 100, 0, 3), "100 KB");
        ck_assert_str_eq(getvalue(1, 0, 0, 3), "1 MB");
        ck_assert_str_eq(getvalue(1024, 0, 0, 3), "1 GB");
@@ -118,29 +118,29 @@ END_TEST
 
 START_TEST(getvalue_padding)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getvalue(0, 100, 10, 1), "   100 KiB");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getvalue(0, 100, 10, 1), "    100 KB");
 }
 END_TEST
 
 START_TEST(getvalue_mb_kb_mixed)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getvalue(1, 3210, 0, 1), "4.13 MiB");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getvalue(1, 3210, 0, 1), "4.13 MB");
 }
 END_TEST
 
 START_TEST(getvalue_zero_values)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getvalue(0, 0, 0, 1), "0 KiB");
        ck_assert_str_eq(getvalue(0, 0, 0, 2), "--    ");
        ck_assert_str_eq(getvalue(0, 0, 0, 3), "0 KiB");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getvalue(0, 0, 0, 1), "0 KB");
        ck_assert_str_eq(getvalue(0, 0, 0, 2), "--    ");
        ck_assert_str_eq(getvalue(0, 0, 0, 3), "0 KB");
@@ -154,7 +154,7 @@ START_TEST(getrate_zero_interval)
        for (i=0; i<=1; i++) {
                cfg.rateunit = i;
                for (j=0; j<=2; j++) {
-                       cfg.unit = j;
+                       cfg.unitmode = j;
                        ck_assert_str_eq(getrate(1, 0, 0, 0), "n/a");
                }
        }
@@ -164,12 +164,12 @@ END_TEST
 START_TEST(getrate_bytes)
 {
        cfg.rateunit = 0;
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getrate(0, 100, 1, 0), "100.00 KiB/s");
        ck_assert_str_eq(getrate(1, 3210, 1, 0), "4.13 MiB/s");
        ck_assert_str_eq(getrate(1024, 0, 1, 0), "1.00 GiB/s");
        ck_assert_str_eq(getrate(1048576, 0, 1, 0), "1.00 TiB/s");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getrate(0, 100, 1, 0), "100.00 KB/s");
        ck_assert_str_eq(getrate(1, 3210, 1, 0), "4.13 MB/s");
        ck_assert_str_eq(getrate(1024, 0, 1, 0), "1.00 GB/s");
@@ -180,12 +180,12 @@ END_TEST
 START_TEST(getrate_bits)
 {
        cfg.rateunit = 1;
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(getrate(0, 100, 1, 0), "819 kbit/s");
        ck_assert_str_eq(getrate(1, 3210, 1, 0), "34.68 Mbit/s");
        ck_assert_str_eq(getrate(1024, 0, 1, 0), "8.59 Gbit/s");
        ck_assert_str_eq(getrate(1048576, 0, 1, 0), "8.80 Tbit/s");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(getrate(0, 100, 1, 0), "819 kbit/s");
        ck_assert_str_eq(getrate(1, 3210, 1, 0), "34.68 Mbit/s");
        ck_assert_str_eq(getrate(1024, 0, 1, 0), "8.59 Gbit/s");
@@ -195,7 +195,7 @@ END_TEST
 
 START_TEST(getrate_interval_divides)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        cfg.rateunit = 0;
        ck_assert_str_eq(getrate(0, 100, 1, 0), "100.00 KiB/s");
        ck_assert_str_eq(getrate(0, 100, 2, 0), "50.00 KiB/s");
@@ -209,7 +209,7 @@ END_TEST
 
 START_TEST(getrate_padding)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        cfg.rateunit = 0;
        ck_assert_str_eq(getrate(0, 100, 1, 0), "100.00 KiB/s");
        ck_assert_str_eq(getrate(0, 100, 1, 12), "100.00 KiB/s");
@@ -224,7 +224,7 @@ START_TEST(gettrafficrate_zero_interval)
        for (i=0; i<=1; i++) {
                cfg.rateunit = i;
                for (j=0; j<=2; j++) {
-                       cfg.unit = j;
+                       cfg.unitmode = j;
                        ck_assert_str_eq(gettrafficrate(1, 0, 0), "n/a");
                }
        }
@@ -234,12 +234,12 @@ END_TEST
 START_TEST(gettrafficrate_bytes)
 {
        cfg.rateunit = 0;
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(gettrafficrate(102400, 1, 0), "100.00 KiB/s");
        ck_assert_str_eq(gettrafficrate(1048576, 1, 0), "1.00 MiB/s");
        ck_assert_str_eq(gettrafficrate(1073741824, 1, 0), "1.00 GiB/s");
        ck_assert_str_eq(gettrafficrate(1099511627776ULL, 1, 0), "1.00 TiB/s");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(gettrafficrate(102400, 1, 0), "100.00 KB/s");
        ck_assert_str_eq(gettrafficrate(1048576, 1, 0), "1.00 MB/s");
        ck_assert_str_eq(gettrafficrate(1073741824, 1, 0), "1.00 GB/s");
@@ -250,12 +250,12 @@ END_TEST
 START_TEST(gettrafficrate_bits)
 {
        cfg.rateunit = 1;
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        ck_assert_str_eq(gettrafficrate(102400, 1, 0), "819 kbit/s");
        ck_assert_str_eq(gettrafficrate(1048576, 1, 0), "8.39 Mbit/s");
        ck_assert_str_eq(gettrafficrate(1073741824, 1, 0), "8.59 Gbit/s");
        ck_assert_str_eq(gettrafficrate(1099511627776ULL, 1, 0), "8.80 Tbit/s");
-       cfg.unit = 1;
+       cfg.unitmode = 1;
        ck_assert_str_eq(gettrafficrate(102400, 1, 0), "819 kbit/s");
        ck_assert_str_eq(gettrafficrate(1048576, 1, 0), "8.39 Mbit/s");
        ck_assert_str_eq(gettrafficrate(1073741824, 1, 0), "8.59 Gbit/s");
@@ -265,7 +265,7 @@ END_TEST
 
 START_TEST(gettrafficrate_interval_divides)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        cfg.rateunit = 0;
        ck_assert_str_eq(gettrafficrate(102400, 1, 0), "100.00 KiB/s");
        ck_assert_str_eq(gettrafficrate(102400, 2, 0), "50.00 KiB/s");
@@ -279,7 +279,7 @@ END_TEST
 
 START_TEST(gettrafficrate_padding)
 {
-       cfg.unit = 0;
+       cfg.unitmode = 0;
        cfg.rateunit = 0;
        ck_assert_str_eq(gettrafficrate(102400, 1, 0), "100.00 KiB/s");
        ck_assert_str_eq(gettrafficrate(102400, 1, 12), "100.00 KiB/s");