diff options
author | Vito Caputo <vcaputo@pengaru.com> | 2022-04-24 19:24:47 -0700 |
---|---|---|
committer | Vito Caputo <vcaputo@pengaru.com> | 2022-04-24 19:24:47 -0700 |
commit | 9f9f9eaa096e6be8c1613014868e919d6991b188 (patch) | |
tree | ba943101653dd2729cad4ae19c9e6f5f583f5977 /src/setup.h | |
parent | 1435249cd1cac95d31403a9592018eaad9c7cb00 (diff) |
*: s/void */til_setup_t */
This brings something resembling an actual type to the private
objects returrned in *res_setup. Internally libtil/rototiller
wants this to be a til_setup_t, and it's up to the private users
of what's returned in *res_setup to embed this appropriately and
either use container_of() or casting when simply embedded at the
start to go between til_setup_t and their private containing
struct.
Everywhere *res_setup was previously allocated using calloc() is
now using til_setup_new() with a free_func, which til_setup_new()
will initialize appropriately. There's still some remaining work
to do with the supplied free_func in some modules, where free()
isn't quite appropriate.
Setup freeing isn't actually being performed yet, but this sets
the foundation for that to happen in a subsequent commit that
cleans up the setup leaks.
Many modules use a static default setup for when no setup has
been provided. In those cases, the free_func would be NULL,
which til_setup_new() refuses to do. When setup freeing actually
starts happening, it'll simply skip freeing when
til_setup_t.free_func is NULL.
Diffstat (limited to 'src/setup.h')
-rw-r--r-- | src/setup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/setup.h b/src/setup.h index a32f57c..3ca501d 100644 --- a/src/setup.h +++ b/src/setup.h @@ -2,7 +2,8 @@ #define _SETUP_H #include "til_settings.h" +#include "til_setup.h" -int setup_interactively(til_settings_t *settings, int (*setup_func)(til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, void **res_setup), int defaults, void **res_setup); +int setup_interactively(til_settings_t *settings, int (*setup_func)(til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup), int defaults, til_setup_t **res_setup); #endif |