diskio: convert print functions to match common signature

diff --git a/src/conky.c b/src/conky.c
index 6b798ea..0d28b53 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -1103,23 +1103,23 @@ void generate_text_internal(char *p, int p_max_size,
                        }
 #endif /* X11 */
                        OBJ(diskio) {
-                               print_diskio(obj, 0, p, p_max_size);
+                               print_diskio(obj, p, p_max_size);
                        }
                        OBJ(diskio_write) {
-                               print_diskio(obj, 1, p, p_max_size);
+                               print_diskio_write(obj, p, p_max_size);
                        }
                        OBJ(diskio_read) {
-                               print_diskio(obj, -1, p, p_max_size);
+                               print_diskio_read(obj, p, p_max_size);
                        }
 #ifdef X11
                        OBJ(diskiograph) {
-                               print_diskiograph(obj, 0, p);
+                               print_diskiograph(obj, p, p_max_size);
                        }
                        OBJ(diskiograph_read) {
-                               print_diskiograph(obj, -1, p);
+                               print_diskiograph(obj, p, p_max_size);
                        }
                        OBJ(diskiograph_write) {
-                               print_diskiograph(obj, 1, p);
+                               print_diskiograph(obj, p, p_max_size);
                        }
 #endif /* X11 */
                        OBJ(downspeed) {

diff --git a/src/diskio.c b/src/diskio.c
index 20db99c..75fd296 100644 (file)
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -119,7 +119,7 @@ void parse_diskio_arg(struct text_object *obj, const char *arg)
  *  0: read + write
  *  1: write
  */
-void print_diskio(struct text_object *obj, int dir, char *p, int p_max_size)
+static void print_diskio_dir(struct text_object *obj, int dir, char *p, int p_max_size)
 {
        struct diskio_stat *diskio = obj->data.opaque;
        double val;
@@ -139,6 +139,21 @@ void print_diskio(struct text_object *obj, int dir, char *p, int p_max_size)
        human_readable((val / update_interval) * 1024LL, p, p_max_size);
 }
 
+void print_diskio(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskio_dir(obj, 0, p, p_max_size);
+}
+
+void print_diskio_read(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskio_dir(obj, -1, p, p_max_size);
+}
+
+void print_diskio_write(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskio_dir(obj, 1, p, p_max_size);
+}
+
 #ifdef X11
 void parse_diskiograph_arg(struct text_object *obj, const char *arg)
 {
@@ -150,7 +165,7 @@ void parse_diskiograph_arg(struct text_object *obj, const char *arg)
                free(buf);
 }
 
-void print_diskiograph(struct text_object *obj, int dir, char *p)
+static void print_diskiograph_dir(struct text_object *obj, int dir, char *p, int p_max_size)
 {
        struct diskio_stat *diskio = obj->data.opaque;
        double val;
@@ -158,6 +173,9 @@ void print_diskiograph(struct text_object *obj, int dir, char *p)
        if (!diskio)
                return;
 
+       if (!p_max_size)
+               return;
+
        if (dir < 0)
                val = diskio->current_read;
        else if (dir == 0)
@@ -167,6 +185,21 @@ void print_diskiograph(struct text_object *obj, int dir, char *p)
 
        new_graph(obj, p, val);
 }
+
+void print_diskiograph(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskiograph_dir(obj, 0, p, p_max_size);
+}
+
+void print_diskiograph_read(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskiograph_dir(obj, -1, p, p_max_size);
+}
+
+void print_diskiograph_write(struct text_object *obj, char *p, int p_max_size)
+{
+       print_diskiograph_dir(obj, 1, p, p_max_size);
+}
 #endif /* X11 */
 
 void update_diskio_values(struct diskio_stat *ds,

diff --git a/src/diskio.h b/src/diskio.h
index 10c44b7..6225bbf 100644 (file)
--- a/src/diskio.h
+++ b/src/diskio.h
@@ -52,10 +52,14 @@ void clear_diskio_stats(void);
 void update_diskio_values(struct diskio_stat *, unsigned int, unsigned int);
 
 void parse_diskio_arg(struct text_object *, const char *);
-void print_diskio(struct text_object *, int, char *, int);
+void print_diskio(struct text_object *, char *, int);
+void print_diskio_read(struct text_object *, char *, int);
+void print_diskio_write(struct text_object *, char *, int);
 #ifdef X11
 void parse_diskiograph_arg(struct text_object *, const char *);
-void print_diskiograph(struct text_object *, int, char *);
+void print_diskiograph(struct text_object *, char *, int);
+void print_diskiograph_read(struct text_object *, char *, int);
+void print_diskiograph_write(struct text_object *, char *, int);
 #endif /* X11 */
 
 #endif /* DISKIO_H_ */