src/graph{,_instance}.[ch]: Implement graph instances as an array in graph_config_t.

[collection4.git] / src / graph.h

diff --git a/src/graph.h b/src/graph.h
index 6e9ae07..18d168c 100644 (file)
--- a/src/graph.h
+++ b/src/graph.h
@@ -1,15 +1,7 @@
 #ifndef GRAPH_H
 #define GRAPH_H 1
 
-/*
- * Data types
- */
-struct graph_config_s;
-typedef struct graph_config_s graph_config_t;
-
-#include "graph_def.h"
-#include "graph_ident.h"
-#include "graph_instance.h"
+#include "graph_types.h"
 #include "oconfig.h"
 #include "utils_array.h"
 
@@ -27,9 +19,9 @@ int graph_add_file (graph_config_t *cfg, const graph_ident_t *file);
 int graph_get_title (graph_config_t *cfg,
     char *buffer, size_t buffer_size);
 
-graph_ident_t *graph_get_selector (graph_config_t *cfg);
+int graph_get_params (graph_config_t *cfg, char *buffer, size_t buffer_size);
 
-graph_instance_t *graph_get_instances (graph_config_t *cfg);
+graph_ident_t *graph_get_selector (graph_config_t *cfg);
 
 graph_def_t *graph_get_defs (graph_config_t *cfg);
 
@@ -37,6 +29,18 @@ int graph_add_def (graph_config_t *cfg, graph_def_t *def);
 
 _Bool graph_matches (graph_config_t *cfg, const graph_ident_t *ident);
 
+int graph_inst_foreach (graph_config_t *cfg,
+    inst_callback_t cb, void *user_data);
+
+graph_instance_t *graph_inst_find_exact (graph_config_t *cfg,
+    graph_ident_t *ident);
+
+graph_instance_t *graph_inst_find_matching (graph_config_t *cfg,
+    const graph_ident_t *ident);
+
+int graph_inst_search (graph_config_t *cfg, const char *term,
+    graph_inst_callback_t callback, void *user_data);
+
 int graph_compare (graph_config_t *cfg, const graph_ident_t *ident);
 
 int graph_clear_instances (graph_config_t *cfg);