[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvas-cvs
Subject:    [Openvas-commits] r22678 - in trunk/openvas-manager: . src
From:       scm-commit () wald ! intevation ! org
Date:       2015-06-29 10:04:34
Message-ID: 20150629100435.1BA7C9A194C0 () wald ! intevation ! org
[Download RAW message or body]

Author: timopollmeier
Date: 2015-06-29 12:04:34 +0200 (Mon, 29 Jun 2015)
New Revision: 22678

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage_sql.c
Log:
	* src/manage_sql.c (event): Use GArray functions for alerts_triggered
	instead of GPointerArray / array_t ones as pointers can be a different
	size than alert_t on some systems.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2015-06-25 08:22:49 UTC (rev 22677)
+++ trunk/openvas-manager/ChangeLog	2015-06-29 10:04:34 UTC (rev 22678)
@@ -1,3 +1,9 @@
+2015-06-29  Timo Pollmeier <timo.pollmeier@greenbone.net>
+
+	* src/manage_sql.c (event): Use GArray functions for alerts_triggered
+	instead of GPointerArray / array_t ones as pointers can be a different
+	size than alert_t on some systems.
+
 2015-06-19  Hani Benhabiles <hani.benhabiles@greenbone.net>
 
 	* src/manage.c (parse_osp_report): Handle result qod value.

Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c	2015-06-25 08:22:49 UTC (rev 22677)
+++ trunk/openvas-manager/src/manage_sql.c	2015-06-29 10:04:34 UTC (rev 22678)
@@ -8871,12 +8871,12 @@
 event (task_t task, event_t event, void* event_data)
 {
   iterator_t alerts;
-  array_t *alerts_triggered;
+  GArray *alerts_triggered;
   guint index;
 
   tracef ("   EVENT %i on task %llu", event, task);
 
-  alerts_triggered = make_array ();
+  alerts_triggered = g_array_new (TRUE, TRUE, sizeof (alert_t));
 
   init_task_alert_iterator (&alerts, task, event);
   while (next (&alerts))
@@ -8888,7 +8888,7 @@
 
           condition = alert_condition (alert);
           if (condition_met (task, alert, condition))
-            array_add (alerts_triggered, (void*) alert);
+            g_array_append_val (alerts_triggered, alert);
         }
     }
   cleanup_iterator (&alerts);
@@ -8902,7 +8902,7 @@
       alert_t alert;
       alert_condition_t condition;
 
-      alert = (alert_t) g_ptr_array_index (alerts_triggered, index);
+      alert = g_array_index (alerts_triggered, alert_t, index);
       condition = alert_condition (alert);
       escalate_1 (alert,
                   task,
@@ -8912,7 +8912,7 @@
                   condition);
     }
 
-  g_ptr_array_free (alerts_triggered, TRUE);
+  g_array_free (alerts_triggered, TRUE);
 }
 
 /**

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]