From 9ab3b80bf99c7da6679392decfb98dec88698c36 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Tue, 13 Oct 2015 10:09:35 +0200
Subject: [PATCH] apply code style rules
---
server/include/node.h | 8 ++++----
server/src/hooks.c | 2 +-
server/src/opal.c | 1 +
server/src/path.c | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/server/include/node.h b/server/include/node.h
index a4cceae15..185246c3f 100644
--- a/server/include/node.h
+++ b/server/include/node.h
@@ -28,7 +28,7 @@
/* Helper macros for virtual node type */
#define node_type(n) ((n)->_vt->type)
-#define node_parse(n, cfg) ((n)->_vt->parse(n, cfg))
+#define node_parse(n, cfg) ((n)->_vt->parse(cfg, n))
#define node_print(n) ((n)->_vt->print(n))
#define node_read(n, p, ps, f, c) ((n)->_vt->read(n, p, ps, f, c))
@@ -36,6 +36,7 @@
#define node_open(n) ((n)->_vt->open(n))
#define node_close(n) ((n)->_vt->close(n))
+
#define node_read_single(n, m) ((n)->_vt->read(n, m, 1, 0, 1))
#define node_write_single(n, m) ((n)->_vt->write(n, m, 1, 0, 1))
@@ -56,15 +57,14 @@ extern struct list node_types;
struct node_type {
/** The unique name of this node. This must be allways the first member! */
char *name;
-
- /** Node type */
+
enum {
BSD_SOCKET, /**< BSD Socket API */
LOG_FILE, /**< File IO */
OPAL_ASYNC, /**< OPAL-RT Asynchronous Process Api */
GTFPGA, /**< Xilinx ML507 GTFPGA card */
NGSI /**< NGSI 9/10 HTTP RESTful API (FIRWARE ContextBroker) */
- } type;
+ } type; /**< Node type */
/** Parse node connection details.‚
*
diff --git a/server/src/hooks.c b/server/src/hooks.c
index 8d35e3ef9..65468d096 100644
--- a/server/src/hooks.c
+++ b/server/src/hooks.c
@@ -379,7 +379,7 @@ int hook_stats(struct path *p, struct hook *h, int when)
if (p->received > 0)
log_print(STATS, "%-40s|%10.2g|%10.2f|%10u|%10u|%10u|%10u|%10u|%10u|%10u|", buf,
p->hist_owd.last, 1 / p->hist_gap_msg.last,
- p->sent, p->received, p->dropped, p->skipped, p->invalid, p->overrun, p->current->length
+ p->sent, p->received, p->dropped, p->skipped, p->invalid, p->overrun, list_length(p->current)
);
else
log_print(STATS, "%-40s|%10s|%10s|%10u|%10u|%10u|%10u|%10u|%10u|%10s|", buf, "", "",
diff --git a/server/src/opal.c b/server/src/opal.c
index fe36076b7..76d90c463 100644
--- a/server/src/opal.c
+++ b/server/src/opal.c
@@ -14,6 +14,7 @@
#include "opal.h"
#include "utils.h"
+/** Global OPAL specific settings */
static struct opal_global *og = NULL;
/** List of all opal nodes */
diff --git a/server/src/path.c b/server/src/path.c
index e5de77570..ac0e10dce 100644
--- a/server/src/path.c
+++ b/server/src/path.c
@@ -135,7 +135,7 @@ static void * path_run(void *arg)
int path_start(struct path *p)
{ INDENT
char *buf = path_print(p);
- info("Starting path: %s (poolsize = %u, msgsize = %u, #hooks = %zu, rate = %.1f)",
+ info("Starting path: %s (poolsize=%u, msgsize=%u, #hooks=%zu, rate=%.1f)",
buf, p->poolsize, p->msgsize, list_length(&p->hooks), p->rate);
free(buf);