Change: move manage_check_alerts out of manage_sql.c

Author: mattmundell

src/manage.h

@@ -523,9 +523,6 @@ set_resource_id_deprecated (const char *, const char *, gboolean);
  "Please contact your local system administrator if you think it\n"           \
  "was created or assigned erroneously.\n"
 
-int
-manage_check_alerts (GSList *, const db_conn_info_t *);
-
 int
 create_alert (const char*, const char*, const char*, const char*, event_t,
               GPtrArray*, alert_condition_t, GPtrArray*, alert_method_t,

src/manage_alerts.c

@@ -372,3 +372,37 @@ manage_test_alert (const char *alert_id, gchar **script_message)
   free (report_id);
   return ret;
 }
+
+/**
+ * @brief Check if any SecInfo alerts are due.
+ *
+ * @param[in]  log_config  Log configuration.
+ * @param[in]  database    Location of manage database.
+ *
+ * @return 0 success, -1 error,
+ *         -2 database is too old, -3 database needs to be initialised
+ *         from server, -5 database is too new.
+ */
+int
+manage_check_alerts (GSList *log_config, const db_conn_info_t *database)
+{
+  int ret;
+
+  g_info ("   Checking alerts.");
+
+  ret = manage_option_setup (log_config, database,
+                             0 /* avoid_db_check_inserts */);
+  if (ret)
+    return ret;
+
+  /* Setup a dummy user, so that create_user will work. */
+  current_credentials.uuid = "";
+
+  check_alerts ();
+
+  current_credentials.uuid = NULL;
+
+  manage_option_cleanup ();
+
+  return ret;
+}

src/manage_alerts.h

@@ -22,6 +22,7 @@
 #include "iterator.h"
 #include "manage_get.h"
 #include "manage_tasks.h"
+#include "sql.h"
 
 #include <glib.h>
 
@@ -172,4 +173,7 @@ alert_task_iterator_uuid (iterator_t*);
 int
 alert_task_iterator_readable (iterator_t*);
 
+int
+manage_check_alerts (GSList *, const db_conn_info_t *);
+
 #endif /* not _GVMD_MANAGE_ALERTS_H */

src/manage_sql.c

@@ -6638,40 +6638,6 @@ DEF_ACCESS (task_role_iterator_uuid, 4);
 
 /* Events and Alerts. */
 
-/**
- * @brief Check if any SecInfo alerts are due.
- *
- * @param[in]  log_config  Log configuration.
- * @param[in]  database    Location of manage database.
- *
- * @return 0 success, -1 error,
- *         -2 database is too old, -3 database needs to be initialised
- *         from server, -5 database is too new.
- */
-int
-manage_check_alerts (GSList *log_config, const db_conn_info_t *database)
-{
-  int ret;
-
-  g_info ("   Checking alerts.");
-
-  ret = manage_option_setup (log_config, database,
-                             0 /* avoid_db_check_inserts */);
-  if (ret)
-    return ret;
-
-  /* Setup a dummy user, so that create_user will work. */
-  current_credentials.uuid = "";
-
-  check_alerts ();
-
-  current_credentials.uuid = NULL;
-
-  manage_option_cleanup ();
-
-  return ret;
-}
-
 /**
  * @brief Validate an email address.
  *