X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbind%2Fdbind-any.c;h=ae499d71fc9ff214c93cf0bf0a26469e2918130e;hb=f0c90bddb04b7ab71efb91e7a54950a076d344d5;hp=9cae2ebaa3beedb34e75f4ba9cef7a3090a567e8;hpb=54e4139a0fb45125f3a0f332b7e50532d52ef685;p=platform%2Fupstream%2Fat-spi2-core.git

diff --git a/dbind/dbind-any.c b/dbind/dbind-any.c
index 9cae2eb..ae499d7 100644
--- a/dbind/dbind-any.c
+++ b/dbind/dbind-any.c
@@ -22,7 +22,6 @@
 #include <glib.h>
 
 #include "config.h"
-#include "dbind-config.h"
 #include "dbind-any.h"
 
 #undef DEBUG
@@ -79,30 +78,30 @@ dbind_find_c_alignment_r (const char **type)
 
         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);
@@ -111,8 +110,8 @@ dbind_find_c_alignment_r (const char **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);
@@ -123,7 +122,7 @@ dbind_find_c_alignment_r (const char **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;
@@ -306,7 +305,7 @@ dbind_any_free_r (const char **type, void **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_free_r (type, data);
@@ -424,7 +423,7 @@ dbind_any_marshal (DBusMessageIter *iter,
 
         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);
@@ -626,7 +625,7 @@ dbind_any_demarshal (DBusMessageIter *iter,
         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);
@@ -640,6 +639,10 @@ dbind_any_demarshal (DBusMessageIter *iter,
         (*type)++;
 
         break;
+    case DBUS_TYPE_VARIANT:
+        /* skip; unimplemented for now */
+        (*type)++;
+        break;
     }
     case DBUS_TYPE_STRUCT:
     case DBUS_TYPE_DICT_ENTRY: