Changeset 25907 in project


Ignore:
Timestamp:
02/15/12 00:10:59 (9 years ago)
Author:
ecloud
Message:

got rid of redundant _AS_STRING types

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/4/dbus/trunk/dbus.scm

    r25906 r25907  
    9393;; DBus simple data types
    9494(define type-invalid (foreign-value DBUS_TYPE_INVALID int))
    95 (define type-invalid-string (foreign-value DBUS_TYPE_INVALID_AS_STRING int))
    9695(define type-byte  (foreign-value DBUS_TYPE_BYTE int))
    97 (define type-byte-string  (foreign-value DBUS_TYPE_BYTE_AS_STRING int))
    9896(define type-boolean  (foreign-value DBUS_TYPE_BOOLEAN int))
    99 (define type-boolean-string  (foreign-value DBUS_TYPE_BOOLEAN_AS_STRING int))
    10097(define type-int16  (foreign-value DBUS_TYPE_INT16 int))
    101 (define type-int16-string  (foreign-value DBUS_TYPE_INT16_AS_STRING int))
    10298(define type-uint16  (foreign-value DBUS_TYPE_UINT16 int))
    103 (define type-uint16-string  (foreign-value DBUS_TYPE_UINT16_AS_STRING int))
    10499(define type-fixnum (foreign-value DBUS_TYPE_INT32 int))
    105100(define type-int32  (foreign-value DBUS_TYPE_INT32 int))
    106 (define type-int32-string  (foreign-value DBUS_TYPE_INT32_AS_STRING int))
    107101(define type-uint32  (foreign-value DBUS_TYPE_UINT32 int))
    108 (define type-uint32-string  (foreign-value DBUS_TYPE_UINT32_AS_STRING int))
    109102(define type-int64  (foreign-value DBUS_TYPE_INT64 int))
    110 (define type-int64-string  (foreign-value DBUS_TYPE_INT64_AS_STRING int))
    111103(define type-uint64  (foreign-value DBUS_TYPE_UINT64 int))
    112 (define type-uint64-string  (foreign-value DBUS_TYPE_UINT64_AS_STRING int))
    113104(define type-double  (foreign-value DBUS_TYPE_DOUBLE int))
    114105(define type-flonum  (foreign-value DBUS_TYPE_DOUBLE int))
    115 (define type-double-string  (foreign-value DBUS_TYPE_DOUBLE_AS_STRING int))
    116106(define type-string  (foreign-value DBUS_TYPE_STRING int))
    117 (define type-string-string  (foreign-value DBUS_TYPE_STRING_AS_STRING int))
    118107(define type-object-path  (foreign-value DBUS_TYPE_OBJECT_PATH int))
    119108(define type-signature  (foreign-value DBUS_TYPE_SIGNATURE int))
    120 (define type-signature-string  (foreign-value DBUS_TYPE_SIGNATURE_AS_STRING int))
    121109(define type-array (foreign-value DBUS_TYPE_ARRAY int))
    122110(define type-dict  (foreign-value DBUS_TYPE_DICT_ENTRY int))
     
    427415                        ; (printf "iter-cond type ~s~%" type)
    428416                        (cond
    429                                 [(memq type `(,type-string ,type-invalid-string
    430                                                                 ,type-string-string ,type-object-path
    431                                                                 ,type-signature-string
    432                                                                 ;; TODO maybe the following types ought to be converted?
    433                                                                 ,type-byte-string ,type-boolean-string
    434                                                                 ,type-int16-string ,type-uint16-string
    435                                                                 ,type-int32-string ,type-uint32-string
    436                                                                 ,type-int64-string ,type-uint64-string
    437                                                                 ,type-double-string ))
     417                                [(memq type `(,type-string ,type-object-path))
    438418                                        ((foreign-lambda* c-string ((message-iter-ptr iter))
    439419                                                "char* ret = NULL;
Note: See TracChangeset for help on using the changeset viewer.