comparison src/paranormal/presets.c @ 963:9549fea94794 trunk

[svn] Warning fixes from SuSe.
author chainsaw
date Tue, 17 Apr 2007 14:45:19 -0700
parents fd9c0a5871ac
children 3b034150d31e
comparison
equal deleted inserted replaced
962:9f0ac3bb82f4 963:9549fea94794
21 /* cur->name should be the actuator name */ 21 /* cur->name should be the actuator name */
22 static void 22 static void
23 parse_actuator (xmlNodePtr cur, struct pn_actuator *a) 23 parse_actuator (xmlNodePtr cur, struct pn_actuator *a)
24 { 24 {
25 int i; 25 int i;
26 xmlChar *content; 26 char *content;
27 struct pn_actuator *child; 27 struct pn_actuator *child;
28 28
29 for (cur = cur->xmlChildrenNode; cur; cur = cur->next) 29 for (cur = cur->xmlChildrenNode; cur; cur = cur->next)
30 { 30 {
31 if (xmlIsBlankNode (cur) || cur->type != XML_ELEMENT_NODE) 31 if (xmlIsBlankNode (cur) || cur->type != XML_ELEMENT_NODE)
38 break; 38 break;
39 39
40 if (a->options && a->options[i].desc) 40 if (a->options && a->options[i].desc)
41 { 41 {
42 /* it is an option, so let's set it! */ 42 /* it is an option, so let's set it! */
43 content = xmlNodeGetContent (cur); 43 content = (char*)xmlNodeGetContent (cur);
44 44
45 /* FIXME: warning? */ 45 /* FIXME: warning? */
46 if (! content) 46 if (! content)
47 continue; 47 continue;
48 48
112 cur->name, c); 112 cur->name, c);
113 } 113 }
114 } 114 }
115 115
116 /* gotta free content */ 116 /* gotta free content */
117 xmlFree (content); 117 xmlFree ((xmlChar*)content);
118 } 118 }
119 /* See if we have a child actuator */ 119 /* See if we have a child actuator */
120 else if (a->desc->flags & ACTUATOR_FLAG_CONTAINER 120 else if (a->desc->flags & ACTUATOR_FLAG_CONTAINER
121 && (child = create_actuator (cur->name))) 121 && (child = create_actuator ((char*)cur->name)))
122 { 122 {
123 container_add_actuator (a, child); 123 container_add_actuator (a, child);
124 parse_actuator (cur, child); 124 parse_actuator (cur, child);
125 } 125 }
126 else 126 else
155 if (xmlIsBlankNode (cur) || cur->type != XML_ELEMENT_NODE) 155 if (xmlIsBlankNode (cur) || cur->type != XML_ELEMENT_NODE)
156 continue; 156 continue;
157 157
158 /* if (...) { ... } else if (is_documentation [see top of file]) ... else */ 158 /* if (...) { ... } else if (is_documentation [see top of file]) ... else */
159 { 159 {
160 a = create_actuator (cur->name); 160 a = create_actuator ((char*)cur->name);
161 161
162 /* FIXME: warn? */ 162 /* FIXME: warn? */
163 if (! a) 163 if (! a)
164 continue; 164 continue;
165 165