[Emacs-diffs] emacs/src ChangeLog dbusbind.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/10/24 16:45:26

Modified files:
        src            : ChangeLog dbusbind.c 

Log message:
        (xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
        DBUS_TYPE_UINTnn separately to get proper sign extension.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7822&r2=1.7823
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dbusbind.c?cvsroot=emacs&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7822
retrieving revision 1.7823
diff -u -b -r1.7822 -r1.7823
--- ChangeLog   24 Oct 2009 16:34:52 -0000      1.7822
+++ ChangeLog   24 Oct 2009 16:45:25 -0000      1.7823
@@ -1,5 +1,8 @@
 2009-10-24  Andreas Schwab  <address@hidden>
 
+       * dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_INTnn and
+       DBUS_TYPE_UINTnn separately to get proper sign extension.
+
        * dired.c (Ffile_attributes): Simplify now that FIXNUM_OVERFLOW_P
        can properly handle unsigned types.
        (make_uid, make_gid): Removed.

Index: dbusbind.c
===================================================================
RCS file: /sources/emacs/emacs/src/dbusbind.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- dbusbind.c  19 Oct 2009 04:27:13 -0000      1.49
+++ dbusbind.c  24 Oct 2009 16:45:26 -0000      1.50
@@ -616,6 +616,13 @@
       }
 
     case DBUS_TYPE_INT16:
+      {
+       dbus_int16_t val;
+       dbus_message_iter_get_basic (iter, &val);
+       XD_DEBUG_MESSAGE ("%c %d", dtype, val);
+       return make_number (val);
+      }
+
     case DBUS_TYPE_UINT16:
       {
        dbus_uint16_t val;
@@ -625,19 +632,29 @@
       }
 
     case DBUS_TYPE_INT32:
+      {
+       dbus_int32_t val;
+       dbus_message_iter_get_basic (iter, &val);
+       XD_DEBUG_MESSAGE ("%c %d", dtype, val);
+       return make_fixnum_or_float (val);
+      }
+
     case DBUS_TYPE_UINT32:
       {
-       /* Assignment to EMACS_INT stops GCC whining about limited
-          range of data type.  */
        dbus_uint32_t val;
-       EMACS_INT val1;
        dbus_message_iter_get_basic (iter, &val);
        XD_DEBUG_MESSAGE ("%c %d", dtype, val);
-       val1 = val;
-       return make_fixnum_or_float (val1);
+       return make_fixnum_or_float (val);
       }
 
     case DBUS_TYPE_INT64:
+      {
+       dbus_int64_t val;
+       dbus_message_iter_get_basic (iter, &val);
+       XD_DEBUG_MESSAGE ("%c %d", dtype, (int) val);
+       return make_fixnum_or_float (val);
+      }
+
     case DBUS_TYPE_UINT64:
       {
        dbus_uint64_t val;