Changeset 246

Timestamp:

06/01/14 00:52:01 (11 years ago)

Author:

Maciej Komosinski

Message:

Added getFileDir() and source formatting

Location:

cpp/common

Files:

• stl-util.cpp (modified) (8 diffs)
• stl-util.h (modified) (1 diff)

cpp/common/stl-util.cpp

@@ -14 +14 @@
 {
         string s; //clang crashed when this declaration was in s=buf
-        long size=256;
+        long size = 256;
         char* buf;
 
         //almost like SString::sprintf, but there is no common code to share because SString can use its directWrite to avoid double allocating/copying
 #ifdef USE_VSCPRINTF
-        size=_vscprintf(format, ap)+1; //+1 for terminating null character
+        size = _vscprintf(format, ap) + 1; //+1 for terminating null character
 #endif
 
-        while(1)
+        while (1)
+        {
+                buf = (char*)malloc(size);
+                assert(buf != NULL);
+                int n = vsnprintf(buf, size, format, ap);
+                if (n > -1 && n < size)
                 {
-                buf=(char*)malloc(size);
-                assert(buf!=NULL);
-                int n=vsnprintf(buf,size,format,ap);
-                if (n > -1 && n < size)
-                        {
-                        s=buf;
+                        s = buf;
                         free(buf);
                         return s;
-                        }
+                }
 #ifdef VSNPRINTF_RETURNS_REQUIRED_SIZE
                 if (n > -1)    /* glibc 2.1 */
@@ -40 +40 @@
                         size *= 2;  /* twice the old size */
                 free(buf);
-                }
+        }
 }
 
@@ -47 +47 @@
         va_list ap;
         va_start(ap, format);
-        string ret=ssprintf_va(format,ap); //is it too wasteful? copying the string again... unless the compiler can handle it better
+        string ret = ssprintf_va(format, ap); //is it too wasteful? copying the string again... unless the compiler can handle it better
         va_end(ap);
         return ret;
@@ -54 +54 @@
 bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file)
 {
-        MFILE *f=mfopen(filename,FOPEN_READ_BINARY);
-        bool ok=f!=NULL;
+        MFILE *f = mfopen(filename, FOPEN_READ_BINARY);
+        bool ok = f != NULL;
         if (f)
         {
-                mfseek(f,0,SEEK_END);
-                long size=mftell(f);
-                mfseek(f,0,SEEK_SET);
+                mfseek(f, 0, SEEK_END);
+                long size = mftell(f);
+                mfseek(f, 0, SEEK_SET);
                 data.resize(size);
-                int przeczytane=mfread(&data[0],size,1,f);
+                int przeczytane = mfread(&data[0], size, 1, f);
                 mfclose(f);
-                ok&=przeczytane==1;
+                ok &= przeczytane == 1;
         }
         if (warn_on_missing_file && !ok)
-                FMprintf("stl-util","readCompleteFile",FMLV_WARN,"Couldn't open file '%s'",filename);
+                FMprintf("stl-util", "readCompleteFile", FMLV_WARN, "Couldn't open file '%s'", filename);
         return ok;
 }
@@ -73 +73 @@
 bool readCompleteFile(const char* filename, string& out, bool warn_on_missing_file)
 {
-        std::vector<char> data;
-        if (readCompleteFile(filename,data,warn_on_missing_file))
+        vector<char> data;
+        if (readCompleteFile(filename, data, warn_on_missing_file))
         {
-                out=string(&data[0],data.size());
+                out = string(&data[0], data.size());
                 return true;
         }
@@ -84 +84 @@
 bool writeCompleteFile(const char* filename, const string& text, bool warn_on_fail)
 {
-        MFILE *f=mfopen(filename,FOPEN_WRITE_BINARY);
-        bool ok=f!=NULL;
+        MFILE *f = mfopen(filename, FOPEN_WRITE_BINARY);
+        bool ok = f != NULL;
         if (f)
         {
-                int zapisane=mfwrite(text.c_str(),text.length(),1,f);
+                int zapisane = mfwrite(text.c_str(), text.length(), 1, f);
                 mfclose(f);
-                ok&=zapisane==1;
+                ok &= zapisane == 1;
         }
         if (warn_on_fail && !ok)
-                FMprintf("stl-util","writeCompleteFile",FMLV_WARN,"couldn't write file '%s'",filename);
+                FMprintf("stl-util", "writeCompleteFile", FMLV_WARN, "couldn't write file '%s'", filename);
         return ok;
 }
@@ -99 +99 @@
 bool writeCompleteFile(const char* filename, vector<char>& data, bool warn_on_fail)
 {
-        string s(&data[0],data.size());
+        string s(&data[0], data.size());
         return writeCompleteFile(filename, s, warn_on_fail);
 }
@@ -105 +105 @@
 
 
-std::string stripExt(const std::string& filename)
+string stripExt(const string& filename)
 {
-        int dot=filename.rfind('.');
-        if (dot==std::string::npos) return filename;
-        int sep=filename.rfind(PATH_SEPARATOR_CHAR);
-        if ((sep==std::string::npos)||(sep<dot))
-                return filename.substr(0,dot);
+        int dot = filename.rfind('.');
+        if (dot == string::npos) return filename;
+        int sep = filename.rfind(PATH_SEPARATOR_CHAR);
+        if ((sep == string::npos) || (sep < dot))
+                return filename.substr(0, dot);
         return filename;
 }
 
-std::string getFileExt(const std::string& filename)
+string getFileExt(const string& filename)
 {
-        int dot=filename.rfind('.');
-        if (dot==std::string::npos) return string("");
-        int sep=filename.rfind(PATH_SEPARATOR_CHAR);
-        if ((sep==std::string::npos)||(sep<dot))
+        int dot = filename.rfind('.');
+        if (dot == string::npos) return string("");
+        int sep = filename.rfind(PATH_SEPARATOR_CHAR);
+        if ((sep == string::npos) || (sep < dot))
                 return filename.substr(dot);
         return string("");
 }
+
+string getFileDir(const string& filename)
+{
+        int slash = filename.rfind(PATH_SEPARATOR_CHAR);
+        if (slash == string::npos) return string("");
+        return filename.substr(0, slash);
+}

cpp/common/stl-util.h

@@ -42 +42 @@
 string stripExt(const string& filename); // strip extension from filename
 string getFileExt(const string& filename); // get extension (starting with ".") from filename
+string getFileDir(const string& filename); // get path component excluding filename ("" if no dir in file)
+
 
 bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file=true);