[Openvas-commits] r4006 - in trunk/openvas-client: . src/util

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-07-13 08:51:14 +0200 (Mon, 13 Jul 2009)
New Revision: 4006

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/src/util/severity_filter.c
Log:
* src/util/severity_filter.c (severity_filter_apply):
Improved readability by flattened code and easier (positive)
conditional.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-07-12 13:16:55 UTC (rev 4005)
+++ trunk/openvas-client/ChangeLog	2009-07-13 06:51:14 UTC (rev 4006)
@@ -1,5 +1,11 @@
-2009-07-11  Felix Wolfsteller <felix.wolfsteller at intevation.de>	
+2009-07-11  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	* src/util/severity_filter.c (severity_filter_apply):
+	Improved readability by flattened code and easier (positive)
+	conditional.
+
+2009-07-11  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	Backported from openvas-client-2-0 branch (revision 3956).
 
 	Unhide the new cli option to enable report conversion with active
@@ -15,7 +21,6 @@
 	* nessus/nessus.c (main):
 	Unhide the new option.
 
-
 2009-07-11  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	Backported from openvas-client-2-0 branch (revision 3942).

Modified: trunk/openvas-client/src/util/severity_filter.c
===================================================================
--- trunk/openvas-client/src/util/severity_filter.c	2009-07-12 13:16:55 UTC (rev 4005)
+++ trunk/openvas-client/src/util/severity_filter.c	2009-07-13 06:51:14 UTC (rev 4006)
@@ -231,17 +231,22 @@
 severity_filter_apply (const gchar * host, const gchar * port,
                        const gchar * oid, const gchar * severity)
 {
-  if (global_filter != NULL
-      && host != NULL && port != NULL && oid != NULL && severity != NULL) {
-    GSList * o = g_slist_nth(global_filter->overrides, 0);
-    while (o) {
-      if ((!strcmp(host, ((severity_override_t *)o->data)->host)) &&
-          (!strcmp(port, ((severity_override_t *)o->data)->port)) &&
-          (!strcmp(oid, ((severity_override_t *)o->data)->OID)) &&
-          (!strcmp(severity, ((severity_override_t *)o->data)->severity_from)))
-        return ((severity_override_t *)o->data)->severity_to;
-      o = g_slist_next(o);
+  if (global_filter == NULL
+      || host == NULL || port == NULL || oid == NULL || severity == NULL)
+    {
+      return NULL;
     }
+
+  GSList * o = g_slist_nth(global_filter->overrides, 0);
+
+  while (o) {
+    // Check matches
+    if ((!strcmp(host, ((severity_override_t *)o->data)->host)) &&
+        (!strcmp(port, ((severity_override_t *)o->data)->port)) &&
+        (!strcmp(oid, ((severity_override_t *)o->data)->OID)) &&
+        (!strcmp(severity, ((severity_override_t *)o->data)->severity_from)))
+      return ((severity_override_t *)o->data)->severity_to;
+    o = g_slist_next(o);
   }
 
   return NULL;
@@ -670,7 +675,7 @@
 
   g_free (filebuffer);
   g_markup_parse_context_free (context);
-  
+
   if (filter->name == NULL)
     {
       severity_filter_free (filter);