muscles: rename private functions/macros

* src/muscle-tab.c (MUSCLE_COMMON_DECODE, muscle_string_decode)
(muscle_location_decode): Not related to muscles, rename as...
(COMMON_DECODE, string_decode, location_decode): these.
This commit is contained in:
Akim Demaille
2012-07-26 11:23:55 +02:00
parent 13b712d7d4
commit c1cc91bdcd

View File

@@ -284,7 +284,7 @@ muscle_location_grow (char const *key, location loc)
muscle_grow (key, "]]", ""); muscle_grow (key, "]]", "");
} }
#define MUSCLE_COMMON_DECODE(Value) \ #define COMMON_DECODE(Value) \
case '$': \ case '$': \
aver (*++(Value) == ']'); \ aver (*++(Value) == ']'); \
aver (*++(Value) == '['); \ aver (*++(Value) == '['); \
@@ -303,9 +303,9 @@ muscle_location_grow (char const *key, location loc)
obstack_1grow (&muscle_obstack, *(Value)); \ obstack_1grow (&muscle_obstack, *(Value)); \
break; break;
/* Reverse of MUSCLE_OBSTACK_SGROW. */ /* Reverse of obstack_escape. */
static char * static char *
muscle_string_decode (char const *key) string_decode (char const *key)
{ {
char const *value; char const *value;
char *value_decoded; char *value_decoded;
@@ -317,7 +317,7 @@ muscle_string_decode (char const *key)
do { do {
switch (*value) switch (*value)
{ {
MUSCLE_COMMON_DECODE (value) COMMON_DECODE (value)
case '[': case '[':
case ']': case ']':
aver (false); aver (false);
@@ -332,7 +332,7 @@ muscle_string_decode (char const *key)
/* Reverse of muscle_location_grow. */ /* Reverse of muscle_location_grow. */
static location static location
muscle_location_decode (char const *key) location_decode (char const *key)
{ {
location loc; location loc;
char const *value = muscle_find_const (key); char const *value = muscle_find_const (key);
@@ -342,7 +342,7 @@ muscle_location_decode (char const *key)
while (*++value) while (*++value)
switch (*value) switch (*value)
{ {
MUSCLE_COMMON_DECODE (value) COMMON_DECODE (value)
case '[': case '[':
aver (false); aver (false);
break; break;
@@ -455,7 +455,7 @@ muscle_percent_define_get (char const *variable)
variable, ")"); variable, ")");
muscle_insert (usage_name, ""); muscle_insert (usage_name, "");
value = muscle_string_decode (name); value = string_decode (name);
if (!value) if (!value)
value = xstrdup (""); value = xstrdup ("");
return value; return value;
@@ -469,7 +469,7 @@ muscle_percent_define_get_loc (char const *variable)
if (!muscle_find_const (loc_name)) if (!muscle_find_const (loc_name))
fatal(_("%s: undefined %%define variable %s"), fatal(_("%s: undefined %%define variable %s"),
"muscle_percent_define_get_loc", quote (variable)); "muscle_percent_define_get_loc", quote (variable));
return muscle_location_decode (loc_name); return location_decode (loc_name);
} }
char const * char const *
@@ -573,7 +573,7 @@ muscle_percent_define_check_values (char const * const *values)
name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")"); name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")");
value = muscle_string_decode (name); value = string_decode (name);
if (value) if (value)
{ {
for (++values; *values; ++values) for (++values; *values; ++values)