From: Joe Groff Date: Tue, 23 Feb 2010 21:15:16 +0000 (-0800) Subject: change back other char/uchar* parameters that don't look like actual string types X-Git-Tag: 0.97~4825 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=db6c083162cd83687a75ace9dd8f451ed54e0b09 change back other char/uchar* parameters that don't look like actual string types --- diff --git a/basis/core-foundation/data/data.factor b/basis/core-foundation/data/data.factor index 65d6d728c1..bb04431a0e 100644 --- a/basis/core-foundation/data/data.factor +++ b/basis/core-foundation/data/data.factor @@ -12,7 +12,7 @@ CONSTANT: kCFPropertyListImmutable 0 CONSTANT: kCFPropertyListMutableContainers 1 CONSTANT: kCFPropertyListMutableContainersAndLeaves 2 -FUNCTION: CFDataRef CFDataCreate ( CFAllocatorRef allocator, c-string bytes, CFIndex length ) ; +FUNCTION: CFDataRef CFDataCreate ( CFAllocatorRef allocator, UInt8* bytes, CFIndex length ) ; FUNCTION: CFTypeID CFGetTypeID ( CFTypeRef cf ) ; diff --git a/basis/iokit/hid/hid.factor b/basis/iokit/hid/hid.factor index bd3fc1e968..a2ac0d5e6f 100644 --- a/basis/iokit/hid/hid.factor +++ b/basis/iokit/hid/hid.factor @@ -132,7 +132,7 @@ TYPEDEF: UInt32 IOHIDValueScaleType TYPEDEF: UInt32 IOHIDTransactionDirectionType CALLBACK: void IOHIDCallback ( void* context, IOReturn result, void* sender ) ; -CALLBACK: void IOHIDReportCallback ( void* context, IOReturn result, void* sender, IOHIDReportType type, UInt32 reportID, c-string report, CFIndex reportLength ) ; +CALLBACK: void IOHIDReportCallback ( void* context, IOReturn result, void* sender, IOHIDReportType type, UInt32 reportID, uchar* report, CFIndex reportLength ) ; CALLBACK: void IOHIDValueCallback ( void* context, IOReturn result, void* sender, IOHIDValueRef value ) ; CALLBACK: void IOHIDValueMultipleCallback ( void* context, IOReturn result, void* sender, CFDictionaryRef multiple ) ; CALLBACK: void IOHIDDeviceCallback ( void* context, IOReturn result, void* sender, IOHIDDeviceRef device ) ; @@ -151,7 +151,7 @@ FUNCTION: void IOHIDDeviceScheduleWithRunLoop ( IOHIDDeviceRef device, CFRunLoop FUNCTION: void IOHIDDeviceUnscheduleFromRunLoop ( IOHIDDeviceRef device, CFRunLoopRef runLoop, CFStringRef runLoopMode ) ; FUNCTION: void IOHIDDeviceRegisterRemovalCallback ( IOHIDDeviceRef device, IOHIDCallback callback, void* context ) ; FUNCTION: void IOHIDDeviceRegisterInputValueCallback ( IOHIDDeviceRef device, IOHIDValueCallback callback, void* context ) ; -FUNCTION: void IOHIDDeviceRegisterInputReportCallback ( IOHIDDeviceRef device, c-string report, CFIndex reportLength, IOHIDReportCallback callback, void* context ) ; +FUNCTION: void IOHIDDeviceRegisterInputReportCallback ( IOHIDDeviceRef device, uchar* report, CFIndex reportLength, IOHIDReportCallback callback, void* context ) ; FUNCTION: void IOHIDDeviceSetInputValueMatching ( IOHIDDeviceRef device, CFDictionaryRef matching ) ; FUNCTION: void IOHIDDeviceSetInputValueMatchingMultiple ( IOHIDDeviceRef device, CFArrayRef multiple ) ; FUNCTION: IOReturn IOHIDDeviceSetValue ( IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef value ) ; @@ -162,10 +162,10 @@ FUNCTION: IOReturn IOHIDDeviceGetValue ( IOHIDDeviceRef device, IOHIDElementRef FUNCTION: IOReturn IOHIDDeviceCopyValueMultiple ( IOHIDDeviceRef device, CFArrayRef elements, CFDictionaryRef* pMultiple ) ; FUNCTION: IOReturn IOHIDDeviceGetValueWithCallback ( IOHIDDeviceRef device, IOHIDElementRef element, IOHIDValueRef* pValue, CFTimeInterval timeout, IOHIDValueCallback callback, void* context ) ; FUNCTION: IOReturn IOHIDDeviceCopyValueMultipleWithCallback ( IOHIDDeviceRef device, CFArrayRef elements, CFDictionaryRef* pMultiple, CFTimeInterval timeout, IOHIDValueMultipleCallback callback, void* context ) ; -FUNCTION: IOReturn IOHIDDeviceSetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex reportLength ) ; -FUNCTION: IOReturn IOHIDDeviceSetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex reportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ; -FUNCTION: IOReturn IOHIDDeviceGetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex* pReportLength ) ; -FUNCTION: IOReturn IOHIDDeviceGetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, c-string report, CFIndex* pReportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ; +FUNCTION: IOReturn IOHIDDeviceSetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex reportLength ) ; +FUNCTION: IOReturn IOHIDDeviceSetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex reportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ; +FUNCTION: IOReturn IOHIDDeviceGetReport ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex* pReportLength ) ; +FUNCTION: IOReturn IOHIDDeviceGetReportWithCallback ( IOHIDDeviceRef device, IOHIDReportType reportType, CFIndex reportID, char* report, CFIndex* pReportLength, CFTimeInterval timeout, IOHIDReportCallback callback, void* context ) ; ! IOHIDManager @@ -231,7 +231,7 @@ FUNCTION: IOHIDValueRef IOHIDValueCreateWithBytesNoCopy ( CFAllocatorRef allocat FUNCTION: IOHIDElementRef IOHIDValueGetElement ( IOHIDValueRef value ) ; FUNCTION: ulonglong IOHIDValueGetTimeStamp ( IOHIDValueRef value ) ; FUNCTION: CFIndex IOHIDValueGetLength ( IOHIDValueRef value ) ; -FUNCTION: c-string IOHIDValueGetBytePtr ( IOHIDValueRef value ) ; +FUNCTION: uchar* IOHIDValueGetBytePtr ( IOHIDValueRef value ) ; FUNCTION: CFIndex IOHIDValueGetIntegerValue ( IOHIDValueRef value ) ; FUNCTION: double IOHIDValueGetScaledValue ( IOHIDValueRef value, IOHIDValueScaleType type ) ; diff --git a/basis/windows/user32/user32.factor b/basis/windows/user32/user32.factor index a966b63308..9908bb1f1b 100644 --- a/basis/windows/user32/user32.factor +++ b/basis/windows/user32/user32.factor @@ -1352,7 +1352,7 @@ ALIAS: GetWindowLong GetWindowLongW FUNCTION: BOOL GetWindowRect ( HWND hWnd, LPRECT lpRect ) ; ! FUNCTION: GetWindowRgn ! FUNCTION: GetWindowRgnBox -FUNCTION: int GetWindowTextA ( HWND hWnd, c-string lpString, int nMaxCount ) ; +FUNCTION: int GetWindowTextA ( HWND hWnd, char* lpString, int nMaxCount ) ; ! FUNCTION: GetWindowTextLengthA ! FUNCTION: GetWindowTextLengthW ! FUNCTION: GetWindowTextW diff --git a/basis/x11/xlib/xlib.factor b/basis/x11/xlib/xlib.factor index 88b058abea..de01d509dd 100644 --- a/basis/x11/xlib/xlib.factor +++ b/basis/x11/xlib/xlib.factor @@ -464,7 +464,7 @@ STRUCT: XImage { height int } { xoffset int } { format int } -{ data c-string } +{ data uchar* } { byte_order int } { bitmap_unit int } { bitmap_bit_order int } diff --git a/extra/libusb/libusb.factor b/extra/libusb/libusb.factor index 38bf49ed5b..d521015d6f 100644 --- a/extra/libusb/libusb.factor +++ b/extra/libusb/libusb.factor @@ -128,7 +128,7 @@ STRUCT: libusb_endpoint_descriptor { bInterval uint8_t } { bRefresh uint8_t } { bSynchAddress uint8_t } - { extra c-string } + { extra uchar* } { extra_length int } ; STRUCT: libusb_interface_descriptor @@ -142,7 +142,7 @@ STRUCT: libusb_interface_descriptor { bInterfaceProtocol uint8_t } { iInterface uint8_t } { endpoint libusb_endpoint_descriptor* } - { extra c-string } + { extra uchar* } { extra_length int } ; STRUCT: libusb_interface @@ -159,7 +159,7 @@ STRUCT: libusb_config_descriptor { bmAttributes uint8_t } { MaxPower uint8_t } { interface libusb_interface* } - { extra c-string } + { extra uchar* } { extra_length int } ; STRUCT: libusb_control_setup @@ -227,7 +227,7 @@ STRUCT: libusb_transfer { actual_length int } { callback libusb_transfer_cb_fn } { user_data void* } - { buffer c-string } + { buffer uchar* } { num_iso_packets int } { iso_packet_desc libusb_iso_packet_descriptor[0] } ; @@ -370,14 +370,14 @@ FUNCTION: void libusb_free_transfer ( libusb_transfer* transfer ) ; FUNCTION: int libusb_control_transfer ( libusb_device_handle* dev_handle, uint8_t request_type, uint8_t request, uint16_t value, uint16_t index, - c-string data, uint16_t length, uint timeout ) ; + uchar* data, uint16_t length, uint timeout ) ; FUNCTION: int libusb_bulk_transfer ( libusb_device_handle* dev_handle, - uchar endpoint, c-string data, int length, + uchar endpoint, uchar* data, int length, int* actual_length, uint timeout ) ; FUNCTION: int libusb_interrupt_transfer ( libusb_device_handle* dev_handle, - uchar endpoint, c-string data, int length, + uchar endpoint, uchar* data, int length, int* actual_length, int timeout ) ; :: libusb_get_descriptor ( dev desc_type desc_index data length -- int ) @@ -392,7 +392,7 @@ FUNCTION: int libusb_interrupt_transfer ( libusb_device_handle* dev_handle, FUNCTION: int libusb_get_string_descriptor_ascii ( libusb_device_handle* dev, uint8_t index, - c-string data, + uchar* data, int length ) ; FUNCTION: int libusb_try_lock_events ( libusb_context* ctx ) ; diff --git a/extra/ogg/ogg.factor b/extra/ogg/ogg.factor index ed25740ff6..d7abece8bc 100644 --- a/extra/ogg/ogg.factor +++ b/extra/ogg/ogg.factor @@ -28,18 +28,18 @@ LIBRARY: ogg STRUCT: oggpack-buffer { endbyte long } { endbit int } - { buffer c-string } - { ptr c-string } + { buffer uchar* } + { ptr uchar* } { storage long } ; STRUCT: ogg-page - { header c-string } + { header uchar* } { header_len long } - { body c-string } + { body uchar* } { body_len long } ; STRUCT: ogg-stream-state - { body_data c-string } + { body_data uchar* } { body_storage long } { body_fill long } { body_returned long } @@ -59,7 +59,7 @@ STRUCT: ogg-stream-state { granulepos longlong } ; STRUCT: ogg-packet - { packet c-string } + { packet uchar* } { bytes long } { b_o_s long } { e_o_s long } @@ -67,7 +67,7 @@ STRUCT: ogg-packet { packetno longlong } ; STRUCT: ogg-sync-state - { data c-string } + { data uchar* } { storage int } { fill int } { returned int } @@ -81,7 +81,7 @@ FUNCTION: void oggpack_writealign ( oggpack-buffer* b) ; FUNCTION: void oggpack_writecopy ( oggpack-buffer* b, void* source, long bits ) ; FUNCTION: void oggpack_reset ( oggpack-buffer* b ) ; FUNCTION: void oggpack_writeclear ( oggpack-buffer* b ) ; -FUNCTION: void oggpack_readinit ( oggpack-buffer* b, c-string buf, int bytes ) ; +FUNCTION: void oggpack_readinit ( oggpack-buffer* b, uchar* buf, int bytes ) ; FUNCTION: void oggpack_write ( oggpack-buffer* b, ulong value, int bits ) ; FUNCTION: long oggpack_look ( oggpack-buffer* b, int bits ) ; FUNCTION: long oggpack_look1 ( oggpack-buffer* b ) ; @@ -91,14 +91,14 @@ FUNCTION: long oggpack_read ( oggpack-buffer* b, int bits ) ; FUNCTION: long oggpack_read1 ( oggpack-buffer* b ) ; FUNCTION: long oggpack_bytes ( oggpack-buffer* b ) ; FUNCTION: long oggpack_bits ( oggpack-buffer* b ) ; -FUNCTION: c-string oggpack_get_buffer ( oggpack-buffer* b ) ; +FUNCTION: uchar* oggpack_get_buffer ( oggpack-buffer* b ) ; FUNCTION: void oggpackB_writeinit ( oggpack-buffer* b ) ; FUNCTION: void oggpackB_writetrunc ( oggpack-buffer* b, long bits ) ; FUNCTION: void oggpackB_writealign ( oggpack-buffer* b ) ; FUNCTION: void oggpackB_writecopy ( oggpack-buffer* b, void* source, long bits ) ; FUNCTION: void oggpackB_reset ( oggpack-buffer* b ) ; FUNCTION: void oggpackB_writeclear ( oggpack-buffer* b ) ; -FUNCTION: void oggpackB_readinit ( oggpack-buffer* b, c-string buf, int bytes ) ; +FUNCTION: void oggpackB_readinit ( oggpack-buffer* b, uchar* buf, int bytes ) ; FUNCTION: void oggpackB_write ( oggpack-buffer* b, ulong value, int bits ) ; FUNCTION: long oggpackB_look ( oggpack-buffer* b, int bits ) ; FUNCTION: long oggpackB_look1 ( oggpack-buffer* b ) ; @@ -108,7 +108,7 @@ FUNCTION: long oggpackB_read ( oggpack-buffer* b, int bits ) ; FUNCTION: long oggpackB_read1 ( oggpack-buffer* b ) ; FUNCTION: long oggpackB_bytes ( oggpack-buffer* b ) ; FUNCTION: long oggpackB_bits ( oggpack-buffer* b ) ; -FUNCTION: c-string oggpackB_get_buffer ( oggpack-buffer* b ) ; +FUNCTION: uchar* oggpackB_get_buffer ( oggpack-buffer* b ) ; FUNCTION: int ogg_stream_packetin ( ogg-stream-state* os, ogg-packet* op ) ; FUNCTION: int ogg_stream_pageout ( ogg-stream-state* os, ogg-page* og ) ; FUNCTION: int ogg_stream_flush ( ogg-stream-state* os, ogg-page* og ) ; diff --git a/extra/ogg/theora/theora.factor b/extra/ogg/theora/theora.factor index 3e28129252..eb79613496 100644 --- a/extra/ogg/theora/theora.factor +++ b/extra/ogg/theora/theora.factor @@ -53,7 +53,7 @@ STRUCT: th-img-plane { width int } { height int } { stride int } - { data c-string } + { data uchar* } ; TYPEDEF: th-img-plane[3] th-ycbcr-buffer