Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1061054 - Fix more bad implicit constructors in updater; r=bbondy

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-09-04 23:23:24 -04:00
parent d289d3a9b1
commit a808a05adb
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/mozapps/update/common/readstrings.cpp
View File

@ -21,7 +21,7 @@
// stack based FILE wrapper to ensure that fclose is called.
class AutoFILE {
public:
AutoFILE(FILE *fp) : fp_(fp) {}
explicit AutoFILE(FILE *fp) : fp_(fp) {}
~AutoFILE() { if (fp_) fclose(fp_); }
operator FILE *() { return fp_; }
private:
@ -30,7 +30,7 @@ private:
class AutoCharArray {
public:
AutoCharArray(size_t len) { ptr_ = new char[len]; }
explicit AutoCharArray(size_t len) { ptr_ = new char[len]; }
~AutoCharArray() { delete[] ptr_; }
operator char *() { return ptr_; }
private:
@ -129,7 +129,7 @@ ReadStrings(const NS_tchar *path,
char results[][MAX_TEXT_LEN],
const char *section)
{
AutoFILE fp = NS_tfopen(path, OPEN_MODE);
AutoFILE fp(NS_tfopen(path, OPEN_MODE));
if (!fp)
return READ_ERROR;

26
toolkit/mozapps/update/updater/updater.cpp
View File

@ -166,7 +166,7 @@ crc32(const unsigned char *buf, unsigned int len)
class AutoFile
{
public:
AutoFile(FILE* file = nullptr)
explicit AutoFile(FILE* file = nullptr)
: mFile(file) {
}
@ -662,13 +662,13 @@ static int ensure_copy(const NS_tchar *path, const NS_tchar *dest)
}
#endif
AutoFile infile = ensure_open(path, NS_T("rb"), ss.st_mode);
AutoFile infile(ensure_open(path, NS_T("rb"), ss.st_mode));
if (!infile) {
LOG(("ensure_copy: failed to open the file for reading: " LOG_S ", err: %d",
path, errno));
return READ_ERROR;
}
AutoFile outfile = ensure_open(dest, NS_T("wb"), ss.st_mode);
AutoFile outfile(ensure_open(dest, NS_T("wb"), ss.st_mode));
if (!outfile) {
LOG(("ensure_copy: failed to open the file for writing: " LOG_S ", err: %d",
dest, errno));
@ -1398,7 +1398,7 @@ PatchFile::Execute()
{
LOG(("EXECUTE PATCH " LOG_S, mFile));
AutoFile pfile = NS_tfopen(spath, NS_T("rb"));
AutoFile pfile(NS_tfopen(spath, NS_T("rb")));
if (pfile == nullptr)
return READ_ERROR;
@ -1447,7 +1447,7 @@ PatchFile::Execute()
return rv;
#if defined(HAVE_POSIX_FALLOCATE)
AutoFile ofile = ensure_open(mFile, NS_T("wb+"), ss.st_mode);
AutoFile ofile(ensure_open(mFile, NS_T("wb+"), ss.st_mode));
posix_fallocate(fileno((FILE *)ofile), 0, header.dlen);
#elif defined(XP_WIN)
bool shouldTruncate = true;
@ -1475,9 +1475,9 @@ PatchFile::Execute()
CloseHandle(hfile);
}
AutoFile ofile = ensure_open(mFile, shouldTruncate ? NS_T("wb+") : NS_T("rb+"), ss.st_mode);
AutoFile ofile(ensure_open(mFile, shouldTruncate ? NS_T("wb+") : NS_T("rb+"), ss.st_mode));
#elif defined(XP_MACOSX)
AutoFile ofile = ensure_open(mFile, NS_T("wb+"), ss.st_mode);
AutoFile ofile(ensure_open(mFile, NS_T("wb+"), ss.st_mode));
// Modified code from FileUtils.cpp
fstore_t store = {F_ALLOCATECONTIG, F_PEOFPOSMODE, 0, header.dlen};
// Try to get a continous chunk of disk space
@ -1492,7 +1492,7 @@ PatchFile::Execute()
ftruncate(fileno((FILE *)ofile), header.dlen);
}
#else
AutoFile ofile = ensure_open(mFile, NS_T("wb+"), ss.st_mode);
AutoFile ofile(ensure_open(mFile, NS_T("wb+"), ss.st_mode));
#endif
if (ofile == nullptr) {
@ -1787,7 +1787,7 @@ WriteStatusFile(const char* aStatus)
if (ensure_parent_dir(filename))
return false;
AutoFile file = NS_tfopen(filename, NS_T("wb+"));
AutoFile file(NS_tfopen(filename, NS_T("wb+")));
if (file == nullptr)
return false;
@ -1834,7 +1834,7 @@ IsUpdateStatusPendingService()
NS_tsnprintf(filename, sizeof(filename)/sizeof(filename[0]),
NS_T("%s/update.status"), gSourcePath);
AutoFile file = NS_tfopen(filename, NS_T("rb"));
AutoFile file(NS_tfopen(filename, NS_T("rb")));
if (file == nullptr)
return false;
@ -1868,7 +1868,7 @@ IsUpdateStatusSucceeded(bool &isSucceeded)
NS_tsnprintf(filename, sizeof(filename)/sizeof(filename[0]),
NS_T("%s/update.status"), gSourcePath);
AutoFile file = NS_tfopen(filename, NS_T("rb"));
AutoFile file(NS_tfopen(filename, NS_T("rb")));
if (file == nullptr)
return false;
@ -2180,7 +2180,7 @@ GetUpdateFileName(NS_tchar *fileName, int maxChars)
NS_tchar linkFileName[MAXPATHLEN];
NS_tsnprintf(linkFileName, sizeof(linkFileName)/sizeof(linkFileName[0]),
NS_T("%s/update.link"), gSourcePath);
AutoFile linkFile = NS_tfopen(linkFileName, NS_T("rb"));
AutoFile linkFile(NS_tfopen(linkFileName, NS_T("rb")));
if (linkFile == nullptr) {
NS_tsnprintf(fileName, maxChars,
NS_T("%s/update.mar"), gSourcePath);
@ -3580,7 +3580,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
static NS_tchar*
GetManifestContents(const NS_tchar *manifest)
{
AutoFile mfile = NS_tfopen(manifest, NS_T("rb"));
AutoFile mfile(NS_tfopen(manifest, NS_T("rb")));
if (mfile == nullptr) {
LOG(("GetManifestContents: error opening manifest file: " LOG_S, manifest));
return nullptr;