From aae36a074b14dcea8fa15f32fe9e84ceeac66e66 Mon Sep 17 00:00:00 2001 From: Joe Myre Date: Thu, 11 Aug 2005 16:34:39 +0000 Subject: [PATCH] removed redunant fs_size_g variable git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@101 7f574dfc-610e-0410-a909-a81674777703 --- conky.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/conky.c b/conky.c index 13595543..bcae9228 100644 --- a/conky.c +++ b/conky.c @@ -676,8 +676,7 @@ enum text_object_type { OBJ_fs_bar_free, OBJ_fs_free, OBJ_fs_free_perc, - OBJ_fs_size, - OBJ_fs_size_g, + OBJ_fs_size, //This already outputs in gigs OBJ_fs_size_t, OBJ_fs_used, OBJ_fs_used_perc, @@ -1058,9 +1057,6 @@ if (s[0] == '#') { END OBJ(fs_size, INFO_FS) if (!arg) arg = "/"; obj->data.fs = prepare_fs_stat(arg); - END OBJ(fs_size_g, INFO_FS) if (!arg) - arg = "/"; - obj->data.fs = prepare_fs_stat(arg); END OBJ(fs_size_t, INFO_FS) if (!arg) arg = "/"; obj->data.fs = prepare_fs_stat(arg); @@ -1840,14 +1836,9 @@ static void generate_text() human_readable(obj->data.fs->size, p, 255); } - OBJ(fs_size_g) { - if (obj->data.fs != NULL) - human_readable((obj->data.fs->size)/10, - p, 255); - } OBJ(fs_size_t) { if (obj->data.fs != NULL) - human_readable((obj->data.fs->size)/100, + human_readable((obj->data.fs->size)/1000, p, 255); } OBJ(fs_used) {