Mercurial > audlegacy

changeset 1591:02841f72b897 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] Cast variable to proper type before passing it into libxml2. Include necessary header to make this possible. Resolves 35 pointer signedness warnings on PPC.
author chainsaw
date Thu, 24 Aug 2006 11:40:00 -0700
parents fd943ec96935
children 752949e9aec4
files ChangeLog Plugins/Visualization/paranormal/client.c Plugins/Visualization/paranormal/pn/pnactuator.c Plugins/Visualization/paranormal/pn/pnbooleanoption.c Plugins/Visualization/paranormal/pn/pncontainer.c Plugins/Visualization/paranormal/pn/pnfloatoption.c Plugins/Visualization/paranormal/pn/pnintegeroption.c Plugins/Visualization/paranormal/pn/pnlistoption.c Plugins/Visualization/paranormal/pn/pnstringoption.c Plugins/Visualization/paranormal/pn/pnuserobject.c Plugins/Visualization/paranormal/pn/pnvis.c Plugins/Visualization/paranormal/pn/pnxml.h
diffstat 12 files changed, 35 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 24 11:11:30 2006 -0700
+++ b/ChangeLog	Thu Aug 24 11:40:00 2006 -0700
@@ -1,3 +1,14 @@
+2006-08-24 18:11:30 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2103]
+  Sync with upstream. ADL is now dual licensed, and RIX has had a pitch fixup. Free warning fix included.
+
+  Changes:        Modified:
+  +22 -17         trunk/Plugins/Input/adplug/core/adl.cpp  
+  +0 -14          trunk/Plugins/Input/adplug/core/adl.h  
+  +18 -61         trunk/Plugins/Input/adplug/core/rix.cpp  
+  +3 -8           trunk/Plugins/Input/adplug/core/rix.h  
+
+
 2006-08-24 06:09:05 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [2101]
   - file_path should not contain file name.
--- a/Plugins/Visualization/paranormal/client.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/client.c	Thu Aug 24 11:40:00 2006 -0700
@@ -592,7 +592,7 @@
   gtk_widget_set_usize (config_dialog, 500, 300);
   gtk_container_border_width (GTK_CONTAINER (config_dialog), 8);
   gtk_signal_connect_object (GTK_OBJECT (config_dialog), "delete-event",
-			     destroy_config_dialog, NULL);
+			     GTK_SIGNAL_FUNC (destroy_config_dialog), NULL);
 
   /* OK / Cancel / Apply */
   bbox = gtk_hbutton_box_new ();
--- a/Plugins/Visualization/paranormal/pn/pnactuator.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnactuator.c	Thu Aug 24 11:40:00 2006 -0700
@@ -135,13 +135,13 @@
 
   actuator = (PnActuator *) user_object;
 
-  options_node = xmlNewChild (node, NULL, "Options", NULL);
+  options_node = xmlNewChild (node, NULL, (xmlChar *) "Options", NULL);
 
   /* Save all the options  */
   for (i=0; i < actuator->options->len; i++)
     {
       option = g_array_index (actuator->options, PnOption *, i);
-      option_node = xmlNewChild (options_node, NULL, "BUG",  NULL);
+      option_node = xmlNewChild (options_node, NULL, (xmlChar *) "BUG",  NULL);
       pn_user_object_save_thyself (PN_USER_OBJECT (option), option_node);
     }
 
--- a/Plugins/Visualization/paranormal/pn/pnbooleanoption.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnbooleanoption.c	Thu Aug 24 11:40:00 2006 -0700
@@ -97,12 +97,12 @@
 
   boolean_option = (PnBooleanOption *) user_object;
 
-  value_node = xmlNewChild (node, NULL, "Value", NULL);
+  value_node = xmlNewChild (node, NULL, (xmlChar *) "Value", NULL);
 
   if (boolean_option->value)
-    xmlNodeSetContent (value_node, "True");
+    xmlNodeSetContent (value_node, (xmlChar *) "True");
   else
-    xmlNodeSetContent (value_node, "False");
+    xmlNodeSetContent (value_node, (xmlChar *) "False");
 
   if (parent_class->save_thyself)
     parent_class->save_thyself (user_object, node);
--- a/Plugins/Visualization/paranormal/pn/pncontainer.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pncontainer.c	Thu Aug 24 11:40:00 2006 -0700
@@ -134,13 +134,13 @@
 
   container = (PnContainer *) user_object;
 
-  actuators_node = xmlNewChild (node, NULL, "Actuators", NULL);
+  actuators_node = xmlNewChild (node, NULL, (xmlChar *) "Actuators", NULL);
 
   /* Save the actuators */
   for (i=0; i<container->actuators->len; i++)
     {
       actuator = g_array_index (container->actuators, PnActuator *, i);
-      actuator_node = xmlNewChild (actuators_node, NULL, "BUG", NULL);
+      actuator_node = xmlNewChild (actuators_node, NULL, (xmlChar *) "BUG", NULL);
       pn_user_object_save_thyself (PN_USER_OBJECT (actuator), actuator_node);
     }
 
--- a/Plugins/Visualization/paranormal/pn/pnfloatoption.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnfloatoption.c	Thu Aug 24 11:40:00 2006 -0700
@@ -109,9 +109,9 @@
 
   float_option = (PnFloatOption *) user_object;
 
-  value_node = xmlNewChild (node, NULL, "Value", NULL);
+  value_node = xmlNewChild (node, NULL, (xmlChar *) "Value", NULL);
   sprintf (str, "%f", float_option->value);
-  xmlNodeSetContent (value_node, str);
+  xmlNodeSetContent (value_node, (xmlChar *) str);
 
   if (parent_class->save_thyself)
     parent_class->save_thyself (user_object, node);
--- a/Plugins/Visualization/paranormal/pn/pnintegeroption.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnintegeroption.c	Thu Aug 24 11:40:00 2006 -0700
@@ -109,9 +109,9 @@
 
   integer_option = (PnIntegerOption *) user_object;
 
-  value_node = xmlNewChild (node, NULL, "Value", NULL);
+  value_node = xmlNewChild (node, NULL, (xmlChar *) "Value", NULL);
   sprintf (str, "%i", integer_option->value);
-  xmlNodeSetContent (value_node, str);
+  xmlNodeSetContent (value_node, (xmlChar *) str);
 
   if (parent_class->save_thyself)
     parent_class->save_thyself (user_object, node);
--- a/Plugins/Visualization/paranormal/pn/pnlistoption.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnlistoption.c	Thu Aug 24 11:40:00 2006 -0700
@@ -106,8 +106,8 @@
 
   list_option = (PnListOption *) user_object;
 
-  value_node = xmlNewChild (node, NULL, "Value", NULL);
-  xmlNodeSetContent (value_node, g_array_index (list_option->items, const gchar *, list_option->index));
+  value_node = xmlNewChild (node, NULL, (xmlChar *) "Value", NULL);
+  xmlNodeSetContent (value_node, (xmlChar *) g_array_index (list_option->items, const gchar *, list_option->index));
 
   if (parent_class->save_thyself)
     parent_class->save_thyself (user_object, node);
--- a/Plugins/Visualization/paranormal/pn/pnstringoption.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnstringoption.c	Thu Aug 24 11:40:00 2006 -0700
@@ -105,8 +105,8 @@
   g_return_if_fail (node != NULL);
 
   string_option = (PnStringOption *) user_object;
-  value_node = xmlNewChild (node, NULL, "Value", NULL);
-  xmlNodeSetContent (value_node, string_option->value);
+  value_node = xmlNewChild (node, NULL, (xmlChar *) "Value", NULL);
+  xmlNodeSetContent (value_node, (xmlChar *) string_option->value);
 
   if (parent_class->save_thyself)
     parent_class->save_thyself (user_object, node);
--- a/Plugins/Visualization/paranormal/pn/pnuserobject.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnuserobject.c	Thu Aug 24 11:40:00 2006 -0700
@@ -80,7 +80,7 @@
   g_return_if_fail (PN_IS_USER_OBJECT (user_object));
   g_return_if_fail (node != NULL);
 
-  xmlNodeSetName (node, user_object->name);
+  xmlNodeSetName (node, (xmlChar *) user_object->name);
 }
 
 void
--- a/Plugins/Visualization/paranormal/pn/pnvis.c	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnvis.c	Thu Aug 24 11:40:00 2006 -0700
@@ -139,11 +139,11 @@
 
   vis = (PnVis *) user_object;
 
-  ns = xmlNewNs (node, PN_XML_NS_HREF, "pn");
+  ns = xmlNewNs (node, PN_XML_NS_HREF, (xmlChar *) "pn");
   xmlSetNs (node, ns);
 
-  actuators_node = xmlNewChild (node, NULL, "Actuators", NULL);
-  actuator_node = xmlNewChild (actuators_node, NULL, user_object->name, NULL);
+  actuators_node = xmlNewChild (node, NULL, (xmlChar *) "Actuators", NULL);
+  actuator_node = xmlNewChild (actuators_node, NULL, (xmlChar *) user_object->name, NULL);
   if (vis->root_actuator)
     pn_user_object_save_thyself (PN_USER_OBJECT (vis->root_actuator), actuator_node);
 
@@ -261,9 +261,9 @@
 {
   xmlDocPtr doc;
 
-  doc = xmlNewDoc ("1.0");
+  doc = xmlNewDoc ((xmlChar *) "1.0");
 
-  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "BUG", NULL);
+  doc->xmlRootNode = xmlNewDocNode (doc, NULL, (xmlChar *) "BUG", NULL);
 
   pn_user_object_save_thyself (PN_USER_OBJECT (vis), doc->xmlRootNode);
 
--- a/Plugins/Visualization/paranormal/pn/pnxml.h	Thu Aug 24 11:11:30 2006 -0700
+++ b/Plugins/Visualization/paranormal/pn/pnxml.h	Thu Aug 24 11:40:00 2006 -0700
@@ -20,6 +20,7 @@
 #define __PN_XML_H__
 
 #include <libxml/parser.h>
+#include <libxml/xmlstring.h>
 
 /* compatibility w/ libxml1 */
 #ifndef xmlChildrenNode
@@ -28,6 +29,6 @@
 #endif
 
 /* The namespace href */
-#define PN_XML_NS_HREF "http://paranormal.sf.net/pnvis/1.0/"
+#define PN_XML_NS_HREF (xmlChar *) "http://paranormal.sf.net/pnvis/1.0/"
 
 #endif /* __PN_XML_H__ */