Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[datapipe] Mass rename functions. JB#22475
Use mce_datapipe_xxx prefix for functions that are not "methods" for dealing
with datapipe_t objects.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Sep 19, 2018
1 parent d6b8b12 commit 63953e2
Show file tree
Hide file tree
Showing 19 changed files with 59 additions and 60 deletions.
37 changes: 18 additions & 19 deletions datapipe.c
Expand Up @@ -51,19 +51,18 @@ void datapipe_remove_output_trigger(datapipe_t *const datapipe, void
void datapipe_init (datapipe_t *const datapipe, 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);

void datapipe_handlers_install (datapipe_handler_t *bindings);
void datapipe_handlers_remove (datapipe_handler_t *bindings);
void datapipe_handlers_execute (datapipe_handler_t *bindings);
static gboolean datapipe_handlers_execute_cb (gpointer aptr);
void datapipe_bindings_init (datapipe_bindings_t *self);
void datapipe_bindings_quit (datapipe_bindings_t *self);

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

void mce_datapipe_init(void);
void mce_datapipe_quit(void);
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);
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 @@ -1781,7 +1780,7 @@ const char *fpstate_repr(fpstate_t state)
"FPSTATE_UNKNOWN");
}

void datapipe_handlers_install(datapipe_handler_t *bindings)
void mce_datapipe_install_handlers(datapipe_handler_t *bindings)
{
if( !bindings )
goto EXIT;
Expand All @@ -1808,7 +1807,7 @@ void datapipe_handlers_install(datapipe_handler_t *bindings)
return;
}

void datapipe_handlers_remove(datapipe_handler_t *bindings)
void mce_datapipe_remove_handlers(datapipe_handler_t *bindings)
{
if( !bindings )
goto EXIT;
Expand All @@ -1835,7 +1834,7 @@ void datapipe_handlers_remove(datapipe_handler_t *bindings)
return;
}

void datapipe_handlers_execute(datapipe_handler_t *bindings)
void mce_datapipe_execute_handlers(datapipe_handler_t *bindings)
{
if( !bindings )
goto EXIT;
Expand All @@ -1852,7 +1851,7 @@ void datapipe_handlers_execute(datapipe_handler_t *bindings)
return;
}

static gboolean datapipe_handlers_execute_cb(gpointer aptr)
static gboolean mce_datapipe_execute_handlers_cb(gpointer aptr)
{
datapipe_bindings_t *self = aptr;

Expand All @@ -1865,30 +1864,30 @@ static gboolean datapipe_handlers_execute_cb(gpointer aptr)
self->execute_id = 0;

mce_log(LL_INFO, "module=%s", self->module ?: "unknown");
datapipe_handlers_execute(self->handlers);
mce_datapipe_execute_handlers(self->handlers);

EXIT:
return FALSE;
}

/** Append triggers/filters to datapipes
*/
void datapipe_bindings_init(datapipe_bindings_t *self)
void mce_datapipe_init_bindings(datapipe_bindings_t *self)
{
mce_log(LL_INFO, "module=%s", self->module ?: "unknown");

/* Set up datapipe callbacks */
datapipe_handlers_install(self->handlers);
mce_datapipe_install_handlers(self->handlers);

/* Get initial values for output triggers from idle
* callback, i.e. when all modules have been loaded */
if( !self->execute_id )
self->execute_id = g_idle_add(datapipe_handlers_execute_cb, self);
self->execute_id = g_idle_add(mce_datapipe_execute_handlers_cb, self);
}

/** Remove triggers/filters from datapipes
*/
void datapipe_bindings_quit(datapipe_bindings_t *self)
void mce_datapipe_quit_bindings(datapipe_bindings_t *self)
{
mce_log(LL_INFO, "module=%s", self->module ?: "unknown");

Expand All @@ -1899,5 +1898,5 @@ void datapipe_bindings_quit(datapipe_bindings_t *self)
}

/* Remove datapipe callbacks */
datapipe_handlers_remove(self->handlers);
mce_datapipe_remove_handlers(self->handlers);
}
14 changes: 7 additions & 7 deletions datapipe.h
Expand Up @@ -127,18 +127,18 @@ void datapipe_add_output_trigger (datapipe_t *const datapipe, void (
void datapipe_remove_output_trigger(datapipe_t *const datapipe, void (*trigger)(gconstpointer data));
void datapipe_init (datapipe_t *const datapipe, 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);
void datapipe_handlers_install (datapipe_handler_t *bindings);
void datapipe_handlers_remove (datapipe_handler_t *bindings);
void datapipe_handlers_execute (datapipe_handler_t *bindings);
void datapipe_bindings_init (datapipe_bindings_t *self);
void datapipe_bindings_quit (datapipe_bindings_t *self);

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

void mce_datapipe_init(void);
void mce_datapipe_quit(void);
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);

/* ========================================================================= *
* Macros
Expand Down
4 changes: 2 additions & 2 deletions mce-common.c
Expand Up @@ -618,14 +618,14 @@ static datapipe_bindings_t common_datapipe_bindings =
*/
static void common_datapipe_init(void)
{
datapipe_bindings_init(&common_datapipe_bindings);
mce_datapipe_init_bindings(&common_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void common_datapipe_quit(void)
{
datapipe_bindings_quit(&common_datapipe_bindings);
mce_datapipe_quit_bindings(&common_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions mce-dsme.c
Expand Up @@ -976,14 +976,14 @@ static datapipe_bindings_t mce_dsme_datapipe_bindings =
*/
static void mce_dsme_datapipe_init(void)
{
datapipe_bindings_init(&mce_dsme_datapipe_bindings);
mce_datapipe_init_bindings(&mce_dsme_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void mce_dsme_datapipe_quit(void)
{
datapipe_bindings_quit(&mce_dsme_datapipe_bindings);
mce_datapipe_quit_bindings(&mce_dsme_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions mce-hbtimer.c
Expand Up @@ -1036,14 +1036,14 @@ static datapipe_bindings_t mht_datapipe_bindings =
*/
static void mht_datapipe_init(void)
{
datapipe_bindings_init(&mht_datapipe_bindings);
mce_datapipe_init_bindings(&mht_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void mht_datapipe_quit(void)
{
datapipe_bindings_quit(&mht_datapipe_bindings);
mce_datapipe_quit_bindings(&mht_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/battery-statefs.c
Expand Up @@ -433,14 +433,14 @@ static datapipe_bindings_t bsf_datapipe_bindings =
*/
static void bsf_datapipe_init(void)
{
datapipe_bindings_init(&bsf_datapipe_bindings);
mce_datapipe_init_bindings(&bsf_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void bsf_datapipe_quit(void)
{
datapipe_bindings_quit(&bsf_datapipe_bindings);
mce_datapipe_quit_bindings(&bsf_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/bluetooth.c
Expand Up @@ -329,14 +329,14 @@ static datapipe_bindings_t bluetooth_datapipe_bindings =
*/
static void bluetooth_datapipe_init(void)
{
datapipe_bindings_init(&bluetooth_datapipe_bindings);
mce_datapipe_init_bindings(&bluetooth_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void bluetooth_datapipe_quit(void)
{
datapipe_bindings_quit(&bluetooth_datapipe_bindings);
mce_datapipe_quit_bindings(&bluetooth_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/buttonbacklight.c
Expand Up @@ -348,15 +348,15 @@ static datapipe_bindings_t bbl_datapipe_bindings =
static void
bbl_datapipes_init(void)
{
datapipe_bindings_init(&bbl_datapipe_bindings);
mce_datapipe_init_bindings(&bbl_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void
bbl_datapipes_quit(void)
{
datapipe_bindings_quit(&bbl_datapipe_bindings);
mce_datapipe_quit_bindings(&bbl_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/callstate.c
Expand Up @@ -1897,15 +1897,15 @@ static datapipe_bindings_t callstate_datapipe_bindings =
static void
callstate_datapipes_init(void)
{
datapipe_bindings_init(&callstate_datapipe_bindings);
mce_datapipe_init_bindings(&callstate_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void
callstate_datapipes_quit(void)
{
datapipe_bindings_quit(&callstate_datapipe_bindings);
mce_datapipe_quit_bindings(&callstate_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/display.c
Expand Up @@ -2239,13 +2239,13 @@ static datapipe_bindings_t mdy_datapipe_bindings =
*/
static void mdy_datapipe_init(void)
{
datapipe_bindings_init(&mdy_datapipe_bindings);
mce_datapipe_init_bindings(&mdy_datapipe_bindings);
}

/** Remove triggers/filters from datapipes */
static void mdy_datapipe_quit(void)
{
datapipe_bindings_quit(&mdy_datapipe_bindings);
mce_datapipe_quit_bindings(&mdy_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/filter-brightness-als.c
Expand Up @@ -1458,15 +1458,15 @@ static datapipe_bindings_t fba_datapipe_bindings =
static void
fba_datapipe_init(void)
{
datapipe_bindings_init(&fba_datapipe_bindings);
mce_datapipe_init_bindings(&fba_datapipe_bindings);
}

/** Remove datapipe triggers/filters
*/
static void
fba_datapipe_quit(void)
{
datapipe_bindings_quit(&fba_datapipe_bindings);
mce_datapipe_quit_bindings(&fba_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/fingerprint.c
Expand Up @@ -1690,15 +1690,15 @@ static void
fingerprint_datapipe_init(void)
{
// triggers
datapipe_bindings_init(&fingerprint_datapipe_bindings);
mce_datapipe_init_bindings(&fingerprint_datapipe_bindings);
}

/** Remove triggers/filters from datapipes */
static void
fingerprint_datapipe_quit(void)
{
// triggers
datapipe_bindings_quit(&fingerprint_datapipe_bindings);
mce_datapipe_quit_bindings(&fingerprint_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/inactivity.c
Expand Up @@ -840,13 +840,13 @@ static datapipe_bindings_t mia_datapipe_bindings =
*/
static void mia_datapipe_init(void)
{
datapipe_bindings_init(&mia_datapipe_bindings);
mce_datapipe_init_bindings(&mia_datapipe_bindings);
}

/** Remove triggers/filters from datapipes */
static void mia_datapipe_quit(void)
{
datapipe_bindings_quit(&mia_datapipe_bindings);
mce_datapipe_quit_bindings(&mia_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/led.c
Expand Up @@ -3156,15 +3156,15 @@ static datapipe_bindings_t mce_led_datapipe_bindings =
static void
mce_led_datapipes_init(void)
{
datapipe_bindings_init(&mce_led_datapipe_bindings);
mce_datapipe_init_bindings(&mce_led_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void
mce_led_datapipes_quit(void)
{
datapipe_bindings_quit(&mce_led_datapipe_bindings);
mce_datapipe_quit_bindings(&mce_led_datapipe_bindings);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions modules/packagekit.c
Expand Up @@ -535,14 +535,14 @@ static datapipe_bindings_t xpkgkit_datapipe_bindings =
*/
static void xpkgkit_datapipe_init(void)
{
datapipe_bindings_init(&xpkgkit_datapipe_bindings);
mce_datapipe_init_bindings(&xpkgkit_datapipe_bindings);
}

/** Remove triggers/filters from datapipes
*/
static void xpkgkit_datapipe_quit(void)
{
datapipe_bindings_quit(&xpkgkit_datapipe_bindings);
mce_datapipe_quit_bindings(&xpkgkit_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/sensor-gestures.c
Expand Up @@ -426,13 +426,13 @@ static datapipe_bindings_t sg_datapipe_bindings =
*/
static void sg_datapipe_init(void)
{
datapipe_bindings_init(&sg_datapipe_bindings);
mce_datapipe_init_bindings(&sg_datapipe_bindings);
}

/** Remove triggers/filters from datapipes */
static void sg_datapipe_quit(void)
{
datapipe_bindings_quit(&sg_datapipe_bindings);
mce_datapipe_quit_bindings(&sg_datapipe_bindings);
}

/* ========================================================================= *
Expand Down
4 changes: 2 additions & 2 deletions modules/usbmode.c
Expand Up @@ -386,14 +386,14 @@ static datapipe_bindings_t usbmode_datapipe_bindings =
static void usbmode_datapipe_init(void)
{
// triggers
datapipe_bindings_init(&usbmode_datapipe_bindings);
mce_datapipe_init_bindings(&usbmode_datapipe_bindings);
}

/** Remove triggers/filters from datapipes */
static void usbmode_datapipe_quit(void)
{
// triggers
datapipe_bindings_quit(&usbmode_datapipe_bindings);
mce_datapipe_quit_bindings(&usbmode_datapipe_bindings);
}

/* ========================================================================= *
Expand Down

0 comments on commit 63953e2

Please sign in to comment.