diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-03-26 16:04:54 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@ugent.be> | 2017-03-26 16:04:54 +0000 |
| commit | 7ee6dadd39f3d4b5874d23bfcdcdd66eb195124e (patch) | |
| tree | 43abd2084831d5a36c88a8ad93b3dec3e48127cd /src/ipcpd/normal/graph.c | |
| parent | 0a75074b15f66a60496d196c0759d33afa3c8b18 (diff) | |
| parent | 572013b92d82e78ef5e5b19d79316ae3131c71af (diff) | |
| download | ouroboros-7ee6dadd39f3d4b5874d23bfcdcdd66eb195124e.tar.gz ouroboros-7ee6dadd39f3d4b5874d23bfcdcdd66eb195124e.zip | |
Merged in sandervrijders/ouroboros/be-pointer (pull request #425)
ipcpd: normal: Fix compilation issue
Diffstat (limited to 'src/ipcpd/normal/graph.c')
| -rw-r--r-- | src/ipcpd/normal/graph.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ipcpd/normal/graph.c b/src/ipcpd/normal/graph.c index b3e105e3..272576bb 100644 --- a/src/ipcpd/normal/graph.c +++ b/src/ipcpd/normal/graph.c @@ -106,15 +106,15 @@ static void del_edge(struct edge * edge) free(edge); } -static int add_vertex(struct graph * graph, - uint64_t addr) +static struct vertex * add_vertex(struct graph * graph, + uint64_t addr) { struct vertex * vertex; struct list_head * p; vertex = malloc(sizeof(*vertex)); if (vertex == NULL) - return -1; + return NULL; list_head_init(&vertex->next); list_head_init(&vertex->edges); @@ -130,7 +130,7 @@ static int add_vertex(struct graph * graph, graph->nr_vertices++; - return 0; + return vertex; } static void del_vertex(struct graph * graph, @@ -206,7 +206,8 @@ int graph_add_edge(struct graph * graph, v = find_vertex_by_addr(graph, s_addr); if (v == NULL) { - if (add_vertex(graph, s_addr)) { + v = add_vertex(graph, s_addr); + if (v == NULL) { pthread_mutex_unlock(&graph->lock); return -ENOMEM; } @@ -221,7 +222,8 @@ int graph_add_edge(struct graph * graph, nb = find_vertex_by_addr(graph, d_addr); if (nb == NULL) { - if (add_vertex(graph, d_addr)) { + nb = add_vertex(graph, d_addr); + if (nb == NULL) { pthread_mutex_unlock(&graph->lock); return -ENOMEM; } |