From 2ae9612e7a248d57938adde5722ba552c027521e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 4 Jan 2014 13:37:59 +0100 Subject: Eina_Graph_Adjacents is private struct -> add '_' prefix --- src/lib/eina_graph.c | 4 ++-- src/lib/eina_graph_bfs.c | 2 +- src/lib/eina_graph_dfs.c | 4 ++-- src/lib/eina_graph_main.c | 2 +- src/lib/eina_graph_private.h | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/eina_graph.c b/src/lib/eina_graph.c index 9e6569b..ac42012 100644 --- a/src/lib/eina_graph.c +++ b/src/lib/eina_graph.c @@ -38,7 +38,7 @@ eina_graph_new(unsigned int v, unsigned int step) { _Eina_Graph *_g; - _g = calloc(1, sizeof(_Eina_Graph) + (v * sizeof(Eina_Graph_Adjacents))); + _g = calloc(1, sizeof(_Eina_Graph) + (v * sizeof(_Eina_Graph_Adjacents))); if (!_g) { ERR("calloc failed : %s", strerror(errno)); @@ -47,7 +47,7 @@ eina_graph_new(unsigned int v, unsigned int step) _g->step = step; _g->vertices = v; - _g->adjs = (Eina_Graph_Adjacents *) ((char *) _g + sizeof(_Eina_Graph)); + _g->adjs = (_Eina_Graph_Adjacents *) ((char *) _g + sizeof(_Eina_Graph)); return (Eina_Graph *) _g; } diff --git a/src/lib/eina_graph_bfs.c b/src/lib/eina_graph_bfs.c index 36cbdbc..c1e67d7 100644 --- a/src/lib/eina_graph_bfs.c +++ b/src/lib/eina_graph_bfs.c @@ -37,7 +37,7 @@ static void _eina_graph_bfs_fwalk(_Eina_Graph *_g, _Eina_Graph_BFS *_bfs, unsigned int v) { Eina_List *fifo = NULL; - Eina_Graph_Adjacents *adjs; + _Eina_Graph_Adjacents *adjs; unsigned int p, w, n, i, d; d = 0; diff --git a/src/lib/eina_graph_dfs.c b/src/lib/eina_graph_dfs.c index df272b4..7951b3c 100644 --- a/src/lib/eina_graph_dfs.c +++ b/src/lib/eina_graph_dfs.c @@ -37,7 +37,7 @@ static void _eina_graph_dfs_swalk(_Eina_Graph *_g, _Eina_Graph_DFS *_dfs, unsigned int v) { Eina_List *stack = NULL; - Eina_Graph_Adjacents *adjs; + _Eina_Graph_Adjacents *adjs; unsigned int p, w, n, i; p = v; @@ -69,7 +69,7 @@ _eina_graph_dfs_swalk(_Eina_Graph *_g, _Eina_Graph_DFS *_dfs, unsigned int v) static void _eina_graph_dfs_rwalk(_Eina_Graph *_g, _Eina_Graph_DFS *_dfs, unsigned int v) { - Eina_Graph_Adjacents *adjs; + _Eina_Graph_Adjacents *adjs; unsigned int i, n, w; _dfs->marked[v] = EINA_TRUE; diff --git a/src/lib/eina_graph_main.c b/src/lib/eina_graph_main.c index 6eac08d..a42ed98 100644 --- a/src/lib/eina_graph_main.c +++ b/src/lib/eina_graph_main.c @@ -92,7 +92,7 @@ eina_graph_shutdown(void) } Eina_Bool -_eina_graph_adjacents_grow(Eina_Graph_Adjacents *adjs, unsigned int step) +_eina_graph_adjacents_grow(_Eina_Graph_Adjacents *adjs, unsigned int step) { unsigned int *tmp; unsigned int total; diff --git a/src/lib/eina_graph_private.h b/src/lib/eina_graph_private.h index 4eaf4d0..ccbff01 100644 --- a/src/lib/eina_graph_private.h +++ b/src/lib/eina_graph_private.h @@ -65,10 +65,10 @@ typedef struct _Eina_Graph_Adjacents unsigned int *data; unsigned int total; unsigned int count; -} Eina_Graph_Adjacents; +} _Eina_Graph_Adjacents; static inline void -eina_graph_adjacents_free(Eina_Graph_Adjacents *adjs) +eina_graph_adjacents_free(_Eina_Graph_Adjacents *adjs) { if (adjs->data) free(adjs->data); @@ -76,10 +76,10 @@ eina_graph_adjacents_free(Eina_Graph_Adjacents *adjs) } Eina_Bool -_eina_graph_adjacents_grow(Eina_Graph_Adjacents *adjs, unsigned int step); +_eina_graph_adjacents_grow(_Eina_Graph_Adjacents *adjs, unsigned int step); static inline Eina_Bool -eina_graph_adjacents_push(Eina_Graph_Adjacents *adjs, unsigned int v, unsigned int step) +eina_graph_adjacents_push(_Eina_Graph_Adjacents *adjs, unsigned int v, unsigned int step) { if (EINA_UNLIKELY((adjs->count + 1) > adjs->total)) if (!_eina_graph_adjacents_grow(adjs, step)) @@ -100,7 +100,7 @@ typedef struct _Eina_Graph unsigned int vertices; unsigned int edges; unsigned int step; - Eina_Graph_Adjacents *adjs; + _Eina_Graph_Adjacents *adjs; } _Eina_Graph; typedef struct _Eina_Graph_DFS -- cgit v1.1-2-g2b99