Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[datapipe] Make internal functions static. JB#22475
Low level trigger/filter registration functions are used only within
datapipe module.

As an enabler for internal refactoring, make all datapipe functions
not used outside datapipe mode static.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Sep 19, 2018
1 parent 9154f14 commit 7103ea0
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 67 deletions.
109 changes: 65 additions & 44 deletions datapipe.c
Expand Up @@ -30,6 +30,13 @@

#include <linux/input.h>

/* ========================================================================= *
* Macros
* ========================================================================= */

#define datapipe_init(datapipe, filtering, caching, datasize, value)\
datapipe_init_(&(datapipe), #datapipe, filtering, caching, datasize, value)

/* ========================================================================= *
* Prototypes
* ========================================================================= */
Expand All @@ -38,31 +45,32 @@
* DATAPIPE
* ------------------------------------------------------------------------- */

void datapipe_exec_input_triggers (datapipe_t *const datapipe, gpointer const indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_filters (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache);
void datapipe_exec_output_triggers (const datapipe_t *const datapipe, gconstpointer indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache, const datapipe_cache_t cache_indata);
void datapipe_add_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
void datapipe_remove_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
void datapipe_add_input_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_remove_input_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_add_output_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_remove_output_trigger(datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_init_ (datapipe_t *const datapipe, const char *name, const datapipe_filtering_t read_only, const datapipe_data_t free_cache, const gsize datasize, gpointer initial_data);
void datapipe_free (datapipe_t *const datapipe);
const char *datapipe_name (datapipe_t *const datapipe);
static void datapipe_exec_input_triggers (datapipe_t *const datapipe, gpointer const indata, const datapipe_use_t use_cache);
static gconstpointer datapipe_exec_filters (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache);
void datapipe_exec_output_triggers (const datapipe_t *const datapipe, gconstpointer indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache, const datapipe_cache_t cache_indata);
static void datapipe_add_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
static void datapipe_remove_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
static void datapipe_add_input_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
static void datapipe_remove_input_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
static void datapipe_add_output_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
static void datapipe_remove_output_trigger(datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
static void datapipe_init_ (datapipe_t *const datapipe, const char *name, const datapipe_filtering_t read_only, const datapipe_data_t free_cache, const gsize datasize, gpointer initial_data);
static void datapipe_free (datapipe_t *const datapipe);

/* ------------------------------------------------------------------------- *
* MCE_DATAPIPE
* ------------------------------------------------------------------------- */

void mce_datapipe_install_handlers (datapipe_handler_t *bindings);
void mce_datapipe_remove_handlers (datapipe_handler_t *bindings);
void mce_datapipe_execute_handlers (datapipe_handler_t *bindings);
void mce_datapipe_init (void);
void mce_datapipe_quit (void);
static void mce_datapipe_install_handlers (datapipe_handler_t *bindings);
static void mce_datapipe_remove_handlers (datapipe_handler_t *bindings);
static void mce_datapipe_execute_handlers (datapipe_handler_t *bindings);
static gboolean mce_datapipe_execute_handlers_cb(gpointer aptr);
void mce_datapipe_init_bindings (datapipe_bindings_t *self);
void mce_datapipe_quit_bindings (datapipe_bindings_t *self);
void mce_datapipe_init (void);
void mce_datapipe_quit (void);

/* ------------------------------------------------------------------------- *
* SUBMODE
Expand Down Expand Up @@ -452,9 +460,10 @@ datapipe_name(datapipe_t *const datapipe)
* @param cache_indata DATAPIPE_CACHE_INDATA to cache the indata,
* DATAPIPE_CACHE_NOTHING to keep the old data
*/
void datapipe_exec_input_triggers(datapipe_t *const datapipe,
gpointer const indata,
const datapipe_use_t use_cache)
static void
datapipe_exec_input_triggers(datapipe_t *const datapipe,
gpointer const indata,
const datapipe_use_t use_cache)
{
void (*trigger)(gconstpointer const input);
gpointer data;
Expand Down Expand Up @@ -488,9 +497,10 @@ void datapipe_exec_input_triggers(datapipe_t *const datapipe,
* DATAPIPE_USE_INDATA to use indata
* @return The processed data
*/
gconstpointer datapipe_exec_filters(datapipe_t *const datapipe,
gpointer indata,
const datapipe_use_t use_cache)
static gconstpointer
datapipe_exec_filters(datapipe_t *const datapipe,
gpointer indata,
const datapipe_use_t use_cache)
{
gpointer (*filter)(gpointer input);
gpointer data;
Expand Down Expand Up @@ -631,8 +641,9 @@ gconstpointer datapipe_exec_full(datapipe_t *const datapipe,
* @param datapipe The datapipe to manipulate
* @param filter The filter to add to the datapipe
*/
void datapipe_add_filter(datapipe_t *const datapipe,
gpointer (*filter)(gpointer data))
static void
datapipe_add_filter(datapipe_t *const datapipe,
gpointer (*filter)(gpointer data))
{
if (datapipe == NULL) {
mce_log(LL_ERR,
Expand Down Expand Up @@ -668,8 +679,9 @@ void datapipe_add_filter(datapipe_t *const datapipe,
* @param datapipe The datapipe to manipulate
* @param filter The filter to remove from the datapipe
*/
void datapipe_remove_filter(datapipe_t *const datapipe,
gpointer (*filter)(gpointer data))
static void
datapipe_remove_filter(datapipe_t *const datapipe,
gpointer (*filter)(gpointer data))
{
guint oldlen;

Expand Down Expand Up @@ -715,8 +727,9 @@ void datapipe_remove_filter(datapipe_t *const datapipe,
* @param datapipe The datapipe to manipulate
* @param trigger The trigger to add to the datapipe
*/
void datapipe_add_input_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
static void
datapipe_add_input_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
{
if (datapipe == NULL) {
mce_log(LL_ERR,
Expand Down Expand Up @@ -746,8 +759,9 @@ void datapipe_add_input_trigger(datapipe_t *const datapipe,
* @param datapipe The datapipe to manipulate
* @param trigger The trigger to remove from the datapipe
*/
void datapipe_remove_input_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
static void
datapipe_remove_input_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
{
guint oldlen;

Expand Down Expand Up @@ -787,8 +801,9 @@ void datapipe_remove_input_trigger(datapipe_t *const datapipe,
* @param datapipe The datapipe to manipulate
* @param trigger The trigger to add to the datapipe
*/
void datapipe_add_output_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
static void
datapipe_add_output_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
{
if (datapipe == NULL) {
mce_log(LL_ERR,
Expand Down Expand Up @@ -818,8 +833,9 @@ void datapipe_add_output_trigger(datapipe_t *const datapipe,
* @param datapipe The datapipe to manipulate
* @param trigger The trigger to remove from the datapipe
*/
void datapipe_remove_output_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
static void
datapipe_remove_output_trigger(datapipe_t *const datapipe,
void (*trigger)(gconstpointer data))
{
guint oldlen;

Expand Down Expand Up @@ -865,11 +881,12 @@ void datapipe_remove_output_trigger(datapipe_t *const datapipe,
* or 0 if only passing pointers or data as pointers
* @param initial_data Initial cache content
*/
void datapipe_init_(datapipe_t *const datapipe,
const char *name,
const datapipe_filtering_t read_only,
const datapipe_data_t free_cache,
const gsize datasize, gpointer initial_data)
static void
datapipe_init_(datapipe_t *const datapipe,
const char *name,
const datapipe_filtering_t read_only,
const datapipe_data_t free_cache,
const gsize datasize, gpointer initial_data)
{
if (datapipe == NULL) {
mce_log(LL_ERR,
Expand All @@ -896,7 +913,8 @@ void datapipe_init_(datapipe_t *const datapipe,
*
* @param datapipe The datapipe to manipulate
*/
void datapipe_free(datapipe_t *const datapipe)
static void
datapipe_free(datapipe_t *const datapipe)
{
if (datapipe == NULL) {
mce_log(LL_ERR,
Expand Down Expand Up @@ -1797,7 +1815,8 @@ const char *fpstate_repr(fpstate_t state)
"FPSTATE_UNKNOWN");
}

void mce_datapipe_install_handlers(datapipe_handler_t *bindings)
static void
mce_datapipe_install_handlers(datapipe_handler_t *bindings)
{
if( !bindings )
goto EXIT;
Expand All @@ -1824,7 +1843,8 @@ void mce_datapipe_install_handlers(datapipe_handler_t *bindings)
return;
}

void mce_datapipe_remove_handlers(datapipe_handler_t *bindings)
static void
mce_datapipe_remove_handlers(datapipe_handler_t *bindings)
{
if( !bindings )
goto EXIT;
Expand All @@ -1851,7 +1871,8 @@ void mce_datapipe_remove_handlers(datapipe_handler_t *bindings)
return;
}

void mce_datapipe_execute_handlers(datapipe_handler_t *bindings)
static void
mce_datapipe_execute_handlers(datapipe_handler_t *bindings)
{
if( !bindings )
goto EXIT;
Expand Down
30 changes: 7 additions & 23 deletions datapipe.h
Expand Up @@ -116,39 +116,23 @@ typedef struct
* DATAPIPE
* ------------------------------------------------------------------------- */

const char *datapipe_name (datapipe_t *const datapipe);
void datapipe_exec_input_triggers (datapipe_t *const datapipe, gpointer const indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_filters (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache);
void datapipe_exec_output_triggers (const datapipe_t *const datapipe, gconstpointer indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache, const datapipe_cache_t cache_indata);
void datapipe_add_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
void datapipe_remove_filter (datapipe_t *const datapipe, gpointer (*filter)(gpointer data));
void datapipe_add_input_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_remove_input_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_add_output_trigger (datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_remove_output_trigger(datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_init_ (datapipe_t *const datapipe, const char *name, const datapipe_filtering_t read_only, const datapipe_data_t free_cache, const gsize datasize, gpointer initial_data);
void datapipe_free (datapipe_t *const datapipe);
const char *datapipe_name (datapipe_t *const datapipe);
void datapipe_exec_output_triggers(const datapipe_t *const datapipe, gconstpointer indata, const datapipe_use_t use_cache);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata, const datapipe_use_t use_cache, const datapipe_cache_t cache_indata);

/* ------------------------------------------------------------------------- *
* MCE_DATAPIPE
* ------------------------------------------------------------------------- */

void mce_datapipe_install_handlers(datapipe_handler_t *bindings);
void mce_datapipe_remove_handlers (datapipe_handler_t *bindings);
void mce_datapipe_execute_handlers(datapipe_handler_t *bindings);
void mce_datapipe_init_bindings (datapipe_bindings_t *self);
void mce_datapipe_quit_bindings (datapipe_bindings_t *self);
void mce_datapipe_init (void);
void mce_datapipe_quit (void);
void mce_datapipe_init (void);
void mce_datapipe_quit (void);
void mce_datapipe_init_bindings (datapipe_bindings_t *self);
void mce_datapipe_quit_bindings (datapipe_bindings_t *self);

/* ========================================================================= *
* Macros
* ========================================================================= */

#define datapipe_init(datapipe, filtering, caching, datasize, value)\
datapipe_init_(&(datapipe), #datapipe, filtering, caching, datasize, value)

/** Retrieve a gint from a datapipe */
# define datapipe_get_gint(_datapipe) (GPOINTER_TO_INT((_datapipe).dp_cached_data))

Expand Down

0 comments on commit 7103ea0

Please sign in to comment.