ObjFW  Diff

Differences From Artifact [dfdab0e3f3]:

To Artifact [99a5765c29]:


72
73
74
75
76
77
78
79

80
81
82
83

84
85
86
87
88
89
90
91
92
93
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
127
128
129
130
131
132
133
134
72
73
74
75
76
77
78

79
80
81
82

83
84


85
86
87
88
89
90
91
92
93
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
127
128







-
+



-
+

-
-















-
+


-
-








-
+








-
+

-
-








	__mem_pool = iter;

	return iter->ptr;
}

- (void*)getMemForNItems: (size_t)nitems
		withSize: (size_t)size
		  ofSize: (size_t)size
{
	size_t memsize;

	if (size > SIZE_MAX / nitems) {
	if (size > SIZE_MAX / nitems)
		[[OFOverflowException newWithObject: self] raise];
		return NULL;
	}

	memsize = nitems * size;
	return [self getMemWithSize: memsize];
}

- (void*)resizeMem: (void*)ptr
	    toSize: (size_t)size
{
	struct __ofobject_allocated_mem *iter;

	if (ptr == NULL)
		return [self getMemWithSize: size];

	for (iter = __mem_pool; iter != NULL; iter = iter->prev) {
		if (iter->ptr == ptr) {
			if ((ptr = realloc(iter->ptr, size)) == NULL) {
			if ((ptr = realloc(iter->ptr, size)) == NULL)
				[[OFNoMemException newWithObject: self
							 andSize: size] raise];
				return iter->ptr;
			}
			
			iter->ptr = ptr;
			return ptr;
		}
	}

	[[OFMemNotPartOfObjException newWithObject: self
					andPointer: ptr] raise];
	return NULL;
	return NULL;	/* never reached, but makes gcc happy */
}

- (void*)resizeMem: (void*)ptr
	  toNItems: (size_t)nitems
	    ofSize: (size_t)size
{
	size_t memsize;

	if (size > SIZE_MAX / nitems) {
	if (size > SIZE_MAX / nitems)
		[[OFOverflowException newWithObject: self] raise];
		return ptr;
	}

	memsize = nitems * size;
	return [self resizeMem: ptr
			toSize: memsize];
}

- freeMem: (void*)ptr;
149
150
151
152
153
154
155
156
157

158
159
143
144
145
146
147
148
149


150
151
152







-
-
+



			return self;
		}
	}

	[[OFMemNotPartOfObjException newWithObject: self
					andPointer: ptr] raise];

	return self;
	return self	/* never reached, but makes gcc happy */;
}
@end