Rename action: "show_graph" -> "show_instance".

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index ff78482e520a32e98edd508506be6147019e587d..81a2e19ae7227422e6918c023cf1a75960cb9c59 100644 (file)
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -79,7 +79,7 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
   inst_describe (cfg, inst, desc, sizeof (desc));
   html_escape_buffer (desc, sizeof (desc));
 
-  printf ("    <li class=\"instance\"><a href=\"%s?action=show_graph;%s\">%s</a></li>\n",
+  printf ("    <li class=\"instance\"><a href=\"%s?action=show_instance;%s\">%s</a></li>\n",
       script_name (), params, desc);
 
   return (0);

diff --git a/src/action_show_instance.c b/src/action_show_instance.c
index a45fb4983ccbfb73dc2b0c897a0b79d23cd74cbc..1f6475ffde39de9ddee0a685dbcd2c5611fe2c2e 100644 (file)
--- a/src/action_show_instance.c
+++ b/src/action_show_instance.c
@@ -136,7 +136,7 @@ static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
   html_escape_buffer (params, sizeof (params));
 
   printf ("    <li class=\"instance\">"
-      "<a href=\"%s?action=show_graph;%s\">%s</a></li>\n",
+      "<a href=\"%s?action=show_instance;%s\">%s</a></li>\n",
       script_name (), params, descr);
 
   return (0);
@@ -157,7 +157,7 @@ static int show_instance_list (void *user_data) /* {{{ */
   html_escape_buffer (params, sizeof (params));
 
   printf ("<ul class=\"graph_list\">\n"
-      "  <li class=\"graph\"><a href=\"%s?action=show_graph;%s\">%s</a>\n"
+      "  <li class=\"graph\"><a href=\"%s?action=show_instance;%s\">%s</a>\n"
       "  <ul class=\"instance_list\">\n",
       script_name (), params, title);
 
@@ -212,14 +212,6 @@ static int show_instance (void *user_data) /* {{{ */
   return (0);
 } /* }}} int show_instance */
 
-static int show_graph (void *user_data) /* {{{ */
-{
-  show_graph_data_t *data = user_data;
-
-  show_breadcrump (data);
-  return (show_instance_list (user_data));
-} /* }}} int show_graph */
-
 int action_show_instance (void) /* {{{ */
 {
   page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT;

diff --git a/src/main.c b/src/main.c
index 208318d5fd3d349c855d746654ff2d875d53122c..1d1ba0a1d24d31dbb0b75bc93b1d03f2f3ac818d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -37,7 +37,7 @@ static const action_t actions[] =
   { "graph",       action_graph },
   { "list_graphs", action_list_graphs },
   { "search_json", action_search_json },
-  { "show_graph",  action_show_instance },
+  { "show_instance", action_show_instance },
   { "usage",       action_usage }
 };
 static const size_t actions_num = sizeof (actions) / sizeof (actions[0]);