Change: rename trigger_2 to trigger

Author: mattmundell

src/manage_events.c

@@ -459,8 +459,8 @@ trigger_with_presets (alert_t alert, task_t task, report_t report,
                                     method == ALERT_METHOD_EMAIL ? 1000 : -1);
     }
 
-  ret = trigger_2 (alert, task, report, event, event_data, method, condition,
-                   &get, 1, 1, script_message);
+  ret = trigger (alert, task, report, event, event_data, method, condition,
+                 &get, 1, 1, script_message);
   free (results_filter);
   g_free (get.filter);
   return ret;

src/manage_sql.c

@@ -10528,11 +10528,11 @@ trigger_to_vfire (alert_t alert, task_t task, report_t report, event_t event,
  *         find filter, -4 failed to find credential, -5 alert script failed.
  */
 int
-trigger_2 (alert_t alert, task_t task, report_t report, event_t event,
-           const void* event_data, alert_method_t method,
-           alert_condition_t condition,
-           const get_data_t *get, int notes_details, int overrides_details,
-           gchar **script_message)
+trigger (alert_t alert, task_t task, report_t report, event_t event,
+         const void* event_data, alert_method_t method,
+         alert_condition_t condition,
+          const get_data_t *get, int notes_details, int overrides_details,
+          gchar **script_message)
 {
   if (script_message)
     *script_message = NULL;
@@ -27761,9 +27761,9 @@ manage_send_report (report_t report, report_t delta_report,
       condition = alert_condition (alert);
       method = alert_method (alert);
 
-      ret = trigger_2 (alert, task, report, EVENT_TASK_RUN_STATUS_CHANGED,
-                       (void*) TASK_STATUS_DONE, method, condition,
-                       get, notes_details, overrides_details, NULL);
+      ret = trigger (alert, task, report, EVENT_TASK_RUN_STATUS_CHANGED,
+                     (void*) TASK_STATUS_DONE, method, condition,
+                     get, notes_details, overrides_details, NULL);
       if (ret == -3)
         return -4;
       if (ret == -1)

src/manage_sql.h

@@ -515,11 +515,11 @@ void
 update_all_config_caches ();
 
 int
-trigger_2 (alert_t alert, task_t task, report_t report, event_t event,
-           const void* event_data, alert_method_t method,
-           alert_condition_t condition,
-           const get_data_t *get, int notes_details, int overrides_details,
-           gchar **script_message);
+trigger (alert_t alert, task_t task, report_t report, event_t event,
+         const void* event_data, alert_method_t method,
+         alert_condition_t condition,
+         const get_data_t *get, int notes_details, int overrides_details,
+         gchar **script_message);
 
 int
 task_second_last_report (task_t, report_t *);