Author: mattm
Date: 2017-08-12 16:45:13 +0200 (Sat, 12 Aug 2017)
New Revision: 29345

Modified:
   trunk/gvm/ChangeLog
   trunk/gvm/src/gmp.c
   trunk/gvm/src/gmpd.c
   trunk/gvm/src/gvmd.c
   trunk/gvm/src/manage_sql.c
Log:
        * src/gmp.c (init_gmp): Remove old return from doc.

        * src/gmpd.c (init_gmpd): Remove old return from doc.

        * src/gvmd.c (update_nvt_cache, main): Remove old return case.

        * src/manage_sql.c (check_db_versions, init_manage_internal): Remove
        -3 return from doc, this never happens any more.

Modified: trunk/gvm/ChangeLog
===================================================================
--- trunk/gvm/ChangeLog 2017-08-12 14:38:09 UTC (rev 29344)
+++ trunk/gvm/ChangeLog 2017-08-12 14:45:13 UTC (rev 29345)
@@ -1,5 +1,16 @@
 2017-08-12  Matthew Mundell <matthew.mund...@greenbone.net>
 
+       * src/gmp.c (init_gmp): Remove old return from doc.
+
+       * src/gmpd.c (init_gmpd): Remove old return from doc.
+
+       * src/gvmd.c (update_nvt_cache, main): Remove old return case.
+
+       * src/manage_sql.c (check_db_versions, init_manage_internal): Remove
+       -3 return from doc, this never happens any more.
+
+2017-08-12  Matthew Mundell <matthew.mund...@greenbone.net>
+
        * src/gvmd.c (update_nvt_cache_retry): Remove args.  Always the same.
        (fork_update_nvt_cache): Update call accordingly.
 

Modified: trunk/gvm/src/gmp.c
===================================================================
--- trunk/gvm/src/gmp.c 2017-08-12 14:38:09 UTC (rev 29344)
+++ trunk/gvm/src/gmp.c 2017-08-12 14:45:13 UTC (rev 29345)
@@ -30482,9 +30482,8 @@
  *                              daemon layer, or NULL.
  * @param[in]  skip_db_check    Skip DB check.
  *
- * @return 0 success, -1 error, -2 database is wrong version, -3 database
- *         needs to be initialized from server, -4 max_ips_per_target out of
- *         range.
+ * @return 0 success, -1 error, -2 database is wrong version,
+ *         -4 max_ips_per_target out of range.
  */
 int
 init_gmp (GSList *log_config, int nvt_cache_mode, const gchar *database,

Modified: trunk/gvm/src/gmpd.c
===================================================================
--- trunk/gvm/src/gmpd.c        2017-08-12 14:38:09 UTC (rev 29344)
+++ trunk/gvm/src/gmpd.c        2017-08-12 14:45:13 UTC (rev 29345)
@@ -107,9 +107,8 @@
  *                              daemon layer, or NULL.
  * @param[in]  skip_db_check    Skip DB check.
  *
- * @return 0 success, -1 error, -2 database is wrong version, -3 database
- *         needs to be initialized from server, -4 max_ips_per_target out of
- *         range.
+ * @return 0 success, -1 error, -2 database is wrong version,
+ *         -4 max_ips_per_target out of range.
  */
 int
 init_gmpd (GSList *log_config, int nvt_cache_mode, const gchar *database,

Modified: trunk/gvm/src/gvmd.c
===================================================================
--- trunk/gvm/src/gvmd.c        2017-08-12 14:38:09 UTC (rev 29344)
+++ trunk/gvm/src/gvmd.c        2017-08-12 14:45:13 UTC (rev 29345)
@@ -958,8 +958,6 @@
         log_config_free ();
         exit (EXIT_FAILURE);
         break;
-      case -3:
-        assert (0);
       case -1:
       default:
         g_critical ("%s: failed to initialise GMP daemon\n", __FUNCTION__);
@@ -2119,13 +2117,6 @@
         log_config_free ();
         exit (EXIT_FAILURE);
         break;
-      case -3:
-        g_critical ("%s: database must be initialised"
-                    " (with --update or --rebuild)\n",
-                    __FUNCTION__);
-        log_config_free ();
-        exit (EXIT_FAILURE);
-        break;
       case -4:
         g_critical ("%s: --max-ips-per-target out of range\n", __FUNCTION__);
         log_config_free ();

Modified: trunk/gvm/src/manage_sql.c
===================================================================
--- trunk/gvm/src/manage_sql.c  2017-08-12 14:38:09 UTC (rev 29344)
+++ trunk/gvm/src/manage_sql.c  2017-08-12 14:45:13 UTC (rev 29345)
@@ -14058,8 +14058,7 @@
  *
  * @param[in]  nvt_cache_mode  True when running in NVT caching mode.
  *
- * @return 0 success, -1 error, -2 database is wrong version, -3 database
- *         needs to be initialised from server.
+ * @return 0 success, -1 error, -2 database is wrong version.
  */
 int
 check_db_versions (int nvt_cache_mode)
@@ -15412,8 +15411,8 @@
  * @param[in]  skip_db_check       Skip DB check.
  * @param[in]  check_encryption_key  Check encryption key if doing DB check.
  *
- * @return 0 success, -1 error, -2 database is wrong version, -3 database needs
- *         to be initialised from server, -4 max_ips_per_target out of range.
+ * @return 0 success, -1 error, -2 database is wrong version,
+ *         -4 max_ips_per_target out of range.
  */
 static int
 init_manage_internal (GSList *log_config,

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits

Reply via email to