diff --git a/config.h b/config.h index c679da2..b1c0643 100644 --- a/config.h +++ b/config.h @@ -19,10 +19,6 @@ typedef struct { /* Example: /sys/class/power_supply/battery/capacity */ #define BATT_NAME NULL -/* #define PRINT_TOTAL_MEM */ -/* #define PRINT_USER_MEM */ -#define PRINT_USED_AND_TOTAL_MEM - #ifdef _MAIN_H PARAMETR CONFIG[] = { {" os ", PrintOs}, diff --git a/src/fetch.c b/src/fetch.c index 194da6b..17bb738 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -191,18 +191,8 @@ int GetMem(const char *title, const FETCH fetch) { return 1; fclose(fp); - off_t used = (total - (cached + free + buffer)) / 1024; -#ifdef PRINT_USED_AND_TOTAL_MEM - printf("%s%s%s%lumb / %lumb", fetch.color, title, fetch.font_color, (uintmax_t)used, (uintmax_t)total / 1024); - -#elif PRINT_TOTALMEM - printf("%s%s%s%lumb", fetch.color, title, fetch.font_color, (uintmax_t)total / 1024); - -#else - printf("%s%s%s%lumb", fetch.color, title, fetch.font_color, (uintmax_t)used); - -#endif + printf("%s%s%s%lumb / %lumb", fetch.color, title, fetch.font_color, (uintmax_t)(total - (cached + free + buffer)) / 1024, (uintmax_t)total / 1024); return 0; } diff --git a/themes/default.h b/themes/default.h index c679da2..b1c0643 100644 --- a/themes/default.h +++ b/themes/default.h @@ -19,10 +19,6 @@ typedef struct { /* Example: /sys/class/power_supply/battery/capacity */ #define BATT_NAME NULL -/* #define PRINT_TOTAL_MEM */ -/* #define PRINT_USER_MEM */ -#define PRINT_USED_AND_TOTAL_MEM - #ifdef _MAIN_H PARAMETR CONFIG[] = { {" os ", PrintOs}, diff --git a/themes/fira.h b/themes/fira.h index f01bc53..4baa624 100644 --- a/themes/fira.h +++ b/themes/fira.h @@ -19,10 +19,6 @@ typedef struct { /* Example: /sys/class/power_supply/battery/capacity */ #define BATT_NAME NULL -/* #define PRINT_TOTAL_MEM */ -/* #define PRINT_USER_MEM */ -#define PRINT_USED_AND_TOTAL_MEM - #ifdef _MAIN_H PARAMETR CONFIG[] = { {" ", Blank}, diff --git a/themes/mini.h b/themes/mini.h index a6afe5a..161cf1e 100644 --- a/themes/mini.h +++ b/themes/mini.h @@ -19,10 +19,6 @@ typedef struct { /* Example: /sys/class/power_supply/battery/capacity */ #define BATT_NAME NULL -/* #define PRINT_TOTAL_MEM */ -/* #define PRINT_USER_MEM */ -#define PRINT_USED_AND_TOTAL_MEM - #ifdef _MAIN_H PARAMETR CONFIG[] = { {" ", Blank}, diff --git a/themes/tree.h b/themes/tree.h index 8d85c73..648e803 100644 --- a/themes/tree.h +++ b/themes/tree.h @@ -19,10 +19,6 @@ typedef struct { /* Example: /sys/class/power_supply/battery/capacity */ #define BATT_NAME NULL -/* #define PRINT_TOTAL_MEM */ -/* #define PRINT_USER_MEM */ -#define PRINT_USED_AND_TOTAL_MEM - #ifdef _MAIN_H PARAMETR CONFIG[] = { {" pc: ", Blank},