Skip to content

Commit

Permalink
[datapipe] Use const pointers in datapipe. JB#22475
Browse files Browse the repository at this point in the history 
Now that datapipes do not even in theory anymore support
dynamically allocated data, make the api reflect that.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
@spiiroin
spiiroin committed Sep 19, 2018
1 parent c70ea98 commit 3e9b559
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 26 deletions.
30 changes: 15 additions & 15 deletions datapipe.c
View file
Expand Up @@ -46,18 +46,18 @@
* ------------------------------------------------------------------------- */

const char *datapipe_name (datapipe_t *const datapipe);
gpointer datapipe_value (datapipe_t *const datapipe);
static void datapipe_exec_input_triggers (datapipe_t *const datapipe, gpointer const indata);
static gconstpointer datapipe_exec_filters (datapipe_t *const datapipe, gpointer indata);
gconstpointer datapipe_value (datapipe_t *const datapipe);
static void datapipe_exec_input_triggers (datapipe_t *const datapipe, gconstpointer const indata);
static gconstpointer datapipe_exec_filters (datapipe_t *const datapipe, gconstpointer indata);
void datapipe_exec_output_triggers (const datapipe_t *const datapipe, gconstpointer indata);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gconstpointer 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, datapipe_cache_t cache, const gsize datasize, gpointer initial_data);
static void datapipe_init_ (datapipe_t *const datapipe, const char *name, const datapipe_filtering_t read_only, datapipe_cache_t cache, const gsize datasize, gconstpointer initial_data);
static void datapipe_free (datapipe_t *const datapipe);

/* ------------------------------------------------------------------------- *
Expand Down Expand Up @@ -457,7 +457,7 @@ datapipe_name(datapipe_t *const datapipe)
*
* @return datapipe value, as void pointer
*/
gpointer
gconstpointer
datapipe_value(datapipe_t *const datapipe)
{
return datapipe->dp_cached_data;
Expand All @@ -473,10 +473,10 @@ datapipe_value(datapipe_t *const datapipe)
*/
static void
datapipe_exec_input_triggers(datapipe_t *const datapipe,
gpointer const indata)
gconstpointer const indata)
{
void (*trigger)(gconstpointer const input);
gpointer data;
gconstpointer data;
gint i;

if (datapipe == NULL) {
Expand Down Expand Up @@ -507,10 +507,10 @@ datapipe_exec_input_triggers(datapipe_t *const datapipe,
*/
static gconstpointer
datapipe_exec_filters(datapipe_t *const datapipe,
gpointer indata)
gconstpointer indata)
{
gpointer (*filter)(gpointer input);
gpointer data;
gpointer (*filter)(gconstpointer input);
gconstpointer data;
gconstpointer retval = NULL;
gint i;

Expand All @@ -525,7 +525,7 @@ datapipe_exec_filters(datapipe_t *const datapipe,

for (i = 0; (filter = g_slist_nth_data(datapipe->dp_filters,
i)) != NULL; i++) {
gpointer tmp = filter(data);
gconstpointer tmp = filter(data);

data = tmp;
}
Expand Down Expand Up @@ -574,8 +574,8 @@ void datapipe_exec_output_triggers(const datapipe_t *const datapipe,
* @param indata The input data to run through the datapipe
* @return The processed data
*/
gconstpointer datapipe_exec_full(datapipe_t *const datapipe,
gpointer indata)
gconstpointer
datapipe_exec_full(datapipe_t *const datapipe, gconstpointer indata)
{

gconstpointer outdata = NULL;
Expand Down Expand Up @@ -866,7 +866,7 @@ datapipe_init_(datapipe_t *const datapipe,
const char *name,
const datapipe_filtering_t read_only,
datapipe_cache_t cache,
const gsize datasize, gpointer initial_data)
const gsize datasize, gconstpointer initial_data)
{
if (datapipe == NULL) {
mce_log(LL_ERR,
Expand Down
21 changes: 10 additions & 11 deletions datapipe.h
View file
Expand Up @@ -69,15 +69,14 @@ typedef enum {
* Only access this struct through the functions
*/
typedef struct {
const char *dp_name; /**< Name of the datapipe */
GSList *dp_filters; /**< The filters */
GSList *dp_input_triggers; /**< Triggers called on indata */
GSList *dp_output_triggers; /**< Triggers called on outdata */
gpointer dp_cached_data; /**< Latest cached data */
gsize dp_datasize; /**< Size of data; NULL == automagic */

datapipe_filtering_t dp_read_only; /**< Datapipe is read only */
datapipe_cache_t dp_cache;
const char *dp_name; /**< Name of the datapipe */
GSList *dp_filters; /**< The filters */
GSList *dp_input_triggers; /**< Triggers called on indata */
GSList *dp_output_triggers; /**< Triggers called on outdata */
gconstpointer dp_cached_data; /**< Latest cached data */
gsize dp_datasize; /**< Size of data; NULL == automagic */
datapipe_filtering_t dp_read_only; /**< Datapipe is read only */
datapipe_cache_t dp_cache;
} datapipe_t;

typedef struct
Expand Down Expand Up @@ -105,9 +104,9 @@ typedef struct
* ------------------------------------------------------------------------- */

const char *datapipe_name (datapipe_t *const datapipe);
gpointer datapipe_value (datapipe_t *const datapipe);
gconstpointer datapipe_value (datapipe_t *const datapipe);
void datapipe_exec_output_triggers(const datapipe_t *const datapipe, gconstpointer indata);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gpointer indata);
gconstpointer datapipe_exec_full (datapipe_t *const datapipe, gconstpointer indata);

/* ------------------------------------------------------------------------- *
* MCE_DATAPIPE
Expand Down

0 comments on commit 3e9b559

Please sign in to comment.