@@ -212,11 +212,11 @@ PRE_IVAR->memchunks_size = memchunks_size; return self; } -- (void*)getMemWithSize: (size_t)size +- (void*)allocWithSize: (size_t)size { void *ptr, **memchunks; size_t memchunks_size; if (size == 0) @@ -244,29 +244,29 @@ PRE_IVAR->memchunks_size = memchunks_size; return ptr; } -- (void*)getMemForNItems: (size_t)nitems - ofSize: (size_t)size +- (void*)allocNItems: (size_t)nitems + withSize: (size_t)size { if (nitems == 0 || size == 0) return NULL; if (nitems > SIZE_MAX / size) @throw [OFOutOfRangeException newWithClass: isa]; - return [self getMemWithSize: nitems * size]; + return [self allocWithSize: nitems * size]; } - (void*)resizeMem: (void*)ptr toSize: (size_t)size { void **iter; if (ptr == NULL) - return [self getMemWithSize: size]; + return [self allocWithSize: size]; if (size == 0) { [self freeMem: ptr]; return NULL; } @@ -288,17 +288,17 @@ andPointer: ptr]; } - (void*)resizeMem: (void*)ptr toNItems: (size_t)nitems - ofSize: (size_t)size + withSize: (size_t)size { size_t memsize; if (ptr == NULL) - return [self getMemForNItems: nitems - ofSize: size]; + return [self allocNItems: nitems + withSize: size]; if (nitems == 0 || size == 0) { [self freeMem: ptr]; return NULL; }