[Openvas-commits] r5579 - in trunk/openvas-client: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-16 15:02:29 +0200 (Fri, 16 Oct 2009)
New Revision: 5579

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/src/omp-cli.c
Log:
	* src/omp-cli.c (main): Rename status to exit_status, as it was shadowed.

Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-10-16 12:51:03 UTC (rev 5578)
+++ trunk/openvas-client/ChangeLog	2009-10-16 13:02:29 UTC (rev 5579)
@@ -1,3 +1,7 @@
+2009-10-16  Matthew Mundell <matthew.mundell at intevation.de>
+
+	* src/omp-cli.c (main): Rename status to exit_status, as it was shadowed.
+
 2009-10-16  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	* src/omp-cli.c (print_tasks): Adjusted to differing OMP response for

Modified: trunk/openvas-client/src/omp-cli.c
===================================================================
--- trunk/openvas-client/src/omp-cli.c	2009-10-16 12:51:03 UTC (rev 5578)
+++ trunk/openvas-client/src/omp-cli.c	2009-10-16 13:02:29 UTC (rev 5579)
@@ -302,7 +302,7 @@
 {
   server_connection_t* connection = NULL;
   /* The return status of the command. */
-  int status = -1;
+  int exit_status = -1;
 
   /* Global options. */
   static gboolean prompt = FALSE;
@@ -552,7 +552,7 @@
       putchar ('\n');
 
       manager_close (connection);
-      status = 0;
+      exit_status = 0;
     }
   else if (cmd_delete_report)
     {
@@ -580,7 +580,7 @@
         }
 
       manager_close (connection);
-      status = 0;
+      exit_status = 0;
     }
   else if (cmd_delete_task)
     {
@@ -606,7 +606,7 @@
         }
 
       manager_close (connection);
-      status = 0;
+      exit_status = 0;
     }
   else if (cmd_get_status)
     {
@@ -650,7 +650,7 @@
         }
 
       manager_close (connection);
-      status = 0;
+      exit_status = 0;
     }
   else if (cmd_get_report)
     {
@@ -663,7 +663,7 @@
         }
 
       manager_open (connection);
-      status = manager_get_reports (connection, report_ids, format);
+      exit_status = manager_get_reports (connection, report_ids, format);
     }
   else if (cmd_modify_task)
     {
@@ -709,12 +709,12 @@
 
 #if 0
           /** todo As in get-report, this is how the commands will work. */
-          status = manager_modify_task_file (connection,
-                                             *point,
-                                             name,
-                                             content,
-                                             content_len,
-                                             error);
+          exit_status = manager_modify_task_file (connection,
+                                                  *point,
+                                                  name,
+                                                  content,
+                                                  content_len,
+                                                  error);
 #else
           if (omp_modify_task_file (&(connection->session), *point, name,
                                     content, content_len))
@@ -726,7 +726,7 @@
             }
 
           manager_close (connection);
-          status = 0;
+          exit_status = 0;
 #endif
         }
     }
@@ -752,7 +752,7 @@
             }
           point++;
         }
-      status = 0;
+      exit_status = 0;
 
       manager_close (connection);
     }
@@ -802,7 +802,7 @@
       manager_close (connection);
       free_entity (entity);
 
-      status = 0;
+      exit_status = 0;
     }
   else
     /* The option processing ensures that at least one command is present. */
@@ -812,11 +812,11 @@
 
   if (be_verbose)
     {
-      if (status)
+      if (exit_status)
         printf ("Command failed.\n");
       else
         printf ("Command completed successfully.\n");
     }
 
-  exit (status);
+  exit (exit_status);
 }