maclight.c in maclight-3.0.1

- old
+ new

@@ -125,32 +125,32 @@
 #pragma unused ( argc, argv )
 	IOHIDDeviceRef * tIOHIDDeviceRefs = nil;
 
 	// create a IO HID Manager reference
 	IOHIDManagerRef tIOHIDManagerRef = IOHIDManagerCreate( kCFAllocatorDefault, kIOHIDOptionsTypeNone );
-	require( tIOHIDManagerRef, Oops );
+	__Require( tIOHIDManagerRef, Oops );
 
 	// Create a device matching dictionary
 	CFDictionaryRef matchingCFDictRef = hu_CreateMatchingDictionaryUsagePageUsage( TRUE,
 																				  kHIDPage_GenericDesktop,
 																				  kHIDUsage_GD_Keyboard );
-	require( matchingCFDictRef, Oops );
+	__Require( matchingCFDictRef, Oops );
 
 	// set the HID device matching dictionary
 	IOHIDManagerSetDeviceMatching( tIOHIDManagerRef, matchingCFDictRef );
 
 	if ( matchingCFDictRef ) {
 		CFRelease( matchingCFDictRef );
 	}
 
 	// Now open the IO HID Manager reference
 	IOReturn tIOReturn = IOHIDManagerOpen( tIOHIDManagerRef, kIOHIDOptionsTypeNone );
-	require_noerr( tIOReturn, Oops );
+	__Require_noErr( tIOReturn, Oops );
 
 	// and copy out its devices
 	CFSetRef deviceCFSetRef = IOHIDManagerCopyDevices( tIOHIDManagerRef );
-	require( deviceCFSetRef, Oops );
+	__Require( deviceCFSetRef, Oops );
 
 	// how many devices in the set?
 	CFIndex deviceIndex, deviceCount = CFSetGetCount( deviceCFSetRef );
 
 	// allocate a block of memory to extact the device ref's from the set into
@@ -166,11 +166,11 @@
 	CFRelease(deviceCFSetRef);
 	deviceCFSetRef = NULL;
 
 	// before we get into the device loop we'll setup our element matching dictionary
 	matchingCFDictRef = hu_CreateMatchingDictionaryUsagePageUsage( FALSE, kHIDPage_LEDs, 0 );
-	require( matchingCFDictRef, Oops );
+	__Require( matchingCFDictRef, Oops );
 
 	int pass;	// do 256 passes
 	//for ( pass = 0; pass < 256; pass++ ) {
 		Boolean delayFlag = FALSE;	// if we find an LED element we'll set this to TRUE
 
@@ -186,22 +186,22 @@
 
 			// copy all the elements
 			CFArrayRef elementCFArrayRef = IOHIDDeviceCopyMatchingElements( tIOHIDDeviceRefs[deviceIndex],
 																		   matchingCFDictRef,
 																		   kIOHIDOptionsTypeNone );
-			require( elementCFArrayRef, next_device );
+			__Require( elementCFArrayRef, next_device );
 
 			// for each device on the system these values are divided by the value ranges of all LED elements found
 			// for example, if the first four LED element have a range of 0-1 then the four least significant bits of
 			// this value will be sent to these first four LED elements, etc.
 			int device_value = pass;
 
 			// iterate over all the elements
 			CFIndex elementIndex, elementCount = CFArrayGetCount( elementCFArrayRef );
 			for ( elementIndex = 0; elementIndex < elementCount; elementIndex++ ) {
 				IOHIDElementRef tIOHIDElementRef = ( IOHIDElementRef ) CFArrayGetValueAtIndex( elementCFArrayRef, elementIndex );
-				require( tIOHIDElementRef, next_element );
+				__Require( tIOHIDElementRef, next_element );
 
 				uint32_t usagePage = IOHIDElementGetUsagePage( tIOHIDElementRef );
 
 				// if this isn't an LED element...
 				if ( kHIDPage_LEDs != usagePage ) {
@@ -232,10 +232,10 @@
 				IOHIDValueRef tIOHIDValueRef = IOHIDValueCreateWithIntegerValue( kCFAllocatorDefault, tIOHIDElementRef, timestamp, tCFIndex );
 				if ( tIOHIDValueRef ) {
 					// now set it on the device
 					tIOReturn = IOHIDDeviceSetValue( tIOHIDDeviceRefs[deviceIndex], tIOHIDElementRef, tIOHIDValueRef );
 					CFRelease( tIOHIDValueRef );
-					require_noerr( tIOReturn, next_element );
+					__Require_noErr( tIOReturn, next_element );
 					delayFlag = TRUE;	// set this TRUE so we'll delay before changing our LED values again
 				}
 			next_element:	;
 				continue;
 			}