Bug 926583 - Fix -Wbitwise-op-parentheses warning in nsZipHeader.cpp. r=dtownsend
authorChris Peterson <cpeterson@mozilla.com>
Fri, 11 Oct 2013 17:49:51 -0700
changeset 164554 2140cb2f2fcd2ef1fa42346f6fdb1845cd470b40
parent 164553 7fc486a6f6450879f7b53e989d9d888f530f2f2e
child 164555 85901120533cf6722593c37b9386d7f6c336cab4
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdtownsend
bugs926583
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 926583 - Fix -Wbitwise-op-parentheses warning in nsZipHeader.cpp. r=dtownsend
modules/libjar/zipwriter/src/nsZipHeader.cpp
--- a/modules/libjar/zipwriter/src/nsZipHeader.cpp
+++ b/modules/libjar/zipwriter/src/nsZipHeader.cpp
@@ -128,17 +128,17 @@ NS_IMETHODIMP nsZipHeader::GetIsSyntheti
 }
 
 /* readonly attribute unsigned long permissions; */
 NS_IMETHODIMP nsZipHeader::GetPermissions(uint32_t *aPermissions)
 {
     NS_ASSERTION(mInited, "Not initalised");
 
     // Always give user read access at least, this matches nsIZipReader's behaviour
-    *aPermissions = ((mEAttr >> 16) & 0xfff | 0x100);
+    *aPermissions = ((mEAttr >> 16) & 0xfff) | 0x100;
     return NS_OK;
 }
 
 void nsZipHeader::Init(const nsACString & aPath, PRTime aDate, uint32_t aAttr,
                        uint32_t aOffset)
 {
     NS_ASSERTION(!mInited, "Already initalised");