Skip to content

Commit c26abbb

Browse files
committed
Sync darray.h
CRuby recently changed the name of some functions which the darray.h header uses. We synchronize the header with the ruby/ruby repo.
1 parent 44f47db commit c26abbb

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

darray.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,12 @@ rb_darray_free(void *ary)
161161
xfree(ary);
162162
}
163163

164-
void ruby_sized_xfree(void *x, size_t size);
165-
166164
static inline void
167165
rb_darray_free_sized0(void *ary, size_t element_size)
168166
{
169167
const rb_darray_meta_t *meta = ary;
170168
if (meta) {
171-
ruby_sized_xfree(ary, sizeof(*meta) + (element_size * meta->capa));
169+
ruby_xfree_sized(ary, sizeof(*meta) + (element_size * meta->capa));
172170
}
173171
}
174172
#define rb_darray_free_sized(ary, T) rb_darray_free_sized0((ary), sizeof(T))
@@ -203,7 +201,7 @@ rb_darray_calloc_mul_add_without_gc(size_t x, size_t y, size_t z)
203201
return ptr;
204202
}
205203

206-
void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size);
204+
void *ruby_xrealloc_sized(void *ptr, size_t new_size, size_t old_size);
207205

208206
/* Internal function. Like rb_xrealloc_mul_add. */
209207
static inline void *
@@ -212,7 +210,7 @@ rb_darray_realloc_mul_add(void *orig_ptr, size_t capa, size_t element_size, size
212210
size_t size = rbimpl_size_add_or_raise(rbimpl_size_mul_or_raise(capa, element_size), header_size);
213211
size_t old_size = (rb_darray_capa(orig_ptr) * element_size) + header_size; // We know it won't overflow
214212

215-
void *ptr = ruby_sized_xrealloc(orig_ptr, size, old_size);
213+
void *ptr = ruby_xrealloc_sized(orig_ptr, size, old_size);
216214
RUBY_ASSERT(ptr != NULL);
217215

218216
return ptr;

0 commit comments

Comments
 (0)