Bugfix: memory and thread-deleting problems

[monky] / src / fs.c

diff --git a/src/fs.c b/src/fs.c
index 92552e9..54617c6 100644 (file)
--- a/src/fs.c
+++ b/src/fs.c
@@ -10,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -65,13 +65,13 @@ static void update_fs_stat(struct fs_stat *fs);
 
 void get_fs_type(const char *path, char *result);
 
-void update_fs_stats(void)
+int update_fs_stats(void)
 {
        unsigned i;
        static double last_fs_update = 0.0;
 
        if (current_update_time - last_fs_update < 13)
-               return;
+               return 0;
 
        for (i = 0; i < MAX_FS_STATS; ++i) {
                if (fs_stats[i].set) {
@@ -79,6 +79,7 @@ void update_fs_stats(void)
                }
        }
        last_fs_update = current_update_time;
+       return 0;
 }
 
 void clear_fs_stats(void)
@@ -225,12 +226,7 @@ void print_fs_bar(struct text_object *obj, int be_free_bar, char *p, int p_max_s
        if (!be_free_bar)
                val = 1.0 - val;
 
-#ifdef X11
-               if(output_methods & TO_X) {
-                       new_bar(obj, p, (int)(255 * val));
-               }else
-#endif /* X11 */
-                       new_bar_in_shell(obj, p, p_max_size, (int)(100 * val));
+       new_bar(obj, p, p_max_size, (int)(255 * val));
 }
 
 void init_fs(struct text_object *obj, const char *arg)