@@ -31,9 +31,8 @@ pub unsafe fn allocate(size: uint, align: uint) -> *mut u8 {
31
31
/// create the allocation referenced by `ptr`. The `old_size` parameter may also
32
32
/// be the value returned by `usable_size` for the requested size.
33
33
#[ inline]
34
- pub unsafe fn reallocate ( ptr : * mut u8 , size : uint , align : uint ,
35
- old_size : uint ) -> * mut u8 {
36
- imp:: reallocate ( ptr, size, align, old_size)
34
+ pub unsafe fn reallocate ( ptr : * mut u8 , old_size : uint , size : uint , align : uint ) -> * mut u8 {
35
+ imp:: reallocate ( ptr, old_size, size, align)
37
36
}
38
37
39
38
/// Extends or shrinks the allocation referenced by `ptr` to `size` bytes of
@@ -50,9 +49,8 @@ pub unsafe fn reallocate(ptr: *mut u8, size: uint, align: uint,
50
49
/// create the allocation referenced by `ptr`. The `old_size` parameter may be
51
50
/// any value in range_inclusive(requested_size, usable_size).
52
51
#[ inline]
53
- pub unsafe fn reallocate_inplace ( ptr : * mut u8 , size : uint , align : uint ,
54
- old_size : uint ) -> bool {
55
- imp:: reallocate_inplace ( ptr, size, align, old_size)
52
+ pub unsafe fn reallocate_inplace ( ptr : * mut u8 , old_size : uint , size : uint , align : uint ) -> bool {
53
+ imp:: reallocate_inplace ( ptr, old_size, size, align)
56
54
}
57
55
58
56
/// Deallocates the memory referenced by `ptr`.
@@ -170,8 +168,7 @@ mod imp {
170
168
}
171
169
172
170
#[ inline]
173
- pub unsafe fn reallocate ( ptr : * mut u8 , size : uint , align : uint ,
174
- _old_size : uint ) -> * mut u8 {
171
+ pub unsafe fn reallocate ( ptr : * mut u8 , _old_size : uint , size : uint , align : uint ) -> * mut u8 {
175
172
let flags = align_to_flags ( align) ;
176
173
let ptr = je_rallocx ( ptr as * mut c_void , size as size_t , flags) as * mut u8 ;
177
174
if ptr. is_null ( ) {
@@ -181,8 +178,8 @@ mod imp {
181
178
}
182
179
183
180
#[ inline]
184
- pub unsafe fn reallocate_inplace ( ptr : * mut u8 , size : uint , align : uint ,
185
- old_size : uint ) -> bool {
181
+ pub unsafe fn reallocate_inplace ( ptr : * mut u8 , old_size : uint , size : uint ,
182
+ align : uint ) -> bool {
186
183
let flags = align_to_flags ( align) ;
187
184
let new_size = je_xallocx ( ptr as * mut c_void , size as size_t , 0 , flags) as uint ;
188
185
// checking for failure to shrink is tricky
@@ -243,8 +240,7 @@ mod imp {
243
240
}
244
241
245
242
#[ inline]
246
- pub unsafe fn reallocate ( ptr : * mut u8 , size : uint , align : uint ,
247
- old_size : uint ) -> * mut u8 {
243
+ pub unsafe fn reallocate ( ptr : * mut u8 , old_size : uint , size : uint , align : uint ) -> * mut u8 {
248
244
if align <= MIN_ALIGN {
249
245
libc_heap:: realloc_raw ( ptr, size)
250
246
} else {
@@ -256,8 +252,8 @@ mod imp {
256
252
}
257
253
258
254
#[ inline]
259
- pub unsafe fn reallocate_inplace ( _ptr : * mut u8 , size : uint , _align : uint ,
260
- old_size : uint ) -> bool {
255
+ pub unsafe fn reallocate_inplace ( _ptr : * mut u8 , old_size : uint , size : uint ,
256
+ _align : uint ) -> bool {
261
257
size == old_size
262
258
}
263
259
@@ -303,8 +299,7 @@ mod imp {
303
299
}
304
300
305
301
#[ inline]
306
- pub unsafe fn reallocate ( ptr : * mut u8 , size : uint , align : uint ,
307
- _old_size : uint ) -> * mut u8 {
302
+ pub unsafe fn reallocate ( ptr : * mut u8 , _old_size : uint , size : uint , align : uint ) -> * mut u8 {
308
303
if align <= MIN_ALIGN {
309
304
libc_heap:: realloc_raw ( ptr, size)
310
305
} else {
@@ -318,8 +313,8 @@ mod imp {
318
313
}
319
314
320
315
#[ inline]
321
- pub unsafe fn reallocate_inplace ( _ptr : * mut u8 , size : uint , _align : uint ,
322
- old_size : uint ) -> bool {
316
+ pub unsafe fn reallocate_inplace ( _ptr : * mut u8 , old_size : uint , size : uint ,
317
+ _align : uint ) -> bool {
323
318
size == old_size
324
319
}
325
320
@@ -351,7 +346,7 @@ mod test {
351
346
unsafe {
352
347
let size = 4000 ;
353
348
let ptr = heap:: allocate ( size, 8 ) ;
354
- let ret = heap:: reallocate_inplace ( ptr, size, 8 , size ) ;
349
+ let ret = heap:: reallocate_inplace ( ptr, size, size , 8 ) ;
355
350
heap:: deallocate ( ptr, size, 8 ) ;
356
351
assert ! ( ret) ;
357
352
}
0 commit comments