Changeset 481 for trunk/src/sh_log_evalrule.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_log_evalrule.c (modified) (17 diffs)

trunk/src/sh_log_evalrule.c

@@ -470 +470 @@
 }
 
-static struct sh_qeval ** dummy_queue;
-static char            ** dummy_dstr;
+struct sh_qeval ** sh_dummy_472_queue;
+char            ** sh_dummy_473_dstr;
 
 int sh_eval_radd (const char * str)
@@ -477 +477 @@
   struct sh_geval * nr;
   struct sh_geval * tmp;
-  struct sh_qeval * queue = NULL;
+  struct sh_qeval * queue;
   pcre *  rule;
   pcre_extra * rule_extra;
@@ -506 +506 @@
   splits = split_array(new, &nfields, ':', lengths);
 
-  dummy_queue = &queue;
-  dummy_dstr  = &dstr;
+  sh_dummy_472_queue = &queue;
+  sh_dummy_473_dstr  = &dstr;
+
+  queue = NULL;
 
   if (nfields < 2 || nfields > 3)
@@ -593 +595 @@
   pcre_fullinfo(rule, rule_extra, PCRE_INFO_CAPTURECOUNT, &captures);
 
-  if (flag_err_debug == SL_TRUE)
+  if (flag_err_debug == S_TRUE)
     {
       char * emsg = SH_ALLOC(SH_ERRBUF_SIZE);
@@ -654 +656 @@
   if (group_open)
     {
-      if (flag_err_debug == SL_TRUE)
+      if (flag_err_debug == S_TRUE)
         {
           char * emsg = SH_ALLOC(SH_ERRBUF_SIZE);
@@ -826 +828 @@
  * filled in
  */
-static struct sh_geval ** dummy1;
+struct sh_geval ** sh_dummy_828_rule;
 
 static struct sh_geval * test_rule (struct sh_geval * rule, sh_string *msg, time_t tstamp)
@@ -834 +836 @@
   volatile time_t timestamp = tstamp;
 
-  dummy1 = &rule;
+  sh_dummy_828_rule = &rule;
 
   if (!rule)
@@ -844 +846 @@
       do {
 
-        if (flag_err_debug == SL_TRUE)
+        if (flag_err_debug == S_TRUE)
           {
             char * emsg = SH_ALLOC(SH_ERRBUF_SIZE);
@@ -864 +866 @@
             rule->ovecnum = res;
 
-            if (flag_err_debug == SL_TRUE)
+            if (flag_err_debug == S_TRUE)
               {
                 char * emsg = SH_ALLOC(SH_ERRBUF_SIZE);
@@ -900 +902 @@
           }
 
-        if (flag_err_debug == SL_TRUE)
+        if (flag_err_debug == S_TRUE)
           {
             char * emsg = SH_ALLOC(SH_ERRBUF_SIZE);
@@ -919 +921 @@
     DEBUG("debug: no match found\n");
   /* If there was no match, this is NULL */
-  dummy1 = NULL;
+  sh_dummy_828_rule = NULL;
   return rule;
 }
@@ -926 +928 @@
  * against msg
  */
-static struct sh_geval ** dummy2;
-static struct sh_geval ** dummy3;
+struct sh_geval ** sh_dummy_928_result;
+struct sh_geval ** sh_dummy_929_group;
 
 static struct sh_geval * test_grules (struct sh_heval * host, 
@@ -936 +938 @@
   struct sh_geval * group  = host->rulegroups;
 
-  dummy2 = &result;
-  dummy3 = &group;
+  sh_dummy_928_result = &result;
+  sh_dummy_929_group  = &group;
 
   if (group && sh_string_len(msg) < (size_t)INT_MAX)
@@ -947 +949 @@
             /* this is a rule group */
 
-            if (flag_err_debug == SL_TRUE)
+            if (flag_err_debug == S_TRUE)
               {
                 char * emsg = SH_ALLOC(SH_ERRBUF_SIZE);
@@ -975 +977 @@
              */
 
-            if (flag_err_debug == SL_TRUE)
+            if (flag_err_debug == S_TRUE)
               {
                 char * emsg = SH_ALLOC(SH_ERRBUF_SIZE);
@@ -995 +997 @@
     }
 
-  dummy2 = NULL;
-  dummy3 = NULL;
+  sh_dummy_928_result = NULL;
+  sh_dummy_929_group  = NULL;
   return result;
 }
@@ -1113 +1115 @@
 static zAVLKey sh_eval_getkey(void const *item)
 {
-  return ((struct sh_ceval *)item)->hostname->str;
+  return ((const struct sh_ceval *)item)->hostname->str;
 }