wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 727156 - fix compiler warnings in toolkit/mozapps/update/; r=bbondy

Browse Source
This commit is contained in:
Nathan Froyd 2012-02-14 10:48:23 -08:00
parent 9d362123c0
commit 6ae9126bcf
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/mozapps/update/common/updatelogging.cpp
View File

@ -51,7 +51,7 @@ UpdateLog::UpdateLog() : logFP(NULL)
{
}
void UpdateLog::Init(NS_tchar* sourcePath, NS_tchar* fileName)
void UpdateLog::Init(NS_tchar* sourcePath, const NS_tchar* fileName)
{
if (logFP)
return;

2
toolkit/mozapps/update/common/updatelogging.h
View File

@ -50,7 +50,7 @@ public:
return primaryLog;
}
void Init(NS_tchar* sourcePath, NS_tchar* fileName);
void Init(NS_tchar* sourcePath, const NS_tchar* fileName);
void Finish();
void Flush();
void Printf(const char *fmt, ... );

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

@ -1452,6 +1452,7 @@ WriteStatusApplying()
return true;
}
#ifdef MOZ_MAINTENANCE_SERVICE
/*
* Read the update.status file and sets isPendingService to true if
* the status is set to pending-service.
@ -1486,7 +1487,9 @@ IsUpdateStatusPending(bool &isPendingService)
sizeof(kPendingService) - 1) == 0;
return isPending;
}
#endif
#ifdef XP_WIN
/*
* Read the update.status file and sets isSuccess to true if
* the status is set to succeeded.
@ -1516,7 +1519,6 @@ IsUpdateStatusSucceeded(bool &isSucceeded)
return true;
}
#ifdef XP_WIN
static void
WaitForServiceFinishThread(void *param)
{
@ -2555,7 +2557,6 @@ int DoUpdate()
ActionList list;
NS_tchar *line;
bool isFirstAction = true;
bool isComplete = false;
while((line = mstrtok(kNL, &rb)) != 0) {
// skip comments
@ -2572,7 +2573,6 @@ int DoUpdate()
const NS_tchar *type = mstrtok(kQuote, &line);
LOG(("UPDATE TYPE " LOG_S "\n", type));
if (NS_tstrcmp(type, NS_T("complete")) == 0) {
isComplete = true;
rv = AddPreCompleteActions(&list);
if (rv)
return rv;