Remove sdprintf (#255)

* Get rid of sdprintf
* Relevant test+cmake

Author: Nicolas Cornu

coreneuron/apps/main1.cpp

@@ -50,7 +50,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
 #include "coreneuron/io/nrnoptarg.hpp"
 #include "coreneuron/io/prcellstate.hpp"
 #include "coreneuron/utils/nrnmutdec.h"
-#include "coreneuron/utils/sdprintf.h"
 #include "coreneuron/utils/nrn_stats.h"
 #include "coreneuron/io/nrnreport.hpp"
 #include "coreneuron/gpu/nrn_acc_manager.hpp"

coreneuron/io/mk_mech.cpp

@@ -38,7 +38,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
 #include "coreneuron/mechanism/register_mech.hpp"
 #include "coreneuron/nrniv/nrniv_decl.h"
 #include "coreneuron/utils/nrn_assert.h"
-#include "coreneuron/utils/sdprintf.h"
 #include "coreneuron/mechanism/mech/cfile/cabvars.h"
 #include "coreneuron/io/nrn2core_direct.h"
 #include "coreneuron/coreneuron.hpp"
@@ -85,39 +84,42 @@ void mk_mech(const char* datpath) {
         mk_mech();
         return;
     }
-    char fnamebuf[1024];
-    sd_ptr fname = sdprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", datpath, "bbcore_mech.dat");
-    std::ifstream fs(fname);
-
-    if (!fs.good()) {
-        fprintf(stderr, "Error: couldn't find bbcore_mech.dat file in the dataset directory \n");
-        fprintf(
-            stderr,
-            "       Make sure to pass full directory path of dataset using -d DIR or --datpath=DIR \n");
-    }
-
-    nrn_assert(fs.good());
-    mk_mech(fs);
-    fs.close();
+    {
+        std::string fname = std::string(datpath) + "/bbcore_mech.dat";
+        std::ifstream fs(fname);
+
+        if (!fs.good()) {
+            fprintf(stderr, "Error: couldn't find bbcore_mech.dat file in the dataset directory \n");
+            fprintf(
+                stderr,
+                "       Make sure to pass full directory path of dataset using -d DIR or --datpath=DIR \n");
+        }
 
-    fname = sdprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", datpath, "byteswap1.dat");
-    FILE* f = fopen(fname, "r");
-    if (!f) {
-        fprintf(stderr, "Error: couldn't find byteswap1.dat file in the dataset directory \n");
+        nrn_assert(fs.good());
+        mk_mech(fs);
+        fs.close();
     }
-    nrn_assert(f);
-    // file consists of int32_t binary 1 . After reading can decide if
-    // binary info in files needs to be byteswapped.
-    int32_t x;
-    nrn_assert(fread(&x, sizeof(int32_t), 1, f) == 1);
-    nrn_need_byteswap = 0;
-    if (x != 1) {
-        BYTEHEADER;
-        nrn_need_byteswap = 1;
-        BYTESWAP(x, int32_t);
-        nrn_assert(x == 1);
+
+    {
+        std::string fname = std::string(datpath) + "/byteswap1.dat";
+        FILE* f = fopen(fname.c_str(), "r");
+        if (!f) {
+            fprintf(stderr, "Error: couldn't find byteswap1.dat file in the dataset directory \n");
+        }
+        nrn_assert(f);
+        // file consists of int32_t binary 1 . After reading can decide if
+        // binary info in files needs to be byteswapped.
+        int32_t x;
+        nrn_assert(fread(&x, sizeof(int32_t), 1, f) == 1);
+        nrn_need_byteswap = 0;
+        if (x != 1) {
+            BYTEHEADER;
+            nrn_need_byteswap = 1;
+            BYTESWAP(x, int32_t);
+            nrn_assert(x == 1);
+        }
+        fclose(f);
     }
-    fclose(f);
 }
 
 // we are embedded in NEURON, get info as stringstream from nrnbbcore_write.cpp

coreneuron/io/nrn_setup.hpp

@@ -32,7 +32,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include "coreneuron/sim/multicore.hpp"
 #include "coreneuron/io/nrn_filehandler.hpp"
-#include "coreneuron/utils/sdprintf.h"
 
 namespace coreneuron {
 static bool do_not_open;
@@ -129,17 +128,15 @@ inline void* phase_wrapper_w(NrnThread* nt) {
                 data_dir = restore_path_w;
             }
 
-            sd_ptr fname = sdprintf(fnamebuf, sizeof(fnamebuf),
-                                    std::string("%s/%d_" + getPhaseName<P>() + ".dat").c_str(),
-                                    data_dir, gidgroups_w[i]);
+            std::string fname = std::string(data_dir) + "/" + std::to_string(gidgroups_w[i]) + "_" + getPhaseName<P>() + ".dat";
 
             // Avoid trying to open the gid_gap.dat file if it doesn't exist when there are no
             // gap junctions in this gid
-            if (P == gap && !file_reader_w[i].file_exist(fname)) {
+            if (P == gap && !file_reader_w[i].file_exist(fname.c_str())) {
                 file_reader_w[i].close();
             } else {
                 // if no file failed to open or not opened at all
-                file_reader_w[i].open(fname, byte_swap_w);
+                file_reader_w[i].open(fname.c_str(), byte_swap_w);
             }
         }
         read_phase_aux<P>(file_reader_w[i], imult_w[i], *nt);

coreneuron/io/prcellstate.cpp

@@ -33,7 +33,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
 #include "coreneuron/sim/multicore.hpp"
 #include "coreneuron/io/nrn_setup.hpp"
 #include "coreneuron/network/netcon.hpp"
-#include "coreneuron/utils/sdprintf.h"
 #include "coreneuron/nrniv/nrniv_decl.h"
 #include "coreneuron/utils/nrn_assert.h"
 #include "coreneuron/coreneuron.hpp"
@@ -281,8 +280,8 @@ int prcellstate(int gid, const char* suffix) {
             if (ps.output_index_ == gid) {
                 // found it so create a <gid>_<suffix>.corenrn file
                 char buf[200];
-                sd_ptr filename = sdprintf(buf, sizeof(buf), "%d_%s.corenrn", gid, suffix);
-                FILE* f = fopen(filename, "w");
+                std::string filename = std::to_string(gid) + "_" + suffix + ".corenrn";
+                FILE* f = fopen(filename.c_str(), "w");
                 assert(f);
                 fprintf(f, "gid = %d\n", gid);
                 fprintf(f, "t = %.*g\n", precision, nt._t);