X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_list.c;h=cf0ca4af8694e4766a627e1318536bb8ed00ff82;hb=b31c5fd56bfb8ccf78f67d952d97c1f83b883b78;hp=60ac94fc3cf55c7d23f04310ccdf5af096448b6f;hpb=3ba1ec553cbd4ea7a008e32c7f816b0294dbe860;p=collection4.git

diff --git a/src/graph_list.c b/src/graph_list.c
index 60ac94f..cf0ca4a 100644
--- a/src/graph_list.c
+++ b/src/graph_list.c
@@ -158,7 +158,7 @@ static int gl_clear_hosts (void) /* {{{ */
 
 static int gl_compare_hosts (const void *v0, const void *v1) /* {{{ */
 {
-  return (strcmp (v0, v1));
+  return (strcmp (*(char * const *) v0, *(char * const *) v1));
 } /* }}} int gl_compare_hosts */
 
 static int gl_register_file (const graph_ident_t *file, /* {{{ */
@@ -173,7 +173,7 @@ static int gl_register_file (const graph_ident_t *file, /* {{{ */
     graph_config_t *cfg = gl_active[i];
     int status;
 
-    if (!graph_matches_ident (cfg, file))
+    if (!graph_ident_matches (cfg, file))
       continue;
 
     status = graph_add_file (cfg, file);
@@ -381,7 +381,7 @@ int gl_instance_get_all (graph_inst_callback_t callback, /* {{{ */
 } /* }}} int gl_instance_get_all */
 /* }}} gl_instance_get_all, gl_graph_instance_get_all */
 
-int gl_search (const char *term, graph_inst_callback_t callback, /* {{{ */
+int gl_search_string (const char *term, graph_inst_callback_t callback, /* {{{ */
     void *user_data)
 {
   size_t i;
@@ -390,7 +390,7 @@ int gl_search (const char *term, graph_inst_callback_t callback, /* {{{ */
   {
     int status;
 
-    status = graph_inst_search (gl_active[i], term,
+    status = graph_search_inst_string (gl_active[i], term,
         /* callback  = */ callback,
         /* user data = */ user_data);
     if (status != 0)
@@ -401,7 +401,7 @@ int gl_search (const char *term, graph_inst_callback_t callback, /* {{{ */
   {
     int status;
 
-    status = graph_inst_search (gl_dynamic[i], term,
+    status = graph_search_inst_string (gl_dynamic[i], term,
         /* callback  = */ callback,
         /* user data = */ user_data);
     if (status != 0)
@@ -409,7 +409,7 @@ int gl_search (const char *term, graph_inst_callback_t callback, /* {{{ */
   }
 
   return (0);
-} /* }}} int gl_search */
+} /* }}} int gl_search_string */
 
 int gl_search_field (graph_ident_field_t field, /* {{{ */
     const char *field_value,
@@ -467,6 +467,7 @@ int gl_update (void) /* {{{ */
 {
   time_t now;
   int status;
+  size_t i;
 
   /*
   printf ("Content-Type: text/plain\n\n");
@@ -492,6 +493,9 @@ int gl_update (void) /* {{{ */
 
   gl_last_update = now;
 
+  for (i = 0; i < gl_active_num; i++)
+    graph_sort_instances (gl_active[i]);
+
   return (status);
 } /* }}} int gl_update */