diff options
| author | Sander Vrijders <[email protected]> | 2017-03-31 16:08:29 +0000 |
|---|---|---|
| committer | dimitri staessens <[email protected]> | 2017-03-31 16:08:29 +0000 |
| commit | d9d3d3010511a1893e5fffdfbc5378db59233a1e (patch) | |
| tree | d1f820ba426f097f6ae466dfe6ddb5d003ec8563 | |
| parent | 7b7f1dc538218d2b3ea198bb66d096a3bcfbcf21 (diff) | |
| parent | d57f771135f81003985d9332430332b93902f766 (diff) | |
| download | ouroboros-d9d3d3010511a1893e5fffdfbc5378db59233a1e.tar.gz ouroboros-d9d3d3010511a1893e5fffdfbc5378db59233a1e.zip | |
Merged in sandervrijders/ouroboros/be-logs (pull request #446)
ipcpd: normal: Fix logs
| -rw-r--r-- | src/ipcpd/normal/fmgr.c | 9 | ||||
| -rw-r--r-- | src/ipcpd/normal/graph.c | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c index 6d1694ab..2c94160a 100644 --- a/src/ipcpd/normal/fmgr.c +++ b/src/ipcpd/normal/fmgr.c @@ -47,6 +47,7 @@ #include <stdbool.h> #include <pthread.h> #include <string.h> +#include <inttypes.h> #include "flow_alloc.pb-c.h" typedef FlowAllocMsg flow_alloc_msg_t; @@ -202,7 +203,7 @@ void * fmgr_nm1_sdu_reader(void * o) fd = pff_nhop(fmgr.pff[i], pci.dst_addr); if (fd < 0) { pff_unlock(fmgr.pff[i]); - log_err("No next hop for %lu", + log_err("No next hop for %" PRIu64, pci.dst_addr); ipcp_flow_del(sdb); continue; @@ -705,7 +706,8 @@ int fmgr_nm1_write_sdu(struct pci * pci, fd = pff_nhop(fmgr.pff[pci->qos_id], pci->dst_addr); if (fd < 0) { pff_unlock(fmgr.pff[pci->qos_id]); - log_err("Could not get nhop for address %lu", pci->dst_addr); + log_err("Could not get nhop for address %" PRIu64, + pci->dst_addr); ipcp_flow_del(sdb); return -1; } @@ -739,7 +741,8 @@ int fmgr_nm1_write_buf(struct pci * pci, fd = pff_nhop(fmgr.pff[pci->qos_id], pci->dst_addr); if (fd < 0) { pff_unlock(fmgr.pff[pci->qos_id]); - log_err("Could not get nhop for address %lu", pci->dst_addr); + log_err("Could not get nhop for address %" PRIu64, + pci->dst_addr); return -1; } pff_unlock(fmgr.pff[pci->qos_id]); diff --git a/src/ipcpd/normal/graph.c b/src/ipcpd/normal/graph.c index 5de7c15b..78ed203d 100644 --- a/src/ipcpd/normal/graph.c +++ b/src/ipcpd/normal/graph.c @@ -95,8 +95,6 @@ static struct edge * add_edge(struct vertex * vertex, list_add(&edge->next, &vertex->edges); - log_dbg("Added a new edge to the graph."); - return edge; } @@ -104,8 +102,6 @@ static void del_edge(struct edge * edge) { list_del(&edge->next); free(edge); - - log_dbg("Removed an edge of the graph."); } static struct vertex * add_vertex(struct graph * graph, @@ -132,8 +128,6 @@ static struct vertex * add_vertex(struct graph * graph, graph->nr_vertices++; - log_dbg("Added new vertex."); - return vertex; } @@ -152,8 +146,6 @@ static void del_vertex(struct graph * graph, free(vertex); - log_dbg("Removed a vertex from the graph."); - graph->nr_vertices--; } |