corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1360321 - 5. Fix warnings in widget; r=snorp

Browse Source 
* Fix warnings using putenv with string literals.

* Fix a pritnf format warning.

MozReview-Commit-ID: B53sUjGTg7z
This commit is contained in:
Jim Chen
2017-05-17 13:06:23 -04:00
parent f3833a6a8b
commit 4c86aa0cfd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
widget/android/AndroidBridge.cpp
View File

@@ -129,7 +129,7 @@ AndroidBridge::ConstructBridge()
* to call dlclose() while we're already inside dlclose(). * to call dlclose() while we're already inside dlclose().
* Conveniently, NSS has an env var that can prevent it from unloading. * Conveniently, NSS has an env var that can prevent it from unloading.
*/ */
putenv("NSS_DISABLE_UNLOAD=1"); putenv(const_cast<char*>("NSS_DISABLE_UNLOAD=1"));
MOZ_ASSERT(!sBridge); MOZ_ASSERT(!sBridge);
sBridge = new AndroidBridge(); sBridge = new AndroidBridge();

4
widget/android/nsWindow.cpp
View File

@@ -1432,8 +1432,8 @@ nsWindow::LogWindow(nsWindow *win, int index, int indent)
#if defined(DEBUG) || defined(FORCE_ALOG) #if defined(DEBUG) || defined(FORCE_ALOG)
char spaces[] = " "; char spaces[] = " ";
spaces[indent < 20 ? indent : 20] = 0; spaces[indent < 20 ? indent : 20] = 0;
ALOG("%s [% 2d] 0x%08x [parent 0x%08x] [% 3d,% 3dx% 3d,% 3d] vis %d type %d", ALOG("%s [% 2d] 0x%p [parent 0x%p] [% 3d,% 3dx% 3d,% 3d] vis %d type %d",
spaces, index, (intptr_t)win, (intptr_t)win->mParent, spaces, index, win, win->mParent,
win->mBounds.x, win->mBounds.y, win->mBounds.x, win->mBounds.y,
win->mBounds.width, win->mBounds.height, win->mBounds.width, win->mBounds.height,
win->mIsVisible, win->mWindowType); win->mIsVisible, win->mWindowType);