Merge branch 'search'

[collection4.git] / src / graph_instance.h

diff --git a/src/graph_instance.h b/src/graph_instance.h
index 72ab66a..f1a4486 100644 (file)
--- a/src/graph_instance.h
+++ b/src/graph_instance.h
@@ -1,23 +1,12 @@
 #ifndef GRAPH_INSTANCE_H
 #define GRAPH_INSTANCE_H 1
 
-/*
- * Data types
- */
-struct graph_instance_s;
-typedef struct graph_instance_s graph_instance_t;
-
-typedef int (*inst_callback_t) (graph_instance_t *inst, void *user_data);
-
 #include <time.h>
 
-#include "graph.h"
+#include "graph_types.h"
 #include "utils_array.h"
 
 /*
- * Callback types
- */
-/*
  * Methods
  */
 graph_instance_t *inst_create (graph_config_t *cfg,
@@ -42,6 +31,10 @@ int inst_append (graph_instance_t *head, graph_instance_t *inst);
 int inst_foreach (graph_instance_t *inst,
                inst_callback_t cb, void *user_data);
 
+int inst_search (graph_config_t *cfg, graph_instance_t *inst,
+    const char *term, inst_callback_t cb,
+    void *user_data);
+
 graph_instance_t *inst_find_matching (graph_instance_t *inst,
     const graph_ident_t *ident);