From 0c22399c957cd1936f4407a149338d7e78dea2ea Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Thu, 9 May 2019 20:48:49 -0700 Subject: libstage: drop pointer from func_t typedefs Cosmetic readability change, I don't like to typedef pointer types --- src/stage.c | 12 ++++++------ src/stage.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/stage.c b/src/stage.c index c93079e..e6da788 100644 --- a/src/stage.c +++ b/src/stage.c @@ -32,14 +32,14 @@ struct stage_t { unsigned active:1; /* stage is active */ unsigned locked:1; /* stage is locked */ - stage_render_func_t render; /* render object */ - stage_free_func_t free; /* free object */ + stage_render_func_t *render; /* render object */ + stage_free_func_t *free; /* free object */ void *object; /* object */ }; /* minimally initialize a stage to carry an object */ -static void _stage_set_object(stage_t *stage, const char *name, void *object, stage_render_func_t render_func, stage_free_func_t free_func) +static void _stage_set_object(stage_t *stage, const char *name, void *object, stage_render_func_t *render_func, stage_free_func_t *free_func) { assert(stage); assert(name); @@ -52,7 +52,7 @@ static void _stage_set_object(stage_t *stage, const char *name, void *object, st /* allocate a stage, this purely creates a stage in isolation and assigns its associated name, object and functions */ -static stage_t * _stage_new(const char *name, void *object, stage_render_func_t render_func, stage_free_func_t free_func) +static stage_t * _stage_new(const char *name, void *object, stage_render_func_t *render_func, stage_free_func_t *free_func) { stage_t *stage; @@ -84,7 +84,7 @@ static void _stage_free(stage_t *stage) /* returns a new stage, attached at the specified layer under parent if supplied */ /* layer has no effect when parent == NULL */ -stage_t * stage_new(stage_t *parent, int layer, const char *name, void *object, stage_render_func_t render_func, stage_free_func_t free_func) +stage_t * stage_new(stage_t *parent, int layer, const char *name, void *object, stage_render_func_t *render_func, stage_free_func_t *free_func) { stage_t *stage; @@ -105,7 +105,7 @@ stage_t * stage_new(stage_t *parent, int layer, const char *name, void *object, /* replaces a given stage's object-related properties but otherwise keeping the existing state */ -void stage_replace(stage_t *stage, const char *name, void *object, stage_render_func_t render_func, stage_free_func_t free_func) +void stage_replace(stage_t *stage, const char *name, void *object, stage_render_func_t *render_func, stage_free_func_t *free_func) { assert(stage); diff --git a/src/stage.h b/src/stage.h index e366155..59329d7 100644 --- a/src/stage.h +++ b/src/stage.h @@ -22,11 +22,11 @@ typedef struct stage_t stage_t; -typedef void (*stage_render_func_t)(const stage_t *stage, void *object, float alpha); -typedef void (*stage_free_func_t)(const stage_t *stage, void *object); +typedef void (stage_render_func_t)(const stage_t *stage, void *object, float alpha); +typedef void (stage_free_func_t)(const stage_t *stage, void *object); -stage_t * stage_new(stage_t *parent, int layer, const char *name, void *object, stage_render_func_t render_func, stage_free_func_t free_func); -void stage_replace(stage_t *stage, const char *name, void *object, stage_render_func_t render_func, stage_free_func_t free_func); +stage_t * stage_new(stage_t *parent, int layer, const char *name, void *object, stage_render_func_t *render_func, stage_free_func_t *free_func); +void stage_replace(stage_t *stage, const char *name, void *object, stage_render_func_t *render_func, stage_free_func_t *free_func); stage_t * stage_free(stage_t *stage); void stage_render(const stage_t *stage); void stage_clear(stage_t *stage); -- cgit v1.2.3