Fix device name parsing for diskio variables.

[monky] / src / core.h

diff --git a/src/core.h b/src/core.h
index 436122b..6042545 100644 (file)
--- a/src/core.h
+++ b/src/core.h
@@ -1,4 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
  *
  * Conky, a system monitor, based on torsmo
  *
@@ -9,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.
  *
@@ -25,57 +26,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * vim: ts=4 sw=4 noet ai cindent syntax=c
- *
  */
 
 #ifndef _CONKY_CORE_H_
 #define _CONKY_CORE_H_
 
-#include "config.h"    /* defines */
-
-/* alignments */
-enum alignment {
-       TOP_LEFT = 1,
-       TOP_RIGHT,
-       TOP_MIDDLE,
-       BOTTOM_LEFT,
-       BOTTOM_RIGHT,
-       BOTTOM_MIDDLE,
-       MIDDLE_LEFT,
-       MIDDLE_RIGHT,
-       NONE
-};
+#include "conky.h"
 
-#ifdef X11
-#define TO_X 1
-#endif /* X11 */
-#define TO_STDOUT 2
-#define TO_STDERR 4
-#define OVERWRITE_FILE 8
-#define APPEND_FILE 16
-#ifdef NCURSES
-#define TO_NCURSES 32
-#endif /* NCURSES */
+struct text_object *construct_text_object(const char *s, const char *arg, long
+               line, void **ifblock_opaque, void *free_at_crash);
 
-void read_exec(const char *data, char *buf, const int size);
-void set_default_configurations(conky_context *ctx);
-void set_update_interval(double interval);
+size_t remove_comments(char *string);
 
-/* update_text() generates new text and clears old text area */
-void update_text(conky_context *ctx);
-void update_text_area(conky_context *ctx);
-void draw_stuff(conky_context *ctx);
-char load_config_file(conky_context *ctx, const char *f);
-void extract_variable_text(conky_context *ctx, const char *p);
+int extract_variable_text_internal(struct text_object *retval, const char *const_p);
 
-#ifdef X11
-void clear_text(conky_context *ctx, int exposures);
-enum alignment string_to_alignment(const char *s);
-void load_config_file_x11(conky_context *ctx, const char *);
-void X11_create_window(conky_context *ctx);
-#endif /* X11 */
+void free_text_objects(struct text_object *root, int internal);
 
-void convert_escapes(char *buf);
+const char *dev_name(const char *);
 
 #endif /* _CONKY_CORE_H_ */