diff --git a/bazaar/Functions4U/Functions4U.cpp b/bazaar/Functions4U/Functions4U.cpp index cb4ab7cf3..849399502 100644 --- a/bazaar/Functions4U/Functions4U.cpp +++ b/bazaar/Functions4U/Functions4U.cpp @@ -75,8 +75,8 @@ bool LaunchFileCreateProcess(const char *file, const char *params, const char *d wexec = Format("\"%s\" \"%s\"", GetExtExecutable(GetFileExt(file)), file).ToWString(); WStringBuffer wsbexec(wexec); - if(!CreateProcessW(NULL, wsbexec, NULL, NULL, FALSE, 0, NULL, ToSystemCharsetW(directory), &startInfo, &procInfo)) - return false; + if (!CreateProcessW(NULL, wsbexec, NULL, NULL, FALSE, 0, NULL, ToSystemCharsetW(directory), &startInfo, &procInfo)) + return false; WaitForSingleObject(procInfo.hProcess, 0); @@ -169,7 +169,7 @@ bool FileStrAppend(const char *file, const char *str) { return true; } -bool AppendFile(const char *file, const char *str) {return FileStrAppend(file, str);}; +bool AppendFile(const char *file, const char *str) {return FileStrAppend(file, str);} String AppendFileName(const String& path1, const char *path2, const char *path3) { String result = path1; @@ -1196,7 +1196,7 @@ Value GetField(const String &str, int &pos, char separator, char decimalSign, bo Time t = ScanTime(sret); if (IsNull(t)) return sret; - else if (t.hour == t.minute == t.second == 0) + else if (t.hour == 0 && t.minute == 0 && t.second == 0) return Date(t); else return t; @@ -1510,12 +1510,12 @@ bool DeleteDeepWildcardsX(const char *path, const char *namewc, bool filefolder, if (PatternMatch(namewc, name)) { if (ff.IsFolder() && !filefolder) { if (!DeleteFolderDeepX(full, flags)) { - dword error = GetLastError(); + //dword error = GetLastError(); return false; } } else if (ff.IsFile() && filefolder) { if (!FileDeleteX(full, flags)) { - dword error = GetLastError(); + //dword error = GetLastError(); return false; } } @@ -1574,7 +1574,7 @@ bool RenameDeepWildcardsX(const char *path, const char *namewc, const char *newn if (PatternMatch(namewc, name)) { if ((ff.IsFolder() && forfolder) || (ff.IsFile() && forfile)) { if (!FileMoveX(full, AppendFileName(path, newname)), flags) { - dword error = GetLastError(); + //dword error = GetLastError(); return false; } } @@ -1882,8 +1882,6 @@ bool FileDataArray::Search(String dir, String condFile, bool recurse, String tex void FileDataArray::Search_Each(String dir, String condFile, bool recurse, String text) { FindFile ff; - if (dir == "C:\\Desarrollo\\Packages\\ffmpeg_source\\tests\\ref\\vsynth2\\rgb") - int kk = 1; if (ff.Search(AppendFileName(dir, condFile))) { do { if(ff.IsFile()) { @@ -2195,7 +2193,7 @@ bool FileDiffArray::Compare(FileDataArray &master, FileDataArray &secondary, con else { equal = false; FileDiffData &f = diffList.Add(); - bool isf = f.isFolder = master[i].isFolder; + //bool isf = f.isFolder = master[i].isFolder; f.relPath = master[i].relFilename; String name = f.fileName = master[i].fileName; f.idMaster = master[i].id; diff --git a/bazaar/Functions4U/Functions4U.h b/bazaar/Functions4U/Functions4U.h index 908a788e0..0d4e3317b 100644 --- a/bazaar/Functions4U/Functions4U.h +++ b/bazaar/Functions4U/Functions4U.h @@ -37,7 +37,7 @@ bool AppendFile(const char *filename, const char *str); String AppendFileName(const String& path1, const char *path2, const char *path3); -inline String Trim(const String& s) {return TrimBoth(s);}; +inline String Trim(const String& s) {return TrimBoth(s);} String FitFileName(String fileName, int len); diff --git a/bazaar/Functions4U/StaticPlugin.h b/bazaar/Functions4U/StaticPlugin.h index 54760f1e4..144635f3e 100644 --- a/bazaar/Functions4U/StaticPlugin.h +++ b/bazaar/Functions4U/StaticPlugin.h @@ -13,8 +13,8 @@ private: String type; void *instance; - template static void *New() {return new T;}; - template static void Delete(void *p) {delete static_cast(p);}; + template static void *New() {return new T;} + template static void Delete(void *p) {delete static_cast(p);} protected: inline void *GetData() {return data;}; @@ -47,7 +47,7 @@ public: bool _Init(const char *_name, const char *_type); //bool Init(const char *_name); #if defined(__MINGW32__) - __attribute__ ((deprecated)); + __attribute__ ((deprecated)) #else ; #endif