Differences From Artifact [88dde3fe42]:
- File
src/OFObject.m
— part of check-in
[061e654036]
at
2008-10-25 22:28:16
on branch trunk
— Decided we don't want @"" anyway. Thus remove our own alloc.
We don't need it anymore as there is no reason left to have our memory
pool before the instance variables left. (user: js, size: 2318) [annotate] [blame] [check-ins using]
To Artifact [fdc15c6565]:
- File src/OFObject.m — part of check-in [8ae4c59cd6] at 2008-10-26 20:54:54 on branch trunk — Return self when we have no return value. This allows nesting. (user: js, size: 2332) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
94 95 96 97 98 99 100 | } [[OFMemNotPartOfObjException newWithObject: self andPointer: ptr] raise]; return NULL; } | | | | > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 |
}
[[OFMemNotPartOfObjException newWithObject: self
andPointer: ptr] raise];
return NULL;
}
- freeMem: (void*)ptr;
{
struct __ofobject_allocated_mem *iter;
for (iter = __mem_pool; iter != NULL; iter = iter->prev) {
if (iter->ptr == ptr) {
if (iter->prev != NULL)
iter->prev->next = iter->next;
if (iter->next != NULL)
iter->next->prev = iter->prev;
if (__mem_pool == iter)
__mem_pool = NULL;
free(iter);
free(ptr);
return self;
}
}
[[OFMemNotPartOfObjException newWithObject: self
andPointer: ptr] raise];
return self;
}
@end
|