X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=graph_list.h;h=e6b6888cdbf528724ac18a310dd8a70f9d8fcfd8;hb=de9239ac3e16e12503eae5ddbfcdaae27f262081;hp=567575b8f3a29abbe283851f37fb0d81e89ff8fe;hpb=0bdac0286e8d3c42dd8d5c3058d822e9ad0e6313;p=collection4.git

diff --git a/graph_list.h b/graph_list.h
index 567575b..e6b6888 100644
--- a/graph_list.h
+++ b/graph_list.h
@@ -1,68 +1,30 @@
 #ifndef GRAPH_LIST_H
 #define GRAPH_LIST_H 1
 
-#include "utils_array.h"
-
-struct graph_ident_s;
-typedef struct graph_ident_s graph_ident_t;
-
-struct graph_instance_s;
-typedef struct graph_instance_s graph_instance_t;
-
-struct graph_config_s;
-typedef struct graph_config_s graph_config_t;
-
-/*
- * Callback types
- */
-typedef int (*gl_cfg_callback) (graph_config_t *cfg,
-    void *user_data);
-
-typedef int (*gl_inst_callback) (graph_config_t *cfg,
-    graph_instance_t *inst, void *user_data);
+#include "graph_types.h"
+#include "graph.h"
+#include "graph_instance.h"
 
 /*
  * Functions
  */
-char *ident_to_file (const graph_ident_t *ident);
-
-int gl_graph_get_all (gl_cfg_callback callback,
-    void *user_data);
-
-graph_config_t *graph_get_selected (void);
+int gl_add_graph (graph_config_t *cfg);
 
-int gl_graph_get_title (graph_config_t *cfg,
-    char *buffer, size_t buffer_size);
+int gl_config_submit (void);
 
-int gl_graph_instance_get_all (graph_config_t *cfg,
-    gl_inst_callback callback, void *user_data);
+graph_config_t *gl_graph_get_selected (void);
 
-graph_instance_t *inst_get_selected (graph_config_t *cfg);
+int gl_graph_get_all (graph_callback_t callback, void *user_data);
 
-int gl_instance_get_all (gl_inst_callback callback,
+int gl_graph_instance_get_all (graph_config_t *cfg, graph_inst_callback_t callback,
     void *user_data);
 
-int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst,
-    char *buffer, size_t buffer_size);
+int gl_instance_get_all (graph_inst_callback_t callback, void *user_data);
 
-int gl_instance_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
-    str_array_t *args);
-
-struct graph_list_s
-{
-  char *host;
-  char *plugin;
-  char *plugin_instance;
-  char *type;
-  char *type_instance;
-};
-typedef struct graph_list_s graph_list_t;
-
-typedef int (*gl_callback) (
-    const graph_list_t *, void *user_data);
+int gl_search (const char *search, graph_inst_callback_t callback,
+    void *user_data);
 
 int gl_update (void);
-int gl_foreach (gl_callback callback, void *user_data);
 
 #endif /* GRAPH_LIST_H */
 /* vim: set sw=2 sts=2 et fdm=marker : */