From 8bd6650245d050e455cd4d26f6e59e7dd9b80392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Tue, 29 Mar 2016 11:47:23 +0200 Subject: array: allow arbitrarily sized array elements There exist two typical ways to use an array: 1) to hold pointers to externally allocated memory regions Use array_init(...) for initialization, an element has the size of a pointer. Use the functions suffixed with `_ptr' to manage your pointers. The cleanup function array_release_full must only be used with this type of array. 2) to hold arbitrary sized objects Use array_init_sized(...) to specify the size of a single element. Use the regular (i.e. without the `_ptr' suffix) functions to manage your objects. array_get will return a pointer to the object stored within the array. --- vis-text-objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vis-text-objects.c') diff --git a/vis-text-objects.c b/vis-text-objects.c index 962c22c..1b9f242 100644 --- a/vis-text-objects.c +++ b/vis-text-objects.c @@ -13,7 +13,7 @@ int vis_textobject_register(Vis *vis, int type, void *data, obj->type = type; obj->data = data; - if (array_add(&vis->textobjects, obj)) + if (array_add_ptr(&vis->textobjects, obj)) return LENGTH(vis_textobjects) + array_length(&vis->textobjects) - 1; free(obj); return -1; @@ -23,7 +23,7 @@ bool vis_textobject(Vis *vis, enum VisTextObject id) { if (id < LENGTH(vis_textobjects)) vis->action.textobj = &vis_textobjects[id]; else - vis->action.textobj = array_get(&vis->textobjects, id - LENGTH(vis_textobjects)); + vis->action.textobj = array_get_ptr(&vis->textobjects, id - LENGTH(vis_textobjects)); if (!vis->action.textobj) return false; action_do(vis, &vis->action); -- cgit v1.2.3