github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Functions4U: Fixed warnings

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10946 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2017-03-17 20:46:18 +00:00
parent 80d7ed9b8c
commit 58f93b61bd
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bazaar/Functions4U/Functions4U.cpp
View file

@ -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;

2
bazaar/Functions4U/Functions4U.h
View file

@ -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);

6
bazaar/Functions4U/StaticPlugin.h
View file

@ -13,8 +13,8 @@ private:
String type;
void *instance;
template <class T> static void *New() {return new T;};
template <class T> static void Delete(void *p) {delete static_cast<T *>(p);};
template <class T> static void *New() {return new T;}
template <class T> static void Delete(void *p) {delete static_cast<T *>(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