[mutter/wip/cairo: 10/15] theme: Replace char array element comparisons with strncmp



commit c032fb41bd8487664f31d42befa8d0191e67089a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Mar 1 00:36:16 2012 -0500

    theme: Replace char array element comparisons with strncmp
    
    https://bugzilla.gnome.org/show_bug.cgi?id=662962

 src/ui/theme.c |   24 ++++++------------------
 1 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 433d683..7fcb0b8 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -1148,9 +1148,7 @@ meta_color_spec_new_from_string (const char *str,
 
   spec = NULL;
   
-  if (str[0] == 'g' && str[1] == 't' && str[2] == 'k' && str[3] == ':' &&
-      str[4] == 'c' && str[5] == 'u' && str[6] == 's' && str[7] == 't' &&
-      str[8] == 'o' && str[9] == 'm')
+  if (strncmp (str, "gtk:custom", 10) == 0)
     {
       const char *color_name_start, *fallback_str_start, *end;
       char *color_name;
@@ -1225,7 +1223,7 @@ meta_color_spec_new_from_string (const char *str,
       spec->data.gtkcustom.color_name = color_name;
       spec->data.gtkcustom.fallback = fallback;
     }
-  else if (str[0] == 'g' && str[1] == 't' && str[2] == 'k' && str[3] == ':')
+  else if (strncmp (str, "gtk:", 4) == 0)
     {
       /* GTK color */
       const char *bracket;
@@ -1292,8 +1290,7 @@ meta_color_spec_new_from_string (const char *str,
       spec->data.gtk.component = component;
       g_assert (spec->data.gtk.component < META_GTK_COLOR_LAST);
     }
-  else if (str[0] == 'b' && str[1] == 'l' && str[2] == 'e' && str[3] == 'n' &&
-           str[4] == 'd' && str[5] == '/')
+  else if (strncmp (str, "blend/", 6) == 0)
     {
       /* blend */
       char **split;
@@ -1361,8 +1358,7 @@ meta_color_spec_new_from_string (const char *str,
       spec->data.blend.background = bg;
       spec->data.blend.foreground = fg;
     }
-  else if (str[0] == 's' && str[1] == 'h' && str[2] == 'a' && str[3] == 'd' &&
-           str[4] == 'e' && str[5] == '/')
+  else if (strncmp (str, "shade/", 6) == 0)
     {
       /* shade */
       char **split;
@@ -1659,20 +1655,12 @@ op_from_string (const char *p,
       return POS_OP_MOD;
 
     case '`':
-      if (p[0] == '`' &&
-          p[1] == 'm' &&
-          p[2] == 'a' &&
-          p[3] == 'x' &&
-          p[4] == '`')
+      if (strncmp (p, "`max`", 5) == 0)
         {
           *len = 5;
           return POS_OP_MAX;
         }
-      else if (p[0] == '`' &&
-               p[1] == 'm' &&
-               p[2] == 'i' &&
-               p[3] == 'n' &&
-               p[4] == '`')
+      else if (strncmp (p, "`min`", 5) == 0)
         {
           *len = 5;
           return POS_OP_MIN;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]