Skip to content
Permalink
Browse files

theme: Replace char array element comparisons with strncmp

  • Loading branch information...
magcius authored and vkareh committed Mar 1, 2012
1 parent 48b0b11 commit 9b6f737a66009e139fcf6979fbbdbad33746df80
Showing with 7 additions and 19 deletions.
  1. +7 −19 src/ui/theme.c
@@ -1164,10 +1164,8 @@ meta_color_spec_new_from_string (const char *str,
MetaColorSpec *spec;

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;
@@ -1241,7 +1239,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;
@@ -1308,8 +1306,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;
@@ -1377,8 +1374,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;
@@ -1717,20 +1713,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;

0 comments on commit 9b6f737

Please sign in to comment.
You can’t perform that action at this time.