Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 784739 - Switch from NULL to nullptr in b2g/; r=ehsan

Browse Source
This commit is contained in:
matekm 2013-04-02 20:20:15 -04:00
parent b79eaf364c
commit d0cc931170
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/app/nsBrowserApp.cpp
View File

@ -51,7 +51,7 @@ static void Output(const char *fmt, ... )
#if defined(XP_WIN) && !MOZ_WINCONSOLE
PRUnichar msg[2048];
_vsnwprintf(msg, sizeof(msg)/sizeof(msg[0]), NS_ConvertUTF8toUTF16(fmt).get(), ap);
MessageBoxW(NULL, msg, L"XULRunner", MB_OK | MB_ICONERROR);
MessageBoxW(nullptr, msg, L"XULRunner", MB_OK | MB_ICONERROR);
#else
vfprintf(stderr, fmt, ap);
#endif

18
b2g/gaia/run-b2g.cpp
View File

@ -19,7 +19,7 @@
#endif
void error(wchar_t* msg){
MessageBoxW(NULL, msg, L"Error starting program", MB_OK | MB_ICONERROR);
MessageBoxW(nullptr, msg, L"Error starting program", MB_OK | MB_ICONERROR);
}
/* This function takes a string which represents a windows path, orig.
@ -31,18 +31,18 @@ void error(wchar_t* msg){
wchar_t* make_path_with_leaf_file_name(wchar_t* orig, wchar_t* file){
wchar_t* buffer = (wchar_t*) malloc(NUM_MAX_PATH_BYTES);
if (!buffer) {
return NULL;
return nullptr;
}
if (FAILED(StringCchCopyW(buffer, NUM_MAX_PATH_BYTES, orig))) {
error(L"Error copying string");
free(buffer);
buffer = NULL;
buffer = nullptr;
}
PathRemoveFileSpecW(buffer);
if (!PathAppendW(buffer, file)) {
error(L"Unable to append file to directory");
free(buffer);
buffer = NULL;
buffer = nullptr;
}
return buffer;
}
@ -58,12 +58,12 @@ BOOL execute(wchar_t* binary_path, wchar_t* args, int cp_flags) {
if (!CreateProcessW(
binary_path,
args,
NULL,
NULL,
nullptr,
nullptr,
FALSE,
cp_flags,
NULL,
NULL,
nullptr,
nullptr,
&si,
&pi)){
error(L"Could not execute program");
@ -97,6 +97,6 @@ int wmain(int argc, wchar_t *argv[], wchar_t *envp[]){
free(profile_path);
free(b2g_path);
free(args);
profile_path = b2g_path = args = NULL;
profile_path = b2g_path = args = nullptr;
}