+/*
+ * Copyright 2008-2011 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
/* type driven marshalling */
#include <stdio.h>
#include <glib.h>
#include "config.h"
-#include "dbind-config.h"
#include "dbind-any.h"
#undef DEBUG
switch (t) {
case DBUS_TYPE_BYTE:
- return DBIND_ALIGNOF_CHAR;
+ return ALIGNOF_CHAR;
case DBUS_TYPE_BOOLEAN:
- return DBIND_ALIGNOF_DBUS_BOOL_T;
+ return ALIGNOF_DBUS_BOOL_T;
case DBUS_TYPE_INT16:
case DBUS_TYPE_UINT16:
- return DBIND_ALIGNOF_DBUS_INT16_T;
+ return ALIGNOF_DBUS_INT16_T;
case DBUS_TYPE_INT32:
case DBUS_TYPE_UINT32:
- return DBIND_ALIGNOF_DBUS_INT32_T;
+ return ALIGNOF_DBUS_INT32_T;
case DBUS_TYPE_INT64:
case DBUS_TYPE_UINT64:
- return DBIND_ALIGNOF_DBUS_INT64_T;
+ return ALIGNOF_DBUS_INT64_T;
case DBUS_TYPE_DOUBLE:
- return DBIND_ALIGNOF_DOUBLE;
+ return ALIGNOF_DOUBLE;
/* ptr types */
case DBUS_TYPE_STRING:
case DBUS_TYPE_OBJECT_PATH:
case DBUS_TYPE_SIGNATURE:
case DBUS_TYPE_ARRAY:
- return DBIND_ALIGNOF_DBIND_POINTER;
+ return ALIGNOF_DBIND_POINTER;
case DBUS_STRUCT_BEGIN_CHAR:
/* TODO: I think this would break with a nested struct */
-#if DBIND_ALIGNOF_DBIND_STRUCT > 1
- retval = MAX (retval, DBIND_ALIGNOF_DBIND_STRUCT);
+#if ALIGNOF_DBIND_STRUCT > 1
+ retval = MAX (retval, ALIGNOF_DBIND_STRUCT);
#endif
while (**type != DBUS_STRUCT_END_CHAR) {
int elem_align = dbind_find_c_alignment_r (type);
(*type)++;
return retval;
case DBUS_DICT_ENTRY_BEGIN_CHAR:
-#if DBIND_ALIGNOF_DBIND_STRUCT > 1
- retval = MAX (retval, DBIND_ALIGNOF_DBIND_STRUCT);
+#if ALIGNOF_DBIND_STRUCT > 1
+ retval = MAX (retval, ALIGNOF_DBIND_STRUCT);
#endif
while (**type != DBUS_DICT_ENTRY_END_CHAR) {
int elem_align = dbind_find_c_alignment_r (type);
case DBUS_TYPE_STRUCT:
case DBUS_TYPE_DICT_ENTRY:
warn_braces ();
- return DBIND_ALIGNOF_DBIND_POINTER;
+ return ALIGNOF_DBIND_POINTER;
case '\0':
g_assert_not_reached();
break;
offset = 0 ;
while (**type != DBUS_DICT_ENTRY_END_CHAR) {
- char *subt = *type;
+ const char *subt = *type;
offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type));
*data = PTR_PLUS (data0, offset);
dbind_any_free_r (type, data);
offset = 0 ;
while (**type != DBUS_DICT_ENTRY_END_CHAR) {
- char *subt = *type;
+ const char *subt = *type;
offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type));
*data = PTR_PLUS (data0, offset);
dbind_any_marshal (&sub, type, data);
if (arg != NULL)
dbind_any_marshal (iter, &p, &arg);
}
+ if (*arg_types)
+ *arg_types = p;
}
}
dbus_message_iter_recurse (iter, &child);
while (**type != DBUS_DICT_ENTRY_END_CHAR) {
- char *subt = *type;
+ const char *subt = *type;
offset = ALIGN_VALUE (offset, dbind_find_c_alignment (*type));
*data = PTR_PLUS (data0, offset);
dbind_any_demarshal (&child, type, data);
(*type)++;
break;
+ case DBUS_TYPE_VARIANT:
+ /* skip; unimplemented for now */
+ (*type)++;
+ break;
}
case DBUS_TYPE_STRUCT:
case DBUS_TYPE_DICT_ENTRY:
dbus_message_iter_next (iter);
}
+static const char *
+pass_complex_arg (const char *p, char begin, char end)
+{
+ int level = 1;
+
+ p++;
+ while (*p && level > 0)
+ {
+ if (*p == begin)
+ level++;
+ else if (*p == end)
+ level--;
+ p++;
+ }
+ if (*p == end)
+ p++;
+ return p;
+}
+
+static const char *
+pass_arg (const char *p)
+{
+ switch (*p)
+ {
+ case '(':
+ return pass_complex_arg (p, '(', ')');
+ case '{':
+ return pass_complex_arg (p, '{', '}');
+ case 'a':
+ return pass_arg (p+1);
+ default:
+ return p + 1;
+ }
+}
+
/*---------------------------------------------------------------------------*/
void
va_list args)
{
const char *p = *arg_types;
+
+ /* Pass in args */
+ for (;*p != '\0' && *p != '=';) {
+ int intarg;
+ void *ptrarg;
+ double doublearg;
+ dbus_int64_t int64arg;
+ void *arg = NULL;
+
+ switch (*p) {
+ case DBUS_TYPE_BYTE:
+ case DBUS_TYPE_BOOLEAN:
+ case DBUS_TYPE_INT16:
+ case DBUS_TYPE_UINT16:
+ case DBUS_TYPE_INT32:
+ case DBUS_TYPE_UINT32:
+ intarg = va_arg (args, int);
+ break;
+ case DBUS_TYPE_INT64:
+ case DBUS_TYPE_UINT64:
+ int64arg = va_arg (args, dbus_int64_t);
+ break;
+ case DBUS_TYPE_DOUBLE:
+ doublearg = va_arg (args, double);
+ break;
+ /* ptr types */
+ case DBUS_TYPE_STRING:
+ case DBUS_TYPE_OBJECT_PATH:
+ case DBUS_TYPE_SIGNATURE:
+ case DBUS_TYPE_ARRAY:
+ case DBUS_TYPE_DICT_ENTRY:
+ ptrarg = va_arg (args, void *);
+ break;
+ case DBUS_STRUCT_BEGIN_CHAR:
+ ptrarg = va_arg (args, void *);
+ break;
+ case DBUS_DICT_ENTRY_BEGIN_CHAR:
+ ptrarg = va_arg (args, void *);
+ break;
+
+ case DBUS_TYPE_VARIANT:
+ fprintf (stderr, "No variant support yet - very toolkit specific\n");
+ ptrarg = va_arg (args, void *);
+ break;
+ default:
+ fprintf (stderr, "Unknown / invalid arg type %c\n", *p);
+ break;
+ }
+ p = pass_arg (p);
+ }
+
+ if (p [0] == '=' && p[1] == '>')
+ p += 2;
+
for (;*p != '\0';) {
void *arg = va_arg (args, void *);
dbind_any_demarshal (iter, &p, &arg);
projects / platform / upstream / at-spi2-core.git / blobdiff