From 22ee7fc2fbcb3e42fc615b1116c26d1b75ad97ff Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 17 Feb 2017 22:33:21 +0100 Subject: [PATCH] please sonar - don't use void as parameter - prefer if to ternary conditional --- include/simgrid_config.h.in | 2 +- teshsuite/simdag/is-router/is-router.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/simgrid_config.h.in b/include/simgrid_config.h.in index 0d0cd0db1a..f27c4ac75c 100644 --- a/include/simgrid_config.h.in +++ b/include/simgrid_config.h.in @@ -23,7 +23,7 @@ SG_BEGIN_DECL() XBT_PUBLIC(void) sg_version_get(int *major,int *minor,int *patch); /** Display the version information and some additional blurb. */ -XBT_PUBLIC(void) sg_version(void); +XBT_PUBLIC(void) sg_version(); SG_END_DECL() diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp index 9c9ef7ec0a..eaa9d45b3b 100644 --- a/teshsuite/simdag/is-router/is-router.cpp +++ b/teshsuite/simdag/is-router/is-router.cpp @@ -29,8 +29,14 @@ int main(int argc, char **argv) sg_host_t host; xbt_dynar_foreach(hosts, it, host) { simgrid::kernel::routing::NetPoint* nc = host->pimpl_netpoint; - std::printf(" - Seen: \"%s\". Type: %s\n", host->cname(), - nc->isRouter() ? "router" : (nc->isNetZone() ? "netzone" : (nc->isHost() ? "host" : "buggy"))); + const char *type = "buggy"; + if (nc->isRouter()) + type = "router"; + if (nc->isNetZone()) + type = "netzone"; + if (nc->isHost()) + type = "host"; + std::printf(" - Seen: \"%s\". Type: %s\n", host->cname(), type); } xbt_dynar_free(&hosts); -- 2.20.1