Hi again,
while testing a build, clang spotted the health desc field improper check
so here a little patch proposal. That should be all after it :-).
Kind regards.
From e96a3190ada573dc39eb16e721dd1b9c297f9c45 Mon Sep 17 00:00:00 2001
From: David Carlier <devne...@gmail.com>
Date: Fri, 3 Nov 2017 14:41:46 +0000
Subject: [PATCH] BUG/MINOR: server: check desc field is not a pointer.
The desc field was checked a pointer rather than an array.
Triggered by clang build.
---
src/server.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/server.c b/src/server.c
index 37f90d8c..2ade4137 100644
--- a/src/server.c
+++ b/src/server.c
@@ -872,7 +872,7 @@ void srv_set_stopped(struct server *s, const char *reason, struct check *check)
strlcpy2(s->op_st_chg.reason, reason, sizeof(s->op_st_chg.reason));
}
else if (check) {
- if (check->desc)
+ if (check->desc[0] != '\0')
strlcpy2(s->op_st_chg.reason, check->desc, sizeof(s->op_st_chg.reason));
s->op_st_chg.code = check->code;
s->op_st_chg.status = check->status;
@@ -911,7 +911,7 @@ void srv_set_running(struct server *s, const char *reason, struct check *check)
strlcpy2(s->op_st_chg.reason, reason, sizeof(s->op_st_chg.reason));
}
else if (check) {
- if (check->desc)
+ if (check->desc[0] != '\0')
strlcpy2(s->op_st_chg.reason, check->desc, sizeof(s->op_st_chg.reason));
s->op_st_chg.code = check->code;
s->op_st_chg.status = check->status;
@@ -955,7 +955,7 @@ void srv_set_stopping(struct server *s, const char *reason, struct check *check)
strlcpy2(s->op_st_chg.reason, reason, sizeof(s->op_st_chg.reason));
}
else if (check) {
- if (check->desc)
+ if (check->desc[0] != '\0')
strlcpy2(s->op_st_chg.reason, check->desc, sizeof(s->op_st_chg.reason));
s->op_st_chg.code = check->code;
s->op_st_chg.status = check->status;
--
2.14.2
