Enlightenment CVS committal

Author  : kwo
Project : e17
Module  : libs/ecore

Dir     : e17/libs/ecore/src/lib/ecore_dbus


Modified Files:
        Ecore_DBus.h ecore_dbus.c ecore_dbus_address.c 
        ecore_dbus_marshal.c ecore_dbus_message.c ecore_dbus_object.c 
        ecore_dbus_private.h ecore_dbus_unmarshal.c 


Log Message:
Add const, fix warnings.

===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/Ecore_DBus.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Ecore_DBus.h        29 Sep 2006 03:05:21 -0000      1.21
+++ Ecore_DBus.h        5 Nov 2006 17:45:03 -0000       1.22
@@ -194,27 +194,27 @@
 
 
    /* message */
-   EAPI int           ecore_dbus_server_send(Ecore_DBus_Server *svr, char 
*command, int length);
+   EAPI int           ecore_dbus_server_send(Ecore_DBus_Server *svr, const 
char *command, int length);
 
    EAPI unsigned int ecore_dbus_message_new_method_call(Ecore_DBus_Server 
*svr, 
-                                        char *path, char *interface,
-                                        char *method, char *destination, 
+                                        const char *path, const char 
*interface,
+                                        const char *method, const char 
*destination, 
                                         Ecore_DBus_Method_Return_Cb method_cb,
                                         Ecore_DBus_Error_Cb error_cb,
-                                        void *data,
-                                        char *signature, ...);
+                                        const void *data,
+                                        const char *signature, ...);
    EAPI unsigned int ecore_dbus_message_new_method_return(Ecore_DBus_Server 
*svr,
-                                        int reply_serial, char *destination,
-                                        char *signature, ...);
+                                        int reply_serial, const char 
*destination,
+                                        const char *signature, ...);
    EAPI unsigned int ecore_dbus_message_new_error(Ecore_DBus_Server *svr, 
-                                        char *error_name,
-                                        int reply_serial, char *destination,
-                                        char *error_message);
+                                        const char *error_name,
+                                        int reply_serial, const char 
*destination,
+                                        const char *error_message);
    EAPI unsigned int ecore_dbus_message_new_signal(Ecore_DBus_Server *svr,
-                                        char *path,
-                                        char *interface, char *signal_name,
-                                        char *destination, void *data,
-                                        char *signature, ...);
+                                        const char *path,
+                                        const char *interface, const char 
*signal_name,
+                                        const char *destination, const void 
*data,
+                                        const char *signature, ...);
 
    EAPI void          ecore_dbus_message_del(Ecore_DBus_Message *msg);
    EAPI void          ecore_dbus_message_print(Ecore_DBus_Message *msg);
@@ -235,7 +235,7 @@
    EAPI int ecore_dbus_method_release_name(Ecore_DBus_Server *svr, char *name, 
Ecore_DBus_Method_Return_Cb method_cb, Ecore_DBus_Error_Cb, void *data);
 
    /* addresses */
-   EAPI Ecore_DBus_Address *ecore_dbus_address_new();
+   EAPI Ecore_DBus_Address *ecore_dbus_address_new(void);
    EAPI void                ecore_dbus_address_free(Ecore_DBus_Address 
*address);
 
    EAPI Ecore_List         *ecore_dbus_address_parse(const char *address);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ecore_dbus.c        27 Sep 2006 14:29:42 -0000      1.27
+++ ecore_dbus.c        5 Nov 2006 17:45:03 -0000       1.28
@@ -210,7 +210,7 @@
 
 EAPI Ecore_DBus_Server *
 ecore_dbus_server_connect(Ecore_Con_Type con_type, const char *name, int port,
-                         const void *data)
+                         const void *data __UNUSED__)
 {
    /* XXX data isn't used! */
    Ecore_DBus_Server  *svr;
@@ -253,7 +253,7 @@
 }
 
 EAPI int
-ecore_dbus_server_send(Ecore_DBus_Server *svr, char *command, int length)
+ecore_dbus_server_send(Ecore_DBus_Server *svr, const char *command, int length)
 {
    int                 ret;
 
@@ -319,7 +319,7 @@
 /* auth functions */
 
 unsigned char *
-_ecore_dbus_auth_external(void *data)
+_ecore_dbus_auth_external(void *data __UNUSED__)
 {
    char          *uid, *enc_uid, *msg;
 
@@ -335,7 +335,7 @@
 /* con functions */
 
 static int
-_ecore_dbus_event_server_add(void *data, int ev_type, void *ev)
+_ecore_dbus_event_server_add(void *data __UNUSED__, int ev_type __UNUSED__, 
void *ev)
 {
    Ecore_Con_Event_Server_Add *e;
    Ecore_DBus_Server          *svr;
@@ -352,7 +352,7 @@
 }
 
 static int
-_ecore_dbus_event_server_del(void *udata, int ev_type, void *ev)
+_ecore_dbus_event_server_del(void *udata __UNUSED__, int ev_type __UNUSED__, 
void *ev)
 {
    Ecore_Con_Event_Server_Del  *e;
    Ecore_DBus_Server           *svr;
@@ -374,7 +374,7 @@
 }
 
 static int
-_ecore_dbus_event_server_data(void *udata, int ev_type, void *ev)
+_ecore_dbus_event_server_data(void *udata __UNUSED__, int ev_type __UNUSED__, 
void *ev)
 {
    Ecore_Con_Event_Server_Data *e;
    Ecore_DBus_Server           *svr;
@@ -496,7 +496,7 @@
 }
 
 static void
-_ecore_dbus_event_server_del_free(void *data, void *ev)
+_ecore_dbus_event_server_del_free(void *data __UNUSED__, void *ev)
 {
    Ecore_DBus_Event_Server_Del *event;
 
@@ -506,7 +506,7 @@
 }
 
 static void
-_ecore_dbus_event_server_data_free(void *data, void *ev)
+_ecore_dbus_event_server_data_free(void *data __UNUSED__, void *ev)
 {
    Ecore_DBus_Event_Server_Data *event;
 
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_address.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_dbus_address.c        27 Sep 2006 23:37:01 -0000      1.5
+++ ecore_dbus_address.c        5 Nov 2006 17:45:03 -0000       1.6
@@ -273,7 +273,7 @@
 {
    /* addl optional chars (other than 0-9A-Za-z) */
    static const char OPTIONAL_CHARS[] = {'_', '-', '/', '.', '\\'};
-   int i;
+   unsigned int i;
 
    if (isascii(c) && (isalpha(c) || isdigit(c))) return 1;
    for (i = 0; i < sizeof(OPTIONAL_CHARS); i++)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_marshal.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_dbus_marshal.c        29 Sep 2006 03:05:21 -0000      1.5
+++ ecore_dbus_marshal.c        5 Nov 2006 17:45:03 -0000       1.6
@@ -114,7 +114,7 @@
 }
 
 Ecore_DBus_Message_Field_Array *
-_ecore_dbus_message_marshal_array(Ecore_DBus_Message *msg, char 
*contained_type, Ecore_List *data)
+_ecore_dbus_message_marshal_array(Ecore_DBus_Message *msg, const char 
*contained_type, Ecore_List *data)
 {
    Ecore_DBus_Message_Field_Array *arr;
    void *el;
@@ -142,13 +142,13 @@
 }
 
 void
-_ecore_dbus_message_marshal_struct_end(Ecore_DBus_Message *msg, 
Ecore_DBus_Message_Field_Struct *s)
+_ecore_dbus_message_marshal_struct_end(Ecore_DBus_Message *msg, 
Ecore_DBus_Message_Field_Struct *s __UNUSED__)
 {
    ecore_list_remove_first(msg->recurse);
 }
 
 Ecore_DBus_Message_Field_Variant *
-_ecore_dbus_message_marshal_variant(Ecore_DBus_Message *msg, 
Ecore_DBus_Data_Type type, void *data)
+_ecore_dbus_message_marshal_variant(Ecore_DBus_Message *msg, 
Ecore_DBus_Data_Type type, const void *data)
 {
    Ecore_DBus_Message_Field_Variant *f = NULL;
 
@@ -170,7 +170,7 @@
 
 
 Ecore_DBus_Message_Field *
-_ecore_dbus_message_marshal(Ecore_DBus_Message *msg, char *type, void *data)
+_ecore_dbus_message_marshal(Ecore_DBus_Message *msg, const char *type, const 
void *data)
 {
 
    switch (*type)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_message.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_dbus_message.c        29 Sep 2006 02:04:06 -0000      1.12
+++ ecore_dbus_message.c        5 Nov 2006 17:45:03 -0000       1.13
@@ -10,19 +10,19 @@
 
 /* message helpers */
 static Ecore_DBus_Message *_ecore_dbus_message_create(Ecore_DBus_Server *svr,
-                             int type, int flags, char *path, char *interface,
-                            char *member, char *error_name, int reply_serial,
-                            char *destination, char *signature, va_list args);
+                             int type, int flags, const char *path, const char 
*interface,
+                            const char *member, const char *error_name, int 
reply_serial,
+                            const char *destination, const char *signature, 
va_list args);
 static void  _ecore_dbus_message_header(Ecore_DBus_Message *msg, int type,
-                             int flags, char *path, char *interface,
-                            char *member, char *error_name, int reply_serial,
-                            char *destination, char *format);
+                             int flags, const char *path, const char 
*interface,
+                            const char *member, const char *error_name, int 
reply_serial,
+                            const char *destination, const char *format);
 static void _ecore_dbus_message_body(Ecore_DBus_Message *msg,
-                             char *signature, va_list args);
+                             const char *signature, va_list args);
 
-static unsigned int _ecore_dbus_message_new_error(Ecore_DBus_Server *svr, char 
*error_name,
-                            int reply_serial, char *destination,
-                            char *signature, ...);
+static unsigned int _ecore_dbus_message_new_error(Ecore_DBus_Server *svr, 
const char *error_name,
+                            int reply_serial, const char *destination,
+                            const char *signature, ...);
 
 static void  _ecore_dbus_message_field_free(void *data);
 
@@ -63,7 +63,7 @@
  */
 EAPI unsigned int
 ecore_dbus_message_new_method_return(Ecore_DBus_Server *svr, int reply_serial,
-                                    char *destination, char *signature, ...)
+                                    const char *destination, const char 
*signature, ...)
 {
    va_list     args;   
    Ecore_DBus_Message *msg;
@@ -80,20 +80,20 @@
 
 /* errors either have a single param, the error message, or no params. */
 EAPI unsigned int
-ecore_dbus_message_new_error(Ecore_DBus_Server *svr, char *error_name,
-                            int reply_serial, char *destination,
-                            char *error_message)
+ecore_dbus_message_new_error(Ecore_DBus_Server *svr, const char *error_name,
+                            int reply_serial, const char *destination,
+                            const char *error_message)
 {
-   char *format = "";
+   const char *format = "";
    if (error_message) format = "s";
 
    return _ecore_dbus_message_new_error(svr, error_name, reply_serial, 
destination, format, error_message);
 }
 
 static unsigned int
-_ecore_dbus_message_new_error(Ecore_DBus_Server *svr, char *error_name,
-                            int reply_serial, char *destination,
-                            char *signature, ...)
+_ecore_dbus_message_new_error(Ecore_DBus_Server *svr, const char *error_name,
+                            int reply_serial, const char *destination,
+                            const char *signature, ...)
 {
    va_list     args;   
    Ecore_DBus_Message *msg;
@@ -109,10 +109,10 @@
 }
 
 EAPI unsigned int
-ecore_dbus_message_new_signal(Ecore_DBus_Server *svr, char *path,
-                             char *interface, char *signal_name,
-                             char *destination, void *data,
-                             char *signature, ...)
+ecore_dbus_message_new_signal(Ecore_DBus_Server *svr, const char *path,
+                             const char *interface, const char *signal_name,
+                             const char *destination, const void *data 
__UNUSED__,
+                             const char *signature, ...)
 {
    va_list     args;   
    Ecore_DBus_Message *msg;
@@ -129,12 +129,12 @@
 
 EAPI unsigned int
 ecore_dbus_message_new_method_call(Ecore_DBus_Server *svr, 
-                                  char *path, char *interface,
-                                  char *method, char *destination, 
+                                  const char *path, const char *interface,
+                                  const char *method, const char *destination, 
                                   Ecore_DBus_Method_Return_Cb method_cb,
                                   Ecore_DBus_Error_Cb error_cb,
-                                  void *data,
-                                  char *signature, ...)
+                                  const void *data,
+                                  const char *signature, ...)
 {
    va_list     args;   
    Ecore_DBus_Message *msg;
@@ -152,7 +152,7 @@
      {
        msg->cb.method_return = method_cb;
        msg->cb.error = error_cb;
-       msg->cb.data = data;
+       msg->cb.data = (void*)data;
      }
 
    /* send message */
@@ -163,7 +163,7 @@
 }
 
 static Ecore_DBus_Message *
-_ecore_dbus_message_create(Ecore_DBus_Server *svr, int type, int flags, char 
*path, char *interface, char *member, char *error_name, int reply_serial, char 
*destination, char *signature, va_list args)
+_ecore_dbus_message_create(Ecore_DBus_Server *svr, int type, int flags, const 
char *path, const char *interface, const char *member, const char *error_name, 
int reply_serial, const char *destination, const char *signature, va_list args)
 {
    /* init message */
    Ecore_DBus_Message *msg;
@@ -178,7 +178,7 @@
 }
 
 static void
-_ecore_dbus_message_body(Ecore_DBus_Message *msg, char *signature, va_list 
args) 
+_ecore_dbus_message_body(Ecore_DBus_Message *msg, const char *signature, 
va_list args) 
 {
    unsigned int body_start;
    /* message body */
@@ -453,9 +453,9 @@
 
 static void
 _ecore_dbus_message_header(Ecore_DBus_Message *msg, int type, int flags,
-                           char *path, char *interface, char *member,
-                          char *error_name, int reply_serial,
-                          char *destination, char *signature)
+                           const char *path, const char *interface, const char 
*member,
+                          const char *error_name __UNUSED__, int reply_serial 
__UNUSED__,
+                          const char *destination, const char *signature)
 {
    Ecore_DBus_Message_Field_Array *arr;
    
@@ -706,7 +706,7 @@
 static void
 _ecore_dbus_message_print_raw(Ecore_DBus_Message *msg)
 {
-   int                 i;
+   unsigned int        i;
 
    printf("[ecore_dbus] raw message:\n");
    for (i = 0; i < msg->length; i++)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_object.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_dbus_object.c 3 Oct 2006 02:19:14 -0000       1.4
+++ ecore_dbus_object.c 5 Nov 2006 17:45:03 -0000       1.5
@@ -35,7 +35,7 @@
 }
 
 static int
-_ecore_dbus_event_method_call_cb(void *udata, int evtype, void *ev)
+_ecore_dbus_event_method_call_cb(void *udata __UNUSED__, int evtype 
__UNUSED__, void *ev)
 {
    Ecore_DBus_Event_Server_Data *event;
    Ecore_DBus_Object *obj;
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_private.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore_dbus_private.h        29 Sep 2006 02:04:06 -0000      1.16
+++ ecore_dbus_private.h        5 Nov 2006 17:45:03 -0000       1.17
@@ -218,7 +218,7 @@
 
 struct _Ecore_DBus_Auth
 {
-   char                        *name;
+   const char                  *name;
    unsigned int                 num_transactions;
    Ecore_DBus_Auth_Transaction  transactions[5];
 };
@@ -241,7 +241,7 @@
 
 /* ecore_dbus_marshal.c */
 Ecore_DBus_Message_Field *
-_ecore_dbus_message_marshal(Ecore_DBus_Message *msg, char *type, void *data);
+_ecore_dbus_message_marshal(Ecore_DBus_Message *msg, const char *type, const 
void *data);
 Ecore_DBus_Message_Field_Byte   
*_ecore_dbus_message_marshal_byte(Ecore_DBus_Message *msg, unsigned char c);
 #if 0
 Ecore_DBus_Message_Field *_ecore_dbus_message_marshal_boolean(unsigned char 
**buf, unsigned int *old_length, uint32_t i);
@@ -260,10 +260,10 @@
 Ecore_DBus_Message_Field_Signature   
*_ecore_dbus_message_marshal_signature(Ecore_DBus_Message *msg, char *str);
 Ecore_DBus_Message_Field_Array       
*_ecore_dbus_message_marshal_array_begin(Ecore_DBus_Message *msg, 
Ecore_DBus_Data_Type contained_type);
 void                                  
_ecore_dbus_message_marshal_array_end(Ecore_DBus_Message *msg, 
Ecore_DBus_Message_Field_Array *arr);
-Ecore_DBus_Message_Field_Array       
*_ecore_dbus_message_marshal_array(Ecore_DBus_Message *msg, char 
*contained_type, Ecore_List *data);
+Ecore_DBus_Message_Field_Array       
*_ecore_dbus_message_marshal_array(Ecore_DBus_Message *msg, const char 
*contained_type, Ecore_List *data);
 Ecore_DBus_Message_Field_Struct      
*_ecore_dbus_message_marshal_struct_begin(Ecore_DBus_Message *msg);
 void                                  
_ecore_dbus_message_marshal_struct_end(Ecore_DBus_Message *msg, 
Ecore_DBus_Message_Field_Struct *s);
-Ecore_DBus_Message_Field_Variant     
*_ecore_dbus_message_marshal_variant(Ecore_DBus_Message *msg, 
Ecore_DBus_Data_Type type, void *data);
+Ecore_DBus_Message_Field_Variant     
*_ecore_dbus_message_marshal_variant(Ecore_DBus_Message *msg, 
Ecore_DBus_Data_Type type, const void *data);
 #if 0
 Ecore_DBus_Message_Field *_ecore_dbus_message_marshal_dict_entry(unsigned char 
**msg, unsigned int *old_length);
 Ecore_DBus_Message_Field *_ecore_dbus_message_marshal_data(unsigned char 
**buf, unsigned int *old_length, Ecore_DBus_Data_Type type, void *data);
@@ -296,8 +296,8 @@
 
 /* ecore_dbus_object.c */
 int ecore_dbus_object_method_dispatch(Ecore_DBus_Server *server, const char 
*path, const char *interface, const char *method);
-int ecore_dbus_objects_init();
-void ecore_dbus_objects_shutdown();
+int ecore_dbus_objects_init(void);
+void ecore_dbus_objects_shutdown(void);
 
 
 /* Errors */
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_unmarshal.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_dbus_unmarshal.c      29 Sep 2006 02:04:06 -0000      1.8
+++ ecore_dbus_unmarshal.c      5 Nov 2006 17:45:03 -0000       1.9
@@ -18,7 +18,7 @@
    old_length = msg->length;
    f = _ecore_dbus_message_field_new(msg, ECORE_DBUS_DATA_TYPE_BYTE);
    f->value = _ecore_dbus_message_read_byte(msg);
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for byte: got %d need %d\n",
@@ -38,7 +38,7 @@
    old_length = msg->length;
    f = _ecore_dbus_message_field_new(msg, ECORE_DBUS_DATA_TYPE_BOOLEAN);
    f->value = _ecore_dbus_message_read_uint32(msg);
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for boolean: got %d need %d\n",
@@ -59,7 +59,7 @@
    _ecore_dbus_message_padding(msg, 4);
    f = _ecore_dbus_message_field_new(msg, ECORE_DBUS_DATA_TYPE_INT32);
    f->value = _ecore_dbus_message_read_uint32(msg);
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for uint32: got %d need %d\n",
@@ -80,7 +80,7 @@
    _ecore_dbus_message_padding(msg, 4);
    f = _ecore_dbus_message_field_new(msg, ECORE_DBUS_DATA_TYPE_UINT32);
    f->value = _ecore_dbus_message_read_uint32(msg);
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for uint32: got %d need %d\n",
@@ -103,7 +103,7 @@
    str_len = _ecore_dbus_message_read_uint32(msg);
    f->value = (char *)msg->buffer + msg->length;
    msg->length += str_len + 1;
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for string: got %d need %d\n",
@@ -126,7 +126,7 @@
    str_len = _ecore_dbus_message_read_uint32(msg);
    f->value = (char *)msg->buffer + msg->length;
    msg->length += str_len + 1;
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for object path: got %d need %d\n",
@@ -148,7 +148,7 @@
    str_len = _ecore_dbus_message_read_byte(msg);
    f->value = (char *)msg->buffer + msg->length;
    msg->length += str_len + 1;
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for signature: got %d need %d\n",
@@ -180,7 +180,7 @@
 
    ecore_list_prepend(msg->recurse, arr);
 
-   if (*size < (arr->end - old_length))
+   if (*size < (int)(arr->end - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for array: got %d need %d\n",
@@ -193,7 +193,7 @@
 
 static void
 _ecore_dbus_message_unmarshal_array_end(Ecore_DBus_Message *msg,
-                                       Ecore_DBus_Message_Field_Array *arr)
+                                       Ecore_DBus_Message_Field_Array *arr 
__UNUSED__)
 {
    ecore_list_remove_first(msg->recurse);
 }
@@ -211,7 +211,7 @@
    s = _ecore_dbus_message_field_new(msg, ECORE_DBUS_DATA_TYPE_STRUCT);
    ecore_list_prepend(msg->recurse, s);
 
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for struct: got %d need %d\n",
@@ -224,7 +224,7 @@
 
 static void
 _ecore_dbus_message_unmarshal_struct_end(Ecore_DBus_Message *msg,
-                                        Ecore_DBus_Message_Field_Struct *s)
+                                        Ecore_DBus_Message_Field_Struct *s 
__UNUSED__)
 {
    ecore_list_remove_first(msg->recurse);
 }
@@ -254,7 +254,7 @@
    f->contained_type = type;
    /* Read '\0' from signature */
    _ecore_dbus_message_read_byte(msg);
-   if (*size < (msg->length - old_length))
+   if (*size < (int)(msg->length - old_length))
      {
        /* TODO: Free message field */
        printf("Ecore_DBus: To few bytes for variant header: got %d need %d\n",
@@ -436,15 +436,15 @@
                   break;
                case ECORE_DBUS_DATA_TYPE_ARRAY:
                     {
-                       Ecore_DBus_Message_Field_Array *arr;
+                       Ecore_DBus_Message_Field_Array *ar2;
                        Ecore_DBus_Unmarshal_Func func;
                        sig++;
                        type = *sig;
-                       arr = _ecore_dbus_message_unmarshal_array_begin(msg, 
type, &size);
+                       ar2 = _ecore_dbus_message_unmarshal_array_begin(msg, 
type, &size);
                        func = _ecore_dbus_message_unmarshal_func(type);
-                       while (msg->length < arr->end)
+                       while (msg->length < ar2->end)
                          (*func)(msg, &size);
-                       _ecore_dbus_message_unmarshal_array_end(msg, arr);
+                       _ecore_dbus_message_unmarshal_array_end(msg, ar2);
                     }
                   break;
                case ECORE_DBUS_DATA_TYPE_INVALID:



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to