[GNUnet-SVN] r32458 - gnunet-dbus/src/lib/common

[gnunet]

Author: canndrew
Date: 2014-02-23 12:17:03 +0100 (Sun, 23 Feb 2014)
New Revision: 32458

Modified:
   gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c
Log:
Replace GNUNET_append_sprintf usage with GNUNET_asprintf

Modified: gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c
===================================================================
--- gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c      2014-02-23 
11:16:59 UTC (rev 32457)
+++ gnunet-dbus/src/lib/common/gnunet_dbus_lib_interface.c      2014-02-23 
11:17:03 UTC (rev 32458)
@@ -113,36 +113,42 @@
     struct GNUNET_DBUS_MethodContext *mc)
 {
   char *data = NULL;
+  char *new_data = NULL;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Introspecting\n");
   struct GNUNET_DBUS_Object *object = mc->object;
-  GNUNET_append_sprintf (&data, DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "here\n");
-  GNUNET_append_sprintf (&data, "<node>\n");
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "and here\n");
+
+  GNUNET_asprintf (&data, "%s", DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE);
+  GNUNET_asprintf (&new_data, "%s<node>\n", data);
+  GNUNET_free (data); data = new_data;
+
   const struct GNUNET_DBUS_InterfaceIterator *int_it = 
GNUNET_DBUS_object_iterate_interfaces (object);
   while (int_it)
   {
     struct GNUNET_DBUS_Interface *interface = int_it->interface;
     const char *interface_name = GNUNET_DBUS_interface_get_name (interface);
-    GNUNET_append_sprintf (&data, "  <interface name='%s'>\n", interface_name);
+    GNUNET_asprintf (&new_data, "%s  <interface name='%s'>\n", data, 
interface_name);
+    GNUNET_free (data); data = new_data;
     const struct GNUNET_DBUS_MethodIterator *meth_it = 
GNUNET_DBUS_interface_iterate_methods (interface);
     while (meth_it)
     {
       struct GNUNET_DBUS_Method *method = meth_it->method;
       const char *method_name = GNUNET_DBUS_method_get_name (method);
-      GNUNET_append_sprintf (&data, "    <method name='%s'>\n", method_name);
+      GNUNET_asprintf (&new_data, "%s    <method name='%s'>\n", data, 
method_name);
+      GNUNET_free (data); data = new_data;
       const struct GNUNET_DBUS_ArgIterator *arg_it = 
GNUNET_DBUS_method_iterate_args (method);
       while (arg_it)
       {
         struct GNUNET_DBUS_Arg *arg = arg_it->arg;
         const char *arg_name = GNUNET_DBUS_arg_get_name (arg);
         const char *signature = GNUNET_DBUS_arg_get_signature (arg);
-        GNUNET_append_sprintf (
-            &data, 
-            "      <arg name='%s' type='%s' direction='in'/>\n",
+        GNUNET_asprintf (
+            &new_data, 
+            "%s      <arg name='%s' type='%s' direction='in'/>\n",
+              data,
               arg_name,
               signature);
+        GNUNET_free (data); data = new_data;
         arg_it = arg_it->next;
       };
 
@@ -152,20 +158,25 @@
         struct GNUNET_DBUS_Arg *arg = arg_it->arg;
         const char *arg_name = GNUNET_DBUS_arg_get_name (arg);
         const char *signature = GNUNET_DBUS_arg_get_signature (arg);
-        GNUNET_append_sprintf (
-            &data, 
-            "      <arg name='%s' type='%s' direction='out'/>\n",
+        GNUNET_asprintf (
+            &new_data, 
+            "%s      <arg name='%s' type='%s' direction='out'/>\n",
+              data,
               arg_name,
               signature);
+        GNUNET_free (data); data = new_data;
         arg_it = arg_it->next;
       };
-      GNUNET_append_sprintf (&data, "    </method>\n");
+      GNUNET_asprintf (&new_data, "%s    </method>\n", data);
+      GNUNET_free (data); data = new_data;
       meth_it = meth_it->next;
     };
-    GNUNET_append_sprintf (&data, "  </interface>\n");
+    GNUNET_asprintf (&new_data, "%s  </interface>\n", data);
+    GNUNET_free (data); data = new_data;
     int_it = int_it->next;
   };
-  GNUNET_append_sprintf (&data, "</node>\n");
+  GNUNET_asprintf (&new_data, "%s</node>\n", data);
+  GNUNET_free (data); data = new_data;
 
   DBusMessage *reply = GNUNET_DBUS_method_context_create_reply (mc);
   DBusMessageIter reply_iter;