Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 03:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1063413 - Do not pass a non-POD object to a variadic function in NativeFileWatcherWin.cpp. r=Yoric

Browse Source
This commit is contained in:
Jacek Caban 2014-09-05 13:27:22 +02:00
parent 6a39b7b550
commit cd2f04c0b0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
toolkit/components/filewatcher/NativeFileWatcherWin.cpp
View File

@ -262,7 +262,7 @@ WatchedPathsInfoHashtableTraverser(nsVoidPtrHashKey::KeyType key,
void* userArg)
{
FILEWATCHERLOG("NativeFileWatcherIOTask::DeactivateRunnableMethod - "
"%S is still being watched.", watchedResource->mPath);
"%S is still being watched.", watchedResource->mPath.get());
return PL_DHASH_NEXT;
}
@ -505,7 +505,7 @@ NativeFileWatcherIOTask::RunInternal()
// Log that we also failed to dispatch the error callbacks.
FILEWATCHERLOG(
"NativeFileWatcherIOTask::Run - Failed to watch %s and"
" to dispatch the related error callbacks", changedRes->mPath);
" to dispatch the related error callbacks", changedRes->mPath.get());
return rv;
}
}
@ -616,7 +616,7 @@ NativeFileWatcherIOTask::AddPathRunnableMethod(
FILEWATCHERLOG(
"NativeFileWatcherIOTask::AddPathRunnableMethod - CreateFileW failed (error %x) for %S.",
dwError, wrappedParameters->mPath);
dwError, wrappedParameters->mPath.get());
rv = ReportError(wrappedParameters->mErrorCallbackHandle, rv, dwError);
if (NS_FAILED(rv)) {
@ -642,7 +642,7 @@ NativeFileWatcherIOTask::AddPathRunnableMethod(
FILEWATCHERLOG("NativeFileWatcherIOTask::AddPathRunnableMethod"
" - CreateIoCompletionPort failed (error %x) for %S.",
dwError, wrappedParameters->mPath);
dwError, wrappedParameters->mPath.get());
// This could fail because passed parameters could be invalid |HANDLE|s
// i.e. mIOCompletionPort was unexpectedly closed or failed.
@ -705,7 +705,7 @@ NativeFileWatcherIOTask::AddPathRunnableMethod(
// We failed to dispatch the error callbacks as well.
FILEWATCHERLOG(
"NativeFileWatcherIOTask::AddPathRunnableMethod - Failed to watch %s and"
" to dispatch the related error callbacks", resourceDesc->mPath);
" to dispatch the related error callbacks", resourceDesc->mPath.get());
return rv;
}
@ -777,7 +777,7 @@ NativeFileWatcherIOTask::RemovePathRunnableMethod(
FILEWATCHERLOG(
"NativeFileWatcherIOTask::RemovePathRunnableMethod - Unable to remove the change "
"callback from the change callback hash map for %S.",
wrappedParameters->mPath);
wrappedParameters->mPath.get());
MOZ_CRASH();
}
@ -792,7 +792,7 @@ NativeFileWatcherIOTask::RemovePathRunnableMethod(
FILEWATCHERLOG(
"NativeFileWatcherIOTask::RemovePathRunnableMethod - Unable to remove the error "
"callback from the error callback hash map for %S.",
wrappedParameters->mPath);
wrappedParameters->mPath.get());
MOZ_CRASH();
}
@ -1080,7 +1080,7 @@ NativeFileWatcherIOTask::AddDirectoryToWatchList(
FILEWATCHERLOG(
"NativeFileWatcherIOTask::AddDirectoryToWatchList "
" - ReadDirectoryChangesW failed (error %x) for %S.",
dwError, aDirectoryDescriptor->mPath);
dwError, aDirectoryDescriptor->mPath.get());
nsresult rv =
DispatchErrorCallbacks(aDirectoryDescriptor, NS_ERROR_FAILURE, dwError);
@ -1207,15 +1207,15 @@ NativeFileWatcherIOTask::MakeResourcePath(
if (NS_FAILED(rv)) {
FILEWATCHERLOG(
"NativeFileWatcherIOTask::MakeResourcePath - Failed to init nsILocalFile with %S (%x).",
changedDescriptor->mPath, rv);
changedDescriptor->mPath.get(), rv);
return rv;
}
rv = localPath->AppendRelativePath(resourceName);
if (NS_FAILED(rv)) {
FILEWATCHERLOG(
"NativeFileWatcherIOTask::MakeResourcePath - Failed to append %S to %S (%x).",
resourceName, changedDescriptor->mPath, rv);
"NativeFileWatcherIOTask::MakeResourcePath - Failed to append to %S (%x).",
changedDescriptor->mPath.get(), rv);
return rv;
}