Changeset 510 for trunk/src

Timestamp:

Sep 20, 2016, 7:59:21 PM (8 years ago)

Author:

katerina

Message:

Fix for ticket #403 (case sensitivity of severity/class).

File:

• trunk/src/sh_error.c (modified) (8 diffs)

trunk/src/sh_error.c

@@ -244 +244 @@
 {
   char * p;
+  char * q;
   int    num = 0;
   unsigned int    i;
@@ -289 +290 @@
     if (p == NULL)
       break;
+
+    q = p; while (*q != '\0') { *q = toupper( (int) *q); ++q; }
 
     for (i = 0; i < SH_CLA_MAX; ++i)
@@ -495 +498 @@
   int i;
   int level = (-1);
+  char * tmp;
+  char * q;
   
   SL_ENTER(_("sh_error_convert_level"));
@@ -501 +506 @@
      SL_RETURN( -1, _("sh_error_convert_level"));
 
+  q = sh_util_strdup(str_s);
+  tmp = q; while (*tmp != '\0') { *tmp = tolower( (int) *tmp); ++tmp; }
+  
   for (i = 0; i < SH_EEF_MAX; ++i)
     {
-      if (0 == sl_strncmp(str_s, _(eef_tab[i].str), 
+      if (0 == sl_strncmp(q, _(eef_tab[i].str), 
                           sl_strlen(eef_tab[i].str))) 
         {
@@ -511 +519 @@
     }
 
+  SH_FREE(q);
   SL_RETURN( level, _("sh_error_convert_level"));
 }
@@ -554 +563 @@
 
   int  old_facility;
-  const char * str_s = str_in;
+  char * str_s;
+  char * str_orig;
+  char * tmp;
 
   SL_ENTER(_("sh_error_set_level"));
 
+  str_s = sh_util_strdup(str_in);
+  str_orig = str_s;
+  
+  tmp = str_s; while (*tmp != '\0') { *tmp = tolower( (int) *tmp); ++tmp; }
+  
   if (IsInitialized == BAD) 
     (void) sh_error_init();
@@ -650 +666 @@
   if (!str_s)
     {
+      if (str_orig) SH_FREE(str_orig);
       SL_RETURN ((-1), _("sh_error_set_level"));
     }
@@ -675 +692 @@
       sh_error_handle ((-1), FIL__, __LINE__, EINVAL, MSG_EINVALS, 
                        _("priority"), str_in);
+      SH_FREE(str_orig);
       SL_RETURN (-1, _("sh_error_set_level"));
     }
   compute_flag_err_debug();
   compute_flag_err_info();
+  SH_FREE(str_orig);
   SL_RETURN (0, _("sh_error_set_level"));
 }