From: Florian Forster <ff@octo.it>
Date: Wed, 21 Jul 2010 14:20:31 +0000 (+0200)
Subject: src/graph.[ch]: Implement "graph_add_inst".
X-Git-Tag: v4.0.0~77
X-Git-Url: https://git.octo.it/?p=collection4.git;a=commitdiff_plain;h=49e41ab84a7719050ada26760b0184180f085b55

src/graph.[ch]: Implement "graph_add_inst".
---

diff --git a/src/graph.c b/src/graph.c
index b654a1f..ad47e46 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -188,6 +188,25 @@ int graph_config_add (const oconfig_item_t *ci) /* {{{ */
   return (0);
 } /* }}} graph_config_add */
 
+int graph_add_inst (graph_config_t *graph, graph_instance_t *inst) /* {{{ */
+{
+  graph_instance_t **tmp;
+
+  if ((graph == NULL) || (inst == NULL))
+    return (EINVAL);
+
+  tmp = realloc (graph->instances,
+      sizeof (*graph->instances) * (graph->instances_num + 1));
+  if (tmp == NULL)
+    return (ENOMEM);
+  graph->instances = tmp;
+
+  graph->instances[graph->instances_num] = inst;
+  graph->instances_num++;
+
+  return (0);
+} /* }}} int graph_add_inst */
+
 int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
 {
   graph_instance_t *inst;
@@ -195,20 +214,11 @@ int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
   inst = graph_inst_find_matching (cfg, file);
   if (inst == NULL)
   {
-    graph_instance_t **tmp;
-
-    tmp = realloc (cfg->instances,
-        sizeof (*cfg->instances) * (cfg->instances_num + 1));
-    if (tmp == NULL)
-      return (ENOMEM);
-    cfg->instances = tmp;
-
     inst = inst_create (cfg, file);
     if (inst == NULL)
       return (ENOMEM);
 
-    cfg->instances[cfg->instances_num] = inst;
-    cfg->instances_num++;
+    graph_add_inst (cfg, inst);
   }
 
   return (inst_add_file (inst, file));
@@ -614,7 +624,7 @@ size_t graph_num_instances (graph_config_t *cfg) /* {{{ */
   return (cfg->instances_num);
 } /* }}} size_t graph_num_instances */
 
-int graph_to_json (const graph_config_t *cfg,
+int graph_to_json (const graph_config_t *cfg, /* {{{ */
     yajl_gen handler)
 {
   size_t i;
@@ -637,7 +647,7 @@ int graph_to_json (const graph_config_t *cfg,
   yajl_gen_map_close (handler);
 
   return (0);
-}
+} /* }}} int graph_to_json */
 
 static int graph_sort_instances_cb (const void *v0, const void *v1) /* {{{ */
 {
diff --git a/src/graph.h b/src/graph.h
index 0c4ff76..e9c603a 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -42,6 +42,10 @@ void graph_destroy (graph_config_t *graph);
 
 int graph_config_add (const oconfig_item_t *ci);
 
+/* Add "inst" to the internal list. The instance is *not* copied and may not be
+ * freed from the outside. */
+int graph_add_inst (graph_config_t *graph, graph_instance_t *inst);
+
 int graph_add_file (graph_config_t *cfg, const graph_ident_t *file);
 
 int graph_get_title (graph_config_t *cfg,