@@ -93,58 +93,58 @@
 	[ret makeImmutable];
 
 	return ret;
 }
 
-BOOL
+bool
 of_base64_decode(OFDataArray *data, const char *string, size_t length)
 {
 	const uint8_t *buffer = (const uint8_t*)string;
 	size_t i;
 
 	if ((length & 3) != 0)
-		return NO;
+		return false;
 
 	if ([data itemSize] != 1)
-		return NO;
+		return false;
 
 	for (i = 0; i < length; i += 4) {
 		uint32_t sb = 0;
 		uint8_t count = 3;
 		char db[3];
 		int8_t tmp;
 
 		if (buffer[i] > 0x7F || buffer[i + 1] > 0x7F ||
 		    buffer[i + 2] > 0x7F || buffer[i + 3] > 0x7F)
-			return NO;
+			return false;
 
 		if (buffer[i] == '=' || buffer[i + 1] == '=' ||
 		    (buffer[i + 2] == '=' && buffer[i + 3] != '='))
-			return NO;
+			return false;
 
 		if (buffer[i + 2] == '=')
 			count--;
 		if (buffer[i + 3] == '=')
 			count--;
 
 		if ((tmp = of_base64_decode_table[buffer[i]]) == -1)
-			return NO;
+			return false;
 
 		sb |= tmp << 18;
 
 		if ((tmp = of_base64_decode_table[buffer[i + 1]]) == -1)
-			return NO;
+			return false;
 
 		sb |= tmp << 12;
 
 		if ((tmp = of_base64_decode_table[buffer[i + 2]]) == -1)
-			return NO;
+			return false;
 
 		sb |= tmp << 6;
 
 		if ((tmp = of_base64_decode_table[buffer[i + 3]]) == -1)
-			return NO;
+			return false;
 
 		sb |= tmp;
 
 		db[0] = (sb & 0xFF0000) >> 16;
 		db[1] = (sb & 0x00FF00) >> 8;
@@ -152,7 +152,7 @@
 
 		[data addItems: db
 			 count: count];
 	}
 
-	return YES;
+	return true;
 }