From 0d667daf38b65d998e61054cb52211c8e4d7283d Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 15 May 2017 09:07:50 +0200
Subject: [PATCH] another bunch of sonar treats

---
 examples/java/app/pingpong/Receiver.java | 2 +-
 include/simgrid/simix.h                  | 4 ----
 include/xbt/ex.hpp                       | 5 ++---
 include/xbt/utility.hpp                  | 2 +-
 src/bindings/java/jmsg.cpp               | 9 ++-------
 src/xbt/xbt_log_layout_format.c          | 1 +
 6 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/examples/java/app/pingpong/Receiver.java b/examples/java/app/pingpong/Receiver.java
index 089ec45b13..b9955d47b7 100644
--- a/examples/java/app/pingpong/Receiver.java
+++ b/examples/java/app/pingpong/Receiver.java
@@ -17,7 +17,7 @@ public class Receiver extends Process {
 	}
 
 	public void main(String[] args) throws MsgException {
-		for (int i = 0 ; i<Main.TASK_COUNT; i++) {
+		for (int i = 0 ; i < Main.TASK_COUNT; i++) {
 			Msg.info("Wait for a task");
 
 			PingPongTask task = (PingPongTask)Task.receive(getHost().getName());
diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 95d78c3d02..02fdab7357 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -52,10 +52,6 @@ typedef struct s_smx_mailbox *smx_mailbox_t;
 
 #endif
 
-/**************************** Scalar Values **********************************/
-
-typedef union u_smx_scalar u_smx_scalar_t;
-
 /* ******************************** Host ************************************ */
 /** @brief Host datatype
     @ingroup simix_host_management
diff --git a/include/xbt/ex.hpp b/include/xbt/ex.hpp
index cde2d3e278..4b940b83be 100644
--- a/include/xbt/ex.hpp
+++ b/include/xbt/ex.hpp
@@ -62,9 +62,8 @@
  *  @ingroup XBT_ex_c
  */
 struct XBT_PUBLIC() xbt_ex :
-  public std::runtime_error,
-  public simgrid::xbt::WithContextException {
-public:
+  std::runtime_error,
+  simgrid::xbt::WithContextException {
 
   xbt_ex() :
     std::runtime_error("")
diff --git a/include/xbt/utility.hpp b/include/xbt/utility.hpp
index 09d8db40bf..095130f8a1 100644
--- a/include/xbt/utility.hpp
+++ b/include/xbt/utility.hpp
@@ -46,7 +46,7 @@ class integer_sequence {
 namespace bits {
   template<class T, long long N, long long... M>
   struct make_integer_sequence :
-    public make_integer_sequence<T, N-1, N-1, M...>
+    make_integer_sequence<T, N-1, N-1, M...>
   {};
   template<class T, long long... M>
   struct make_integer_sequence<T, 0, M...> {
diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp
index 3a5392d70a..a677fdaed3 100644
--- a/src/bindings/java/jmsg.cpp
+++ b/src/bindings/java/jmsg.cpp
@@ -88,13 +88,8 @@ static void __JAVA_host_priv_free(void *host)
 {
 }
 
-static void __JAVA_storage_priv_free(void *storage)
-{
-}
-
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs)
 {
-  char **argv = nullptr;
   int index;
   int argc = 0;
   jstring jval;
@@ -117,7 +112,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j
     argc = static_cast<int>(env->GetArrayLength(jargs));
 
   argc++;
-  argv = xbt_new(char *, argc + 1);
+  char** argv = new char*[argc + 1];
   argv[0] = xbt_strdup("java");
 
   for (index = 0; index < argc - 1; index++) {
@@ -137,7 +132,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j
     free(argv[index]);
   }
   free(argv[argc]);
-  free(argv);
+  delete[] argv;
 }
 
 JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls)
diff --git a/src/xbt/xbt_log_layout_format.c b/src/xbt/xbt_log_layout_format.c
index 1de4e72e6e..cd193fbb81 100644
--- a/src/xbt/xbt_log_layout_format.c
+++ b/src/xbt/xbt_log_layout_format.c
@@ -90,6 +90,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
       case '\0':
         fprintf(stderr, "Layout format (%s) ending with %%\n", (char *)l->data);
         xbt_abort();
+        break;
       case '%':
         *p = '%';
         check_overflow(1);
-- 
2.20.1