Changeset 840

Timestamp:

12/08/18 05:31:09 (6 years ago)

Author:

Maciej Komosinski

Message:

Split stl-util into util-stl, util-file and util-string

Location:

cpp/common

Files:

• util-file.cpp (added)
• util-file.h (added)
• util-stl.h (added)
• util-string.cpp (moved) (moved from cpp/common/stl-util.cpp) (3 diffs)
• util-string.h (moved) (moved from cpp/common/stl-util.h) (2 diffs)

cpp/common/util-string.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "stl-util.h"
+#include "util-file.h"
 #include <stdarg.h>
-#include <stdlib.h>
 #include "nonstd_stdio.h"
-#include "Convert.h"
 #include "nonstd.h"
-#include "log.h"
 #include <assert.h>
 #ifdef USE_VIRTFILE
 #include <common/virtfile/virtfile.h>
 #endif
-
 
 string ssprintf_va(const char* format, va_list ap)
@@ -71 +67 @@
 }
 
-bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file)
-{
-        bool ok = false;
-#ifdef USE_VIRTFILE
-//      if (!isAbsolutePath(filename))
-        {
-                VirtFILE *f=Vfopen(filename,FOPEN_READ_BINARY);
-                if (f)
-                {
-                        int size=f->getSize();
-                        data.resize(size);
-                        int przeczytane = f->Vread(&data[0], size, 1);
-                        ok = przeczytane == 1;
-                        delete f;
-                }
-        }
-//      else
-#endif
-        {
-                MFILE *f = mfopen(filename, FOPEN_READ_BINARY);
-                if (f)
-                {
-                        int size = getFileSize(f);
-                        data.resize(size);
-                        int przeczytane = mfread(&data[0], size, 1, f);
-                        mfclose(f);
-                        ok = przeczytane == 1;
-                }
-        }
-        if (warn_on_missing_file && !ok)
-                logPrintf("stl-util", "readCompleteFile", LOG_WARN, "Couldn't open file '%s'", filename);
-        return ok;
-}
-
-bool readCompleteFile(const char* filename, string& out, bool warn_on_missing_file)
-{
-        vector<char> data;
-        if (readCompleteFile(filename, data, warn_on_missing_file))
-        {
-                out = string(&data[0], data.size());
-                return true;
-        }
-        return false;
-}
-
-bool writeCompleteFile(const char* filename, const string& text, bool warn_on_fail)
-{
-#ifdef USE_VIRTFILE
-        VirtFILE *f = Vfopen(filename, FOPEN_WRITE_BINARY);
-        bool ok = f != NULL;
-        if (f)
-        {
-                int zapisane = f->Vwrite(text.c_str(), text.length(), 1);
-                delete f;
-                ok &= zapisane == 1;
-        }
-#else
-        MFILE *f = mfopen(filename, FOPEN_WRITE_BINARY);
-        bool ok = f != NULL;
-        if (f)
-        {
-                int zapisane = mfwrite(text.c_str(), text.length(), 1, f);
-                mfclose(f);
-                ok &= zapisane == 1;
-        }
-#endif
-        if (warn_on_fail && !ok)
-                logPrintf("stl-util", "writeCompleteFile", LOG_WARN, "Couldn't write file '%s'", filename);
-        return ok;
-}
-
-bool writeCompleteFile(const char* filename, vector<char>& data, bool warn_on_fail)
-{
-        string s(&data[0], data.size());
-        return writeCompleteFile(filename, s, warn_on_fail);
-}
-
-
-
 string stripExt(const string& filename)
 {
@@ -183 +100 @@
         return filename.substr(0, slash);
 }
-

cpp/common/util-string.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _STL_UTIL_H_
-#define _STL_UTIL_H_
+#ifndef _UTIL_STRINGS_H_
+#define _UTIL_STRINGS_H_
 
 #include "nonstd_stl.h"
 #include <stdarg.h>
-
-template<typename T, std::size_t N> void push_back(vector<T>& v, T(&d)[N])
-{
-        for (unsigned int i = 0; i < N; i++)
-                v.push_back(d[i]);
-}
-
-template<typename T> void erase(vector<T>& v, const T& e)
-{
-        typename vector<T>::iterator it = std::find(v.begin(), v.end(), e);
-        if (it != v.end())
-                v.erase(it);
-}
-
-template<typename T> void deleteVectorElements(vector<T*>& v)
-{
-        for (typename vector<T*>::iterator it = v.begin(); it != v.end(); it++)
-                delete *it;
-        v.clear();
-}
-
-template<typename T> int findIndex(vector<T>& v, const T& e)
-{
-        typename vector<T>::iterator it = find(v.begin(), v.end(), e);
-        if (it != v.end())
-                return &*it - &v.front();
-        return -1;
-}
-
 
 char* strmove(char *a, char *b); //strcpy that works well for overlapping strings ("Source and destination overlap")
@@ -48 +19 @@
 string stripFileDir(const string& filename); // strip path component from filename
 
-
-bool readCompleteFile(const char* filename, vector<char>& data, bool warn_on_missing_file = true);
-bool readCompleteFile(const char* filename, string& out, bool warn_on_missing_file = true);
-bool writeCompleteFile(const char* filename, const std::string& text, bool warn_on_fail = true);
-bool writeCompleteFile(const char* filename, vector<char>& data, bool warn_on_fail = true);
-
-template<class T> class DeletingVector  // deletes the elements (pointers) in destructor
-{
-public:
-        std::vector<T*> vector;
-        ~DeletingVector()
-        {
-                for (int i = vector.size() - 1; i >= 0; i--)
-                        delete vector[i];
-        }
-        T* operator[](int i) { return vector[i]; }
-        int size() { return vector.size(); }
-        void push_back(T* x) { vector.push_back(x); }
-};
-
 #endif