aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2005-09-12 15:54:20 +0000
committerGuy Harris <guy@alum.mit.edu>2005-09-12 15:54:20 +0000
commit3db317ca2bb2e2bbd1e8e4a394ff4635ebcedc5a (patch)
tree14ba60de979fc405663be2ae9e8f8be018675fb7
parent45e8a4c5796d00717fea832784be667982e42d26 (diff)
Again, "g_strdown()" doesn't return a value in GLib 1.2[.x].
svn path=/trunk/; revision=15768
-rw-r--r--epan/dtd_grammar.lemon28
1 files changed, 22 insertions, 6 deletions
diff --git a/epan/dtd_grammar.lemon b/epan/dtd_grammar.lemon
index fc98472c99..d5f0f0281d 100644
--- a/epan/dtd_grammar.lemon
+++ b/epan/dtd_grammar.lemon
@@ -84,7 +84,8 @@ dtd ::= doctype.
dtd ::= dtd_parts.
doctype ::= TAG_START DOCTYPE_KW NAME(Name) OPEN_BRACKET dtd_parts CLOSE_BRACKET TAG_STOP. {
- bd->proto_name = g_strdown(g_strdup(Name->text));
+ bd->proto_name = g_strdup(Name->text);
+ g_strdown(bd->proto_name);
}
dtd_parts ::= dtd_parts element(Element). { g_ptr_array_add(bd->elements,Element); }
@@ -103,7 +104,10 @@ attrib_list(A) ::= attrib_list(B) attrib(C). { g_ptr_array_add(B,C); A = B; }
attrib_list(A) ::= attrib(B). { A = g_ptr_array_new(); g_ptr_array_add(A,B); }
%type attrib { gchar* }
-attrib(A) ::= NAME(B) att_type att_default. { A = g_strdown(g_strdup(B->text)); }
+attrib(A) ::= NAME(B) att_type att_default. {
+ A = g_strdup(B->text);
+ g_strdown(A);
+}
att_type ::= ATT_TYPE.
att_type ::= enumeration.
@@ -144,8 +148,20 @@ element_list(A) ::= element_list(B) COMMA sub_elements(C). { A = g_ptr_array_j
element_list(A) ::= element_list(B) PIPE sub_elements(C). { A = g_ptr_array_join(B,C); }
%type element_child { gchar* }
-element_child(A) ::= NAME(B). { A = g_strdown(g_strdup(B->text)); }
-element_child(A) ::= NAME(B) STAR. { A = g_strdown(g_strdup(B->text)); }
-element_child(A) ::= NAME(B) QUESTION. { A = g_strdown(g_strdup(B->text)); }
-element_child(A) ::= NAME(B) PLUS. { A = g_strdown(g_strdup(B->text)); }
+element_child(A) ::= NAME(B). {
+ A = g_strdup(B->text);
+ g_strdown(A);
+}
+element_child(A) ::= NAME(B) STAR. {
+ A = g_strdup(B->text);
+ g_strdown(A);
+}
+element_child(A) ::= NAME(B) QUESTION. {
+ A = g_strdup(B->text);
+ g_strdown(A);
+}
+element_child(A) ::= NAME(B) PLUS. {
+ A = g_strdup(B->text);
+ g_strdown(A);
+}