From fcb0b0f21b4416e7cae17a50d9534bb46f81946c Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 24 Feb 2017 11:43:14 +0100
Subject: [PATCH] please sonar

- Remove redundent declaration
- mark functions as extern "C" in their declaration, not only prototypes
- also stop having a C function and a C++ function sharing the same
  name with differing prototypes, even if sonar did not complain.
---
 include/simgrid/msg.h           | 23 +++++++----------------
 include/simgrid/s4u/forward.hpp |  1 -
 src/msg/msg_private.h           |  6 +++---
 src/msg/msg_process.cpp         | 10 ++++------
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index f7d217e8bc..ef9b314695 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -272,22 +272,13 @@ XBT_PUBLIC(void) MSG_create_environment(const char *file);
 XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name,
                                            xbt_main_func_t code,
                                            void *data, msg_host_t host);
-XBT_PUBLIC(msg_process_t) MSG_process_create_with_arguments(const char *name,
-                                                          xbt_main_func_t
-                                                          code, void *data,
-                                                          msg_host_t host,
-                                                          int argc,
-                                                          char **argv);
-XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(const char
-                                                            *name,
-                                                            xbt_main_func_t
-                                                            code,
-                                                            void *data,
-                                                            msg_host_t host,
-                                                            int argc,
-                                                            char **argv,
-                                                            xbt_dict_t
-                                                            properties);
+XBT_PUBLIC(msg_process_t)
+MSG_process_create_with_arguments(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc,
+                                  char** argv);
+XBT_PUBLIC(msg_process_t)
+MSG_process_create_with_environment(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc,
+                                    char** argv, xbt_dict_t properties);
+
 XBT_PUBLIC(msg_process_t) MSG_process_attach(
   const char *name, void *data,
   msg_host_t host, xbt_dict_t properties);
diff --git a/include/simgrid/s4u/forward.hpp b/include/simgrid/s4u/forward.hpp
index 8b520b1672..834163240c 100644
--- a/include/simgrid/s4u/forward.hpp
+++ b/include/simgrid/s4u/forward.hpp
@@ -18,7 +18,6 @@ class Activity;
 class Comm;
 class Engine;
 class Host;
-class Link;
 class Mailbox;
 using MailboxPtr = boost::intrusive_ptr<Mailbox>;
 class Mutex;
diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 00c668271b..b71ae373c0 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -154,9 +154,9 @@ XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process);
 
 SG_END_DECL()
 
-XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(
-  const char *name, std::function<void()> code, void *data,
-  msg_host_t host, xbt_dict_t properties);
+XBT_PUBLIC(msg_process_t)
+MSG_process_create_from_stdfunc(const char* name, std::function<void()> code, void* data, msg_host_t host,
+                                xbt_dict_t properties);
 
 inline void simdata_task::setUsed()
 {
diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index 63236a2f61..4603d880d7 100644
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -52,7 +52,7 @@ void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor)
 smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data, sg_host_t host,
                                           xbt_dict_t properties, smx_actor_t parent_process)
 {
-  msg_process_t p = MSG_process_create_with_environment(name, std::move(code), data, host, properties);
+  msg_process_t p = MSG_process_create_from_stdfunc(name, std::move(code), data, host, properties);
   return p;
 }
 
@@ -121,17 +121,15 @@ msg_process_t MSG_process_create_with_environment(const char *name, xbt_main_fun
   std::function<void()> function;
   if (code)
     function = simgrid::xbt::wrapMain(code, argc, const_cast<const char*const*>(argv));
-  msg_process_t res = MSG_process_create_with_environment(name,
-    std::move(function), data, host, properties);
+  msg_process_t res = MSG_process_create_from_stdfunc(name, std::move(function), data, host, properties);
   for (int i = 0; i != argc; ++i)
     xbt_free(argv[i]);
   xbt_free(argv);
   return res;
 }
 
-msg_process_t MSG_process_create_with_environment(
-  const char *name, std::function<void()> code, void *data,
-  msg_host_t host, xbt_dict_t properties)
+msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function<void()> code, void* data, msg_host_t host,
+                                              xbt_dict_t properties)
 {
   xbt_assert(code != nullptr && host != nullptr, "Invalid parameters: host and code params must not be nullptr");
   simgrid::MsgActorExt* msgExt = new simgrid::MsgActorExt(data);
-- 
2.20.1