-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* dbus-print-message.h Utility function to print out a message
*
* Copyright (C) 2003 Philip Blundell <philb@gnu.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include "dbus-print-message.h"
}
}
+
+static void
+indent (int depth)
+{
+ while (depth-- > 0)
+ printf (" ");
+}
+
static void
print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
{
do
{
int type = dbus_message_iter_get_arg_type (iter);
- const char *str;
- dbus_uint32_t uint32;
- dbus_int32_t int32;
- double d;
- unsigned char byte;
- dbus_bool_t boolean;
if (type == DBUS_TYPE_INVALID)
break;
-
- while (depth-- > 0)
- putc (' ', stdout);
+
+ indent(depth);
switch (type)
{
case DBUS_TYPE_STRING:
- dbus_message_iter_get_basic (iter, &str);
- if (!literal)
- printf ("string \"");
- printf ("%s", str);
- if (!literal)
- printf ("\"\n");
- break;
+ {
+ char *val;
+ dbus_message_iter_get_basic (iter, &val);
+ if (!literal)
+ printf ("string \"");
+ printf ("%s", val);
+ if (!literal)
+ printf ("\"\n");
+ break;
+ }
+
+ case DBUS_TYPE_SIGNATURE:
+ {
+ char *val;
+ dbus_message_iter_get_basic (iter, &val);
+ if (!literal)
+ printf ("signature \"");
+ printf ("%s", val);
+ if (!literal)
+ printf ("\"\n");
+ break;
+ }
+
+ case DBUS_TYPE_OBJECT_PATH:
+ {
+ char *val;
+ dbus_message_iter_get_basic (iter, &val);
+ if (!literal)
+ printf ("object path \"");
+ printf ("%s", val);
+ if (!literal)
+ printf ("\"\n");
+ break;
+ }
+
+ case DBUS_TYPE_INT16:
+ {
+ dbus_int16_t val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("int16 %d\n", val);
+ break;
+ }
+
+ case DBUS_TYPE_UINT16:
+ {
+ dbus_uint16_t val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("uint16 %u\n", val);
+ break;
+ }
case DBUS_TYPE_INT32:
- dbus_message_iter_get_basic (iter, &int32);
- printf ("int32 %d\n", int32);
- break;
+ {
+ dbus_int32_t val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("int32 %d\n", val);
+ break;
+ }
case DBUS_TYPE_UINT32:
- dbus_message_iter_get_basic (iter, &uint32);
- printf ("uint32 %u\n", uint32);
- break;
+ {
+ dbus_uint32_t val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("uint32 %u\n", val);
+ break;
+ }
+
+ case DBUS_TYPE_INT64:
+ {
+ dbus_int64_t val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("int64 %lld\n", val);
+ break;
+ }
+
+ case DBUS_TYPE_UINT64:
+ {
+ dbus_uint64_t val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("uint64 %llu\n", val);
+ break;
+ }
case DBUS_TYPE_DOUBLE:
- dbus_message_iter_get_basic (iter, &d);
- printf ("double %g\n", d);
- break;
+ {
+ double val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("double %g\n", val);
+ break;
+ }
case DBUS_TYPE_BYTE:
- dbus_message_iter_get_basic (iter, &byte);
- printf ("byte %d\n", byte);
- break;
+ {
+ unsigned char val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("byte %d\n", val);
+ break;
+ }
case DBUS_TYPE_BOOLEAN:
- dbus_message_iter_get_basic (iter, &boolean);
- printf ("boolean %s\n", boolean ? "true" : "false");
- break;
+ {
+ dbus_bool_t val;
+ dbus_message_iter_get_basic (iter, &val);
+ printf ("boolean %s\n", val ? "true" : "false");
+ break;
+ }
case DBUS_TYPE_VARIANT:
{
dbus_message_iter_recurse (iter, &subiter);
- printf ("variant:");
- print_iter (&subiter, literal, depth);
+ printf ("variant ");
+ print_iter (&subiter, literal, depth+1);
break;
}
case DBUS_TYPE_ARRAY:
dbus_message_iter_recurse (iter, &subiter);
- printf("[");
- while ((current_type = dbus_message_iter_get_arg_type (&subiter)) != DBUS_TYPE_INVALID)
+ current_type = dbus_message_iter_get_arg_type (&subiter);
+
+ printf("array [\n");
+ while (current_type != DBUS_TYPE_INVALID)
{
- print_iter (&subiter, literal, depth);
+ print_iter (&subiter, literal, depth+1);
+
dbus_message_iter_next (&subiter);
- if (dbus_message_iter_get_arg_type (&subiter) != DBUS_TYPE_INVALID)
+ current_type = dbus_message_iter_get_arg_type (&subiter);
+
+ if (current_type != DBUS_TYPE_INVALID)
printf (",");
}
- printf("]");
+ indent(depth);
+ printf("]\n");
break;
}
case DBUS_TYPE_DICT_ENTRY:
dbus_message_iter_recurse (iter, &subiter);
- printf("{");
- print_iter (&subiter, literal, depth);
+ printf("dict entry(\n");
+ print_iter (&subiter, literal, depth+1);
dbus_message_iter_next (&subiter);
- print_iter (&subiter, literal, depth);
- printf("}");
+ print_iter (&subiter, literal, depth+1);
+ indent(depth);
+ printf(")\n");
+ break;
+ }
+
+ case DBUS_TYPE_STRUCT:
+ {
+ int current_type;
+ DBusMessageIter subiter;
+
+ dbus_message_iter_recurse (iter, &subiter);
+
+ printf("struct {\n");
+ while ((current_type = dbus_message_iter_get_arg_type (&subiter)) != DBUS_TYPE_INVALID)
+ {
+ print_iter (&subiter, literal, depth+1);
+ dbus_message_iter_next (&subiter);
+ if (dbus_message_iter_get_arg_type (&subiter) != DBUS_TYPE_INVALID)
+ printf (",");
+ }
+ indent(depth);
+ printf("}\n");
break;
}
printf (" (dbus-monitor too dumb to decipher arg type '%c')\n", type);
break;
}
-
} while (dbus_message_iter_next (iter));
}
{
case DBUS_MESSAGE_TYPE_METHOD_CALL:
case DBUS_MESSAGE_TYPE_SIGNAL:
- printf (" interface=%s; member=%s\n",
+ printf (" serial=%u path=%s; interface=%s; member=%s\n",
+ dbus_message_get_serial (message),
+ dbus_message_get_path (message),
dbus_message_get_interface (message),
dbus_message_get_member (message));
break;
case DBUS_MESSAGE_TYPE_METHOD_RETURN:
- printf ("\n");
+ printf (" reply_serial=%u\n",
+ dbus_message_get_reply_serial (message));
break;
case DBUS_MESSAGE_TYPE_ERROR:
- printf (" error_name=%s\n",
- dbus_message_get_error_name (message));
+ printf (" error_name=%s reply_serial=%u\n",
+ dbus_message_get_error_name (message),
+ dbus_message_get_reply_serial (message));
break;
default:
projects / platform / upstream / dbus.git / blobdiff