Author: mattm
Date: 2017-08-12 13:44:51 +0200 (Sat, 12 Aug 2017)
New Revision: 29341
Modified:
trunk/gvm/ChangeLog
trunk/gvm/src/manage_sql.h
trunk/gvm/src/manage_sql_nvts.c
Log:
* src/manage_sql.h (progress): Remove.
* src/manage_sql_nvts.c (insert_nvt_from_nvti, insert_nvt_preference)
(manage_complete_nvt_cache_update)
(manage_complete_nvt_cache_update): Remove progress calls.
Modified: trunk/gvm/ChangeLog
===================================================================
--- trunk/gvm/ChangeLog 2017-08-12 11:27:14 UTC (rev 29340)
+++ trunk/gvm/ChangeLog 2017-08-12 11:44:51 UTC (rev 29341)
@@ -1,5 +1,13 @@
-2017-08-10 Matthew Mundell <matthew.mund...@greenbone.net>
+2017-08-12 Matthew Mundell <matthew.mund...@greenbone.net>
+ * src/manage_sql.h (progress): Remove.
+
+ * src/manage_sql_nvts.c (insert_nvt_from_nvti, insert_nvt_preference)
+ (manage_complete_nvt_cache_update)
+ (manage_complete_nvt_cache_update): Remove progress calls.
+
+2017-08-12 Matthew Mundell <matthew.mund...@greenbone.net>
+
Remove --progress. Was only used by --rebuild and --update.
* src/gmp.c (init_gmp): Remove progress.
@@ -23,13 +31,13 @@
(fork_update_nvt_cache): Update call.
(main): Remove --progress. Update call.
-2017-08-10 Matthew Mundell <matthew.mund...@greenbone.net>
+2017-08-12 Matthew Mundell <matthew.mund...@greenbone.net>
* src/gvmd.c (main): Remove --update and --rebuild now that NVTs are
auto synced. Also remove --otp-scanner, which was only used by those
two.
-2017-08-10 Matthew Mundell <matthew.mund...@greenbone.net>
+2017-08-12 Matthew Mundell <matthew.mund...@greenbone.net>
Simply ignore SIGHUP, now that NVTs are automatically updated.
Modified: trunk/gvm/src/manage_sql.h
===================================================================
--- trunk/gvm/src/manage_sql.h 2017-08-12 11:27:14 UTC (rev 29340)
+++ trunk/gvm/src/manage_sql.h 2017-08-12 11:44:51 UTC (rev 29341)
@@ -354,8 +354,6 @@
extern gchar *task_db_name;
-void (*progress) ();
-
/* Function prototypes */
Modified: trunk/gvm/src/manage_sql_nvts.c
===================================================================
--- trunk/gvm/src/manage_sql_nvts.c 2017-08-12 11:27:14 UTC (rev 29340)
+++ trunk/gvm/src/manage_sql_nvts.c 2017-08-12 11:44:51 UTC (rev 29341)
@@ -987,9 +987,6 @@
if (nvti == NULL)
return;
- if (progress)
- progress ();
-
mode = GPOINTER_TO_INT (mode_pointer);
make_nvt_from_nvti (nvti, mode == -1);
@@ -1011,9 +1008,6 @@
if (nvt_preference == NULL)
return;
- if (progress)
- progress ();
-
mode = GPOINTER_TO_INT (mode_pointer);
preference = (preference_t*) nvt_preference;
manage_nvt_preference_add (preference->name, preference->value, mode == -1);
@@ -1148,8 +1142,6 @@
sql ("TRUNCATE nvts CASCADE;");
sql ("TRUNCATE nvt_preferences;");
}
- if (progress)
- progress ();
}
/* NVTs and preferences are buffered, insert them into DB. */
@@ -1158,8 +1150,6 @@
/* Remove preferences from configs where the preference has vanished from
* the associated NVT. */
- if (progress)
- progress ();
init_iterator (&configs, "SELECT id FROM configs;");
while (next (&configs))
sql ("DELETE FROM config_preferences"
@@ -1169,17 +1159,11 @@
get_iterator_resource (&configs));
cleanup_iterator (&configs);
- if (progress)
- progress ();
if (check_config_families ())
g_warning ("%s: Error updating config families."
" One or more configs refer to an outdated family of an NVT.",
__FUNCTION__);
- if (progress)
- progress ();
update_all_config_caches ();
- if (progress)
- progress ();
if (mode == -1)
sql_begin_exclusive ();
@@ -1211,9 +1195,6 @@
g_info ("Rebuilding NVT cache... done (%i NVTs).", count);
else
g_info ("Updating NVT cache... done (%i NVTs).", count);
-
- if (progress)
- progress ();
}
/**
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
