[Openvas-commits] r7898 - in trunk/openvas-manager: . src

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Jun 2 23:47:04 CEST 2010


Author: mattm
Date: 2010-06-02 23:47:03 +0200 (Wed, 02 Jun 2010)
New Revision: 7898

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/omp.c
Log:
	* src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_AGENTS rename var.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2010-06-02 20:11:26 UTC (rev 7897)
+++ trunk/openvas-manager/ChangeLog	2010-06-02 21:47:03 UTC (rev 7898)
@@ -1,5 +1,9 @@
 2010-06-02  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/omp.c (omp_xml_handle_end_element): In CLIENT_GET_AGENTS rename var.
+
+2010-06-02  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/omp.c (current_array_1, current_array_2, current_array_3)
 	(current_int_1, current_int_2, current_int_3, current_int_4)
 	(current_client_task): Remove.  Globals from old callback data mechanism.

Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c	2010-06-02 20:11:26 UTC (rev 7897)
+++ trunk/openvas-manager/src/omp.c	2010-06-02 21:47:03 UTC (rev 7898)
@@ -11408,7 +11408,7 @@
 
       case CLIENT_GET_AGENTS:
         {
-          iterator_t targets;
+          iterator_t agents;
           int format;
           agent_t agent = 0;
 
@@ -11458,11 +11458,11 @@
               SEND_TO_CLIENT_OR_FAIL ("<get_agents_response"
                                       " status=\"" STATUS_OK "\""
                                       " status_text=\"" STATUS_OK_TEXT "\">");
-              init_agent_iterator (&targets,
+              init_agent_iterator (&agents,
                                    agent,
                                    get_agents_data->sort_order,
                                    get_agents_data->sort_field);
-              while (next (&targets))
+              while (next (&agents))
                 {
                   switch (format)
                     {
@@ -11474,9 +11474,9 @@
                           "<package format=\"installer\">%s</package>"
                           "<in_use>0</in_use>"
                           "</agent>",
-                          agent_iterator_name (&targets),
-                          agent_iterator_comment (&targets),
-                          agent_iterator_installer (&targets));
+                          agent_iterator_name (&agents),
+                          agent_iterator_comment (&agents),
+                          agent_iterator_installer (&agents));
                         break;
                       case 2: /* howto_install */
                         SENDF_TO_CLIENT_OR_FAIL
@@ -11486,9 +11486,9 @@
                           "<package format=\"howto_install\">%s</package>"
                           "<in_use>0</in_use>"
                           "</agent>",
-                          agent_iterator_name (&targets),
-                          agent_iterator_comment (&targets),
-                          agent_iterator_howto_install (&targets));
+                          agent_iterator_name (&agents),
+                          agent_iterator_comment (&agents),
+                          agent_iterator_howto_install (&agents));
                         break;
                       case 3: /* howto_use */
                         SENDF_TO_CLIENT_OR_FAIL
@@ -11498,9 +11498,9 @@
                           "<package format=\"howto_use\">%s</package>"
                           "<in_use>0</in_use>"
                           "</agent>",
-                          agent_iterator_name (&targets),
-                          agent_iterator_comment (&targets),
-                          agent_iterator_howto_use (&targets));
+                          agent_iterator_name (&agents),
+                          agent_iterator_comment (&agents),
+                          agent_iterator_howto_use (&agents));
                         break;
                       default:
                         SENDF_TO_CLIENT_OR_FAIL
@@ -11509,12 +11509,12 @@
                           "<comment>%s</comment>"
                           "<in_use>0</in_use>"
                           "</agent>",
-                          agent_iterator_name (&targets),
-                          agent_iterator_comment (&targets));
+                          agent_iterator_name (&agents),
+                          agent_iterator_comment (&agents));
                         break;
                     }
                 }
-              cleanup_iterator (&targets);
+              cleanup_iterator (&agents);
               SEND_TO_CLIENT_OR_FAIL ("</get_agents_response>");
             }
           get_agents_data_reset (get_agents_data);



More information about the Openvas-commits mailing list