Changeset 180 for cpp/common

Timestamp:

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

Author:

Maciej Komosinski

Message:

Remove fixed length buffers

Location:

cpp/common

Files:

• framsg.cpp (modified) (2 diffs)
• stl-util.cpp (added)
• stl-util.h (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);