Changeset 481 for trunk/src/sh_log_parse_apache.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_parse_apache.c (modified) (7 diffs)

trunk/src/sh_log_parse_apache.c

@@ -63 +63 @@
  * by longjmp' warning. And no, 'volatile' proved insufficient.
  */
-static void * sh_dummy_new = NULL;
-static void * sh_dummy_fti = NULL;
-static void * sh_dummy_ftr = NULL;
+void * sh_dummy_65_new = NULL;
+void * sh_dummy_66_fti = NULL;
+void * sh_dummy_67_ftr = NULL;
 
 void * sh_eval_fileinfo_apache(char * str)
@@ -88 +88 @@
    * Avoids the 'clobbered by longjmp' warning. 
    */
-  sh_dummy_new = (void*) &new;
-  sh_dummy_fti = (void*) &f_time;
-  sh_dummy_ftr = (void*) &result;
+  sh_dummy_65_new = (void*) &new;
+  sh_dummy_66_fti = (void*) &f_time;
+  sh_dummy_67_ftr = (void*) &result;
 
   if (0 == strncmp("common", str, 6))
@@ -109 +109 @@
     }
 
-  if (flag_err_debug == SL_TRUE)
+  if (flag_err_debug == S_TRUE)
     {
       SH_MUTEX_LOCK(mutex_thread_nolog);
@@ -251 +251 @@
   sh_string_add_from_char(re_string, "$");
 
-  if (flag_err_debug == SL_TRUE)
+  if (flag_err_debug == S_TRUE)
     {
       SH_MUTEX_LOCK(mutex_thread_nolog);
@@ -304 +304 @@
   char         tstr[128];
   char         sstr[128];
-  char       * hstr;
+  const char * hstr;
   int          res;
   const char **hstr_addr = (const char **) &hstr;
@@ -310 +310 @@
   struct sh_fileinfo_apache * info = (struct sh_fileinfo_apache *) fileinfo;
 
-  if (sh_string_len(logline) > 0 && flag_err_debug == SL_TRUE)
+  if (sh_string_len(logline) > 0 && flag_err_debug == S_TRUE)
     {
       SH_MUTEX_LOCK(mutex_thread_nolog);
@@ -409 +409 @@
       record->pid       = PID_INVALID;
 
-      pcre_free(hstr); 
+      pcre_free_substring(hstr); 
       return record;
     }