summaryrefslogtreecommitdiff
path: root/src/modules/sparkler
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-04-24 19:24:47 -0700
committerVito Caputo <vcaputo@pengaru.com>2022-04-24 19:24:47 -0700
commit9f9f9eaa096e6be8c1613014868e919d6991b188 (patch)
treeba943101653dd2729cad4ae19c9e6f5f583f5977 /src/modules/sparkler
parent1435249cd1cac95d31403a9592018eaad9c7cb00 (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/modules/sparkler')
-rw-r--r--src/modules/sparkler/sparkler.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/modules/sparkler/sparkler.c b/src/modules/sparkler/sparkler.c
index ec706b9..62abfe5 100644
--- a/src/modules/sparkler/sparkler.c
+++ b/src/modules/sparkler/sparkler.c
@@ -17,6 +17,7 @@
#define INIT_PARTS 100
typedef struct sparkler_setup_t {
+ til_setup_t til_setup;
unsigned show_bsp_leafs:1;
unsigned show_bsp_matches:1;
unsigned show_bsp_matches_affected_only:1;
@@ -33,12 +34,12 @@ extern particle_ops_t simple_ops;
static sparkler_setup_t sparkler_default_setup;
-static void * sparkler_create_context(unsigned ticks, unsigned num_cpus, void *setup)
+static void * sparkler_create_context(unsigned ticks, unsigned num_cpus, til_setup_t *setup)
{
sparkler_context_t *ctxt;
if (!setup)
- setup = &sparkler_default_setup;
+ setup = &sparkler_default_setup.til_setup;
ctxt = calloc(1, sizeof(sparkler_context_t));
if (!ctxt)
@@ -108,7 +109,7 @@ static void sparkler_render_fragment(void *context, unsigned ticks, unsigned cpu
/* Settings hooks for configurable variables */
-static int sparkler_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, void **res_setup)
+static int sparkler_setup(const til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, til_setup_t **res_setup)
{
const char *show_bsp_leafs;
const char *show_bsp_leafs_min_depth;
@@ -192,7 +193,7 @@ static int sparkler_setup(const til_settings_t *settings, til_setting_t **res_se
if (res_setup) {
sparkler_setup_t *setup;
- setup = calloc(1, sizeof(*setup));
+ setup = til_setup_new(sizeof(*setup), (void(*)(til_setup_t *))free);
if (!setup)
return -ENOMEM;
@@ -209,7 +210,7 @@ static int sparkler_setup(const til_settings_t *settings, til_setting_t **res_se
setup->show_bsp_matches_affected_only = 1;
}
- *res_setup = setup;
+ *res_setup = &setup->til_setup;
}
return 0;
© All Rights Reserved