comparison src/audacious/tuple_formatter.c @ 3313:257c0d0c5806 trunk

use g_str_has_prefix() more.
author William Pitcock <nenolod@atheme-project.org>
date Fri, 10 Aug 2007 10:51:39 -0500
parents a97fb19a0148
children 328221f7a580
comparison
equal deleted inserted replaced
3310:dfbbad8d7953 3313:257c0d0c5806
75 for (iter = string; *iter != '\0'; iter++) 75 for (iter = string; *iter != '\0'; iter++)
76 { 76 {
77 /* if it's raw text, just copy the byte */ 77 /* if it's raw text, just copy the byte */
78 if (*iter != '$' && *iter != '%') 78 if (*iter != '$' && *iter != '%')
79 g_string_append_c(ctx->str, *iter); 79 g_string_append_c(ctx->str, *iter);
80 else if (*iter == '$' && *(iter + 1) == '{') 80 else if (g_str_has_prefix(iter, "${") == TRUE)
81 { 81 {
82 GString *expression = g_string_new(""); 82 GString *expression = g_string_new("");
83 GString *argument = g_string_new(""); 83 GString *argument = g_string_new("");
84 GString *sel = expression; 84 GString *sel = expression;
85 gchar *result; 85 gchar *result;
131 g_string_free(argument, TRUE); 131 g_string_free(argument, TRUE);
132 132
133 if (*iter == '\0') 133 if (*iter == '\0')
134 break; 134 break;
135 } 135 }
136 else if (*iter == '%' && *(iter + 1) == '{') 136 else if (g_str_has_prefix(iter, "%{") == TRUE)
137 { 137 {
138 GString *expression = g_string_new(""); 138 GString *expression = g_string_new("");
139 GString *argument = g_string_new(""); 139 GString *argument = g_string_new("");
140 GString *sel = expression; 140 GString *sel = expression;
141 gchar *result; 141 gchar *result;