Skip to content

Commit 6595878

Browse files
author
F3159258 Fabio de Souza Villaca Medeiros
committed
added hk_free()
1 parent 5a1a7b7 commit 6595878

File tree

16 files changed

+45
-46
lines changed

16 files changed

+45
-46
lines changed

core/json.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static void encode_call(HkVM *vm, HkValue *args)
143143
char *chars = cJSON_Print(json);
144144
cJSON_Delete(json);
145145
HkString *str = hk_string_from_chars(-1, chars);
146-
free(chars);
146+
hk_free(chars);
147147
hk_vm_push_string(vm, str);
148148
if (!hk_vm_is_ok(vm))
149149
hk_string_free(str);

core/lists.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static inline LinkedListNode *LinkedListNode_new(HkValue elem)
5656
static inline void LinkedListNode_free(LinkedListNode *node)
5757
{
5858
hk_value_release(node->elem);
59-
free(node);
59+
hk_free(node);
6060
}
6161

6262
static inline LinkedList *linked_list_new(void)

extensions/bigint.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static void to_string_call(HkVM *vm, HkValue *args)
133133
}
134134
char *chars = mpz_get_str(NULL, base, bigint->num);
135135
HkString *str = hk_string_from_chars(-1, chars);
136-
free(chars);
136+
hk_free(chars);
137137
hk_vm_push_string(vm, str);
138138
}
139139

@@ -155,7 +155,7 @@ static void to_bytes_call(HkVM *vm, HkValue *args)
155155
size_t length;
156156
char *chars = mpz_export(NULL, &length, 1, 1, 0, 0, bigint->num);
157157
HkString *str = hk_string_from_chars((int) length, chars);
158-
free(chars);
158+
hk_free(chars);
159159
hk_vm_push_string(vm, str);
160160
}
161161

extensions/leveldb.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static void open_call(HkVM *vm, HkValue *args)
162162
{
163163
hk_array_inplace_add_element(arr, HK_NIL_VALUE);
164164
hk_array_inplace_add_element(arr, hk_string_value(hk_string_from_chars(-1, err)));
165-
free(err);
165+
hk_free(err);
166166
hk_vm_push_array(vm, arr);
167167
return;
168168
}
@@ -210,7 +210,7 @@ static void put_call(HkVM *vm, HkValue *args)
210210
{
211211
hk_array_inplace_add_element(arr, HK_FALSE_VALUE);
212212
hk_array_inplace_add_element(arr, hk_string_value(hk_string_from_chars(-1, err)));
213-
free(err);
213+
hk_free(err);
214214
hk_vm_push_array(vm, arr);
215215
return;
216216
}
@@ -241,13 +241,13 @@ static void get_call(HkVM *vm, HkValue *args)
241241
{
242242
hk_array_inplace_add_element(arr, HK_NIL_VALUE);
243243
hk_array_inplace_add_element(arr, hk_string_value(hk_string_from_chars(-1, err)));
244-
free(err);
244+
hk_free(err);
245245
hk_vm_push_array(vm, arr);
246246
return;
247247
}
248248
hk_array_inplace_add_element(arr, hk_string_value(hk_string_from_chars(value_length, value)));
249249
hk_array_inplace_add_element(arr, HK_NIL_VALUE);
250-
free(value);
250+
hk_free(value);
251251
hk_vm_push_array(vm, arr);
252252
}
253253

@@ -272,7 +272,7 @@ static void delete_call(HkVM *vm, HkValue *args)
272272
{
273273
hk_array_inplace_add_element(arr, HK_FALSE_VALUE);
274274
hk_array_inplace_add_element(arr, hk_string_value(hk_string_from_chars(-1, err)));
275-
free(err);
275+
hk_free(err);
276276
hk_vm_push_array(vm, arr);
277277
return;
278278
}

include/hook/memory.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
#ifndef HK_MEMORY_H
1212
#define HK_MEMORY_H
1313

14-
#include <stdint.h>
14+
#include <stddef.h>
1515

16-
void *hk_allocate(int size);
17-
void *hk_reallocate(void *ptr, int size);
16+
void *hk_allocate(size_t size);
17+
void *hk_reallocate(void *ptr, size_t size);
18+
void hk_free(void *ptr);
1819

1920
#endif // HK_MEMORY_H

src/array.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
//
1010

1111
#include <hook/array.h>
12-
#include <stdlib.h>
1312
#include <hook/memory.h>
1413
#include <hook/utils.h>
1514

@@ -108,8 +107,8 @@ void hk_array_free(HkArray *arr)
108107
{
109108
for (int i = 0; i < arr->length; ++i)
110109
hk_value_release(arr->elements[i]);
111-
free(arr->elements);
112-
free(arr);
110+
hk_free(arr->elements);
111+
hk_free(arr);
113112
}
114113

115114
void hk_array_release(HkArray *arr)

src/callable.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
//
1010

1111
#include <hook/callable.h>
12-
#include <stdlib.h>
1312
#include <hook/memory.h>
1413
#include <hook/utils.h>
1514

@@ -44,7 +43,7 @@ static inline void free_functions(HkFunction *fn)
4443
{
4544
for (int i = 0; i < fn->functionsLength; ++i)
4645
hk_function_release(fn->functions[i]);
47-
free(fn->functions);
46+
hk_free(fn->functions);
4847
}
4948

5049
static inline void grow_functions(HkFunction *fn)
@@ -74,7 +73,7 @@ void hk_function_free(HkFunction *fn)
7473
hk_string_release(fn->file);
7574
hk_chunk_deinit(&fn->chunk);
7675
free_functions(fn);
77-
free(fn);
76+
hk_free(fn);
7877
}
7978

8079
void hk_function_release(HkFunction *fn)
@@ -155,7 +154,7 @@ void hk_closure_free(HkClosure *cl)
155154
hk_function_release(fn);
156155
for (int i = 0; i < numNonlocals; ++i)
157156
hk_value_release(cl->nonlocals[i]);
158-
free(cl);
157+
hk_free(cl);
159158
}
160159

161160
void hk_closure_release(HkClosure *cl)
@@ -179,7 +178,7 @@ HkNative *hk_native_new(HkString *name, int arity, HkCallFn call)
179178
void hk_native_free(HkNative *native)
180179
{
181180
hk_string_release(native->name);
182-
free(native);
181+
hk_free(native);
183182
}
184183

185184
void hk_native_release(HkNative *native)

src/chunk.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
//
1010

1111
#include <hook/chunk.h>
12-
#include <stdlib.h>
1312
#include <hook/memory.h>
1413
#include <hook/utils.h>
1514

@@ -56,8 +55,8 @@ void hk_chunk_init(HkChunk *chunk)
5655

5756
void hk_chunk_deinit(HkChunk *chunk)
5857
{
59-
free(chunk->code);
60-
free(chunk->lines);
58+
hk_free(chunk->code);
59+
hk_free(chunk->lines);
6160
hk_array_free(chunk->consts);
6261
}
6362

src/iterator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//
1010

1111
#include <hook/iterator.h>
12-
#include <stdlib.h>
12+
#include <hook/memory.h>
1313

1414
void hk_iterator_init(HkIterator *it, void (*deinit)(HkIterator *),
1515
bool (*isValid)(HkIterator *), HkValue (*getCurrent)(HkIterator *),
@@ -27,7 +27,7 @@ void hk_iterator_free(HkIterator *it)
2727
{
2828
if (it->deinit)
2929
it->deinit(it);
30-
free(it);
30+
hk_free(it);
3131
}
3232

3333
void hk_iterator_release(HkIterator *it)

src/memory.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@
1111
#include <hook/memory.h>
1212
#include <stdlib.h>
1313

14-
void *hk_allocate(int size)
14+
void *hk_allocate(size_t size)
1515
{
1616
return malloc(size);
1717
}
1818

19-
void *hk_reallocate(void *ptr, int size)
19+
void *hk_reallocate(void *ptr, size_t size)
2020
{
2121
return realloc(ptr, size);
2222
}
23+
24+
void hk_free(void *ptr)
25+
{
26+
free(ptr);
27+
}

0 commit comments

Comments
 (0)