Reduce sonarcloud warnings

neuronsimulator · Oct 4, 2023 · ae02186 · ae02186
1 parent 8686690
commit ae02186
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 30 deletions.
diff --git a/src/coreneuron/mpi/lib/mpispike.cpp b/src/coreneuron/mpi/lib/mpispike.cpp
@@ -290,7 +290,6 @@ void nrnmpi_barrier_impl() {
 }
 
 static MPI_Op type2OP(int type) {
-    MPI_Op tt;
     if (type == 1) {
         return MPI_SUM;
     } else if (type == 2) {

diff --git a/src/nrnmpi/bbsmpipack.cpp b/src/nrnmpi/bbsmpipack.cpp
@@ -349,7 +349,7 @@ void nrnmpi_bbssend(int dest, int tag, bbsmpibuf* r) {
         assert(r->buf && r->keypos <= r->size);
         nrn_mpi_assert(MPI_Send(r->buf, r->size, MPI_PACKED, dest, tag, nrn_bbs_comm));
     } else {
-        nrn_mpi_assert(MPI_Send(NULL, 0, MPI_PACKED, dest, tag, nrn_bbs_comm));
+        nrn_mpi_assert(MPI_Send(nullptr, 0, MPI_PACKED, dest, tag, nrn_bbs_comm));
     }
     errno = 0;
 #if debug

diff --git a/src/oc/nrnassrt.h b/src/oc/nrnassrt.h
@@ -12,44 +12,21 @@ has side effects which need to be executed regardles of NDEBUG.
 #if defined(hocassrt_h) /* hoc_execerror form */
 #include "oc_ansi.h"
 
-#if defined(__STDC__)
 #define nrn_assert(ex)                                                                   \
-    {                                                                                    \
+    do {                                                                                 \
         if (!(ex)) {                                                                     \
             fprintf(stderr, "Assertion failed: file %s, line %d\n", __FILE__, __LINE__); \
-            hoc_execerror(#ex, (char*) 0);                                               \
+            hoc_execerror(#ex, nullptr);                                                 \
         }                                                                                \
-    }
-#else
-#define nrn_assert(ex)                                                                   \
-    {                                                                                    \
-        if (!(ex)) {                                                                     \
-            fprintf(stderr, "Assertion failed: file %s, line %d\n", __FILE__, __LINE__); \
-            hoc_execerror("ex", (char*) 0);                                              \
-        }                                                                                \
-    }
-#endif
-
+    } while (0)
 #else /* abort form */
-
-#if defined(__STDC__)
 #define nrn_assert(ex)                                                                   \
-    {                                                                                    \
+    do {                                                                                 \
         if (!(ex)) {                                                                     \
             fprintf(stderr, "Assertion failed: file %s, line %d\n", __FILE__, __LINE__); \
             abort();                                                                     \
         }                                                                                \
-    }
-#else
-#define nrn_assert(ex)                                                                   \
-    {                                                                                    \
-        if (!(ex)) {                                                                     \
-            fprintf(stderr, "Assertion failed: file %s, line %d\n", __FILE__, __LINE__); \
-            abort();                                                                     \
-        }                                                                                \
-    }
-#endif
-
+    } while (0)
 #endif