@@ -50,12 +50,11 @@ _FDs = [[OFMutableData alloc] initWithItemSize: sizeof(struct pollfd)]; [_FDs addItem: &p]; _maxFD = _cancelFD[0]; - _FDToObject = [self allocMemoryWithSize: sizeof(id) - count: (size_t)_maxFD + 1]; + _FDToObject = of_malloc((size_t)_maxFD + 1, sizeof(id)); } @catch (id e) { [self release]; @throw e; } @@ -63,10 +62,11 @@ } - (void)dealloc { [_FDs release]; + free(_FDToObject); [super dealloc]; } - (void)of_addObject: (id)object @@ -96,13 +96,12 @@ if (!found) { struct pollfd p = { fd, events, 0 }; if (fd > _maxFD) { _maxFD = fd; - _FDToObject = [self resizeMemory: _FDToObject - size: sizeof(id) - count: (size_t)_maxFD + 1]; + _FDToObject = of_realloc(_FDToObject, + (size_t)_maxFD + 1, sizeof(id)); } _FDToObject[fd] = object; [_FDs addItem: &p]; }