@@ -188,15 +188,12 @@ free(value); @throw e; } @try { - [self getValue: value - size: size]; - [object getValue: otherValue - size: size]; - + [self getValue: value size: size]; + [object getValue: otherValue size: size]; ret = (memcmp(value, otherValue, size) == 0); } @finally { free(value); free(otherValue); } @@ -210,12 +207,11 @@ unsigned char *value; uint32_t hash; value = of_alloc(1, size); @try { - [self getValue: value - size: size]; + [self getValue: value size: size]; OF_HASH_INIT(hash); for (size_t i = 0; i < size; i++) OF_HASH_ADD(hash, value[i]); @@ -236,73 +232,54 @@ - (const char *)objCType { OF_UNRECOGNIZED_SELECTOR } -- (void)getValue: (void *)value - size: (size_t)size +- (void)getValue: (void *)value size: (size_t)size { OF_UNRECOGNIZED_SELECTOR } - (void *)pointerValue { void *ret; - - [self getValue: &ret - size: sizeof(ret)]; - + [self getValue: &ret size: sizeof(ret)]; return ret; } - (id)nonretainedObjectValue { id ret; - - [self getValue: &ret - size: sizeof(ret)]; - + [self getValue: &ret size: sizeof(ret)]; return ret; } - (of_range_t)rangeValue { of_range_t ret; - - [self getValue: &ret - size: sizeof(ret)]; - + [self getValue: &ret size: sizeof(ret)]; return ret; } - (of_point_t)pointValue { of_point_t ret; - - [self getValue: &ret - size: sizeof(ret)]; - + [self getValue: &ret size: sizeof(ret)]; return ret; } - (of_dimension_t)dimensionValue { of_dimension_t ret; - - [self getValue: &ret - size: sizeof(ret)]; - + [self getValue: &ret size: sizeof(ret)]; return ret; } - (of_rectangle_t)rectangleValue { of_rectangle_t ret; - - [self getValue: &ret - size: sizeof(ret)]; - + [self getValue: &ret size: sizeof(ret)]; return ret; } - (OFString *)description { @@ -311,12 +288,11 @@ size_t size = of_sizeof_type_encoding(self.objCType); unsigned char *value; value = of_alloc(1, size); @try { - [self getValue: value - size: size]; + [self getValue: value size: size]; for (size_t i = 0; i < size; i++) { if (i > 0) [ret appendString: @" "];