Changeset 25906 in project for release/4/dbus/trunk/dbus.scm

Timestamp:

02/14/12 23:59:48 (9 years ago)

Author:

ecloud

Message:

initialize int return values to avoid garbage when reading smaller types

File:

• release/4/dbus/trunk/dbus.scm (modified) (4 diffs)

release/4/dbus/trunk/dbus.scm

@@ -437 +437 @@
                                                                 ,type-double-string ))
                                         ((foreign-lambda* c-string ((message-iter-ptr iter))
-                                                "char* ret;
+                                                "char* ret = NULL;
                                                 dbus_message_iter_get_basic(iter, &ret);
                                                 C_return (ret);") iter)]
@@ -448 +448 @@
                                                                 ,type-int16 ))
                                         ((foreign-lambda* int ((message-iter-ptr iter))
-                                                "int ret;
+                                                "int ret = 0;
                                                 dbus_message_iter_get_basic(iter, &ret);
                                                 C_return (ret);") iter)]
                                 [(memq type `(,type-uint32 ,type-uint16))
                                         ((foreign-lambda* unsigned-int ((message-iter-ptr iter))
-                                                "unsigned int ret;
+                                                "unsigned int ret = 0;
                                                 dbus_message_iter_get_basic(iter, &ret);
                                                 C_return (ret);") iter)]
                                 [(memq type `(,type-flonum ,type-uint64))
+                                        ;; todo don't put 64-bit int into a flonum if there's another way
                                         ((foreign-lambda* double ((message-iter-ptr iter))
                                                 "double ret;
@@ -463 +464 @@
                                 [(eq? type type-int64)
                                         ((foreign-lambda* integer64 ((message-iter-ptr iter))
-                                                "int64_t ret;
+                                                "int64_t ret = 0;
                                                 dbus_message_iter_get_basic(iter, &ret);
                                                 C_return (ret);") iter)]
@@ -477 +478 @@
                                                 ((make-sub-iter iter))
                                                 (make-variant ((make-sub-iter iter))))]
-                                ;; unsupported so far (not understood well enough):
+
+                                ;; todo: unsupported so far (not understood well enough):
                                 ;;      type-object-path and type-signature
-                                ;; type-invalid is returned as #f (could be (void) but that
-                                ;; would be the termination condition for the iterator)
+
+                                ;; so far the DBus "invalid" type is treated the same as unsupported.
+                                ;; Maybe need a distinction though...
+                                ; [(eq? type type-invalid) ...]
                                 [else (make-unsupported-type (integer->char type))] )))