Changeset 180

Timestamp:

03/18/14 09:11:39 (11 years ago)

Author:

Maciej Komosinski

Message:

Remove fixed length buffers

Location:

cpp

Files:

• common/framsg.cpp (modified) (2 diffs)
• common/stl-util.cpp (added)
• common/stl-util.h (modified) (2 diffs)
• frams/Makefile-GDK-files (modified) (1 diff)
• frams/errmgr/errmanager.cpp (modified) (2 diffs)
• frams/genetics/genoconv.cpp (modified) (2 diffs)

cpp/common/framsg.cpp

@@ -5 +5 @@
 #include "framsg.h"
 #include <common/nonstd_stdio.h>
+#include "stl-util.h"
 #include "Convert.h"
 
@@ -11 +12 @@
 void FMprintf_va(const char *o,const char *m,int w,const char *bl,va_list va)
 {
-        char buf[10000];
-        vsnprintf(buf,10000,bl,va);
-        FramMessage(o,m,buf,w);
+        string buf=ssprintf_va(bl,va);
+        FramMessage(o,m,buf.c_str(),w);
 }
 

cpp/common/stl-util.h

@@ -7 +7 @@
 
 #include "nonstd_stl.h"
+#include <stdarg.h>
 
 template<typename T, std::size_t N> void push_back(vector<T>& v, T(&d)[N])
@@ -37 +38 @@
 
 string ssprintf(const char* format, ...);
+string ssprintf_va(const char* format, va_list ap);
 
 string stripExt(const string& filename); // strip extension from filename
+string getFileExt(const string& filename); // get extension (starting with ".") from filename
 
 bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file=true);

cpp/frams/Makefile-GDK-files

@@ -4 +4 @@
 ALL_DIRS={common,frams,frams/canvas,frams/config,frams/errmgr,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/genetics/fF,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,frams/virtfile,frams/_demos}
 
-GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o frams/genetics/f1/conv_f1.o frams/genetics/f9/conv_f9.o frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o 
+GENOCONV_GDK_OBJS=frams/genetics/defgenoconv.o frams/genetics/f1/conv_f1.o frams/genetics/f9/conv_f9.o frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
 
 GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o frams/vm/classes/genoobj.o frams/model/autoname.o
 GENMAN_GDK_OBJS=$(GENMAN_COMMON_OBJS) frams/genetics/f9/oper_f9.o frams/genetics/fF/oper_fF.o
 
-GDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/framsg.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o
+GDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/framsg.o common/stl-util.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o
 
 

cpp/frams/errmgr/errmanager.cpp

@@ -4 +4 @@
 
 #include "errmanager.h"
-
+#include <common/stl-util.h>
 
 void FramMessage(const char *o,const char *m,const char *bl,int w)
@@ -65 +65 @@
 {
 if (!isEnabled()) return;
-char buf[10000];
+string buf;
 va_list argptr;
 va_start(argptr,bl);
-vsnprintf(buf,10000,bl,argptr);
+buf=ssprintf_va(bl,argptr);
 va_end(argptr);
-send(o,m,buf,w);
+send(o,m,buf.c_str(),w);
 }
 

cpp/frams/genetics/genoconv.cpp

@@ -15 +15 @@
 #include "genoconv.h"
 #include <frams/util/multimap.h>
+#include <common/stl-util.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -189 +190 @@
                 if (!tmp.len())
                 {
-                        char t[100];
-                        sprintf(t, "f%c->f%c conversion failed (%s)", gk->in_format, gk->out_format, gk->name);
-                        return Geno(0, 0, 0, t);
+                        string t=ssprintf("f%c->f%c conversion failed (%s)", gk->in_format, gk->out_format, gk->name);
+                        return Geno(0, 0, 0, t.c_str());
                 }
                 if (mapavail)