From 816b3752e71a5aa5fa82b4009bbaca41e9a61144 Mon Sep 17 00:00:00 2001 From: Andrew Quartey Date: Wed, 3 Oct 2012 10:13:18 -0400 Subject: [PATCH] Bug 792581 - part 1: Replace LL_IS_ZERO macro with standard relation. r=ehsan --- content/base/src/nsDocument.cpp | 2 +- content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp | 2 +- docshell/shistory/src/nsSHistory.cpp | 2 +- dom/plugins/base/nsPluginHost.cpp | 2 +- gfx/thebes/gfxUserFontSet.cpp | 2 +- security/manager/ssl/src/nsCRLManager.cpp | 2 +- xpcom/glue/nsTextFormatter.cpp | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index a836dd973ab5..18f1dcf47ac1 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -6881,7 +6881,7 @@ nsDocument::RetrieveRelevantHeaders(nsIChannel *aChannel) } } - if (LL_IS_ZERO(modDate)) { + if (modDate == 0) { // We got nothing from our attempt to ask nsIFileChannel and // nsIHttpChannel for the last modified time. Return the current // time. diff --git a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp index f977d6c48f67..8eb50a0344d4 100644 --- a/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp +++ b/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp @@ -694,7 +694,7 @@ nsXULTemplateQueryProcessorRDF::CompareResults(nsIXULTemplateResult* aLeft, int64_t delta; LL_SUB(delta, ldate, rdate); - if (LL_IS_ZERO(delta)) + if (delta == 0) *aResult = 0; else if (LL_GE_ZERO(delta)) *aResult = 1; diff --git a/docshell/shistory/src/nsSHistory.cpp b/docshell/shistory/src/nsSHistory.cpp index 0a45af325456..6231506b9c17 100644 --- a/docshell/shistory/src/nsSHistory.cpp +++ b/docshell/shistory/src/nsSHistory.cpp @@ -284,7 +284,7 @@ nsSHistory::CalcMaxTotalViewers() // 4096 Mb 8 uint64_t bytes = PR_GetPhysicalMemorySize(); - if (LL_IS_ZERO(bytes)) + if (bytes == 0) return 0; // Conversion from unsigned int64 to double doesn't work on all platforms. diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index 5ab7dc864791..e88337c43503 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -3692,7 +3692,7 @@ nsPluginHost::CreateTempFileToPost(const char *aPostDataURL, nsIFile **aTmpFile) rv = inFile->GetNativePath(filename); if (NS_FAILED(rv)) return rv; - if (!LL_IS_ZERO(fileSize)) { + if (fileSize != 0) { nsCOMPtr inStream; rv = NS_NewLocalFileInputStream(getter_AddRefs(inStream), inFile); if (NS_FAILED(rv)) return rv; diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp index 0059d7c86b53..802a25581417 100644 --- a/gfx/thebes/gfxUserFontSet.cpp +++ b/gfx/thebes/gfxUserFontSet.cpp @@ -623,7 +623,7 @@ gfxUserFontSet::IncrementGeneration() { // add one, increment again if zero LL_ADD(sFontSetGeneration, sFontSetGeneration, 1); - if (LL_IS_ZERO(sFontSetGeneration)) + if (sFontSetGeneration == 0) LL_ADD(sFontSetGeneration, sFontSetGeneration, 1); mGeneration = sFontSetGeneration; } diff --git a/security/manager/ssl/src/nsCRLManager.cpp b/security/manager/ssl/src/nsCRLManager.cpp index 7c09dd814cbd..26a7320d6637 100644 --- a/security/manager/ssl/src/nsCRLManager.cpp +++ b/security/manager/ssl/src/nsCRLManager.cpp @@ -418,7 +418,7 @@ nsCRLManager::ComputeNextAutoUpdateTime(nsICRLInfo *info, LL_SUB(diff, now, lastUpdate); //diff is the no of micro sec between now and last update LL_DIV(cycleCnt, diff, microsecInDayCnt); //temp is the number of full cycles from lst update LL_MOD(temp, diff, microsecInDayCnt); - if(!(LL_IS_ZERO(temp))) { + if(temp != 0) { LL_ADD(cycleCnt,cycleCnt,1); //no of complete cycles till next autoupdate instant } LL_MUL(temp,cycleCnt,microsecInDayCnt); //micro secs from last update diff --git a/xpcom/glue/nsTextFormatter.cpp b/xpcom/glue/nsTextFormatter.cpp index ac33ba562074..35cd2d470d6d 100644 --- a/xpcom/glue/nsTextFormatter.cpp +++ b/xpcom/glue/nsTextFormatter.cpp @@ -278,7 +278,7 @@ static int cvt_ll(SprintfState *ss, int64_t num, int width, int prec, int64_t rad; /* according to the man page this needs to happen */ - if ((prec == 0) && (LL_IS_ZERO(num))) { + if (prec == 0 && num == 0) { return 0; } @@ -290,7 +290,7 @@ static int cvt_ll(SprintfState *ss, int64_t num, int width, int prec, LL_I2L(rad, radix); cvt = &cvtbuf[0] + ELEMENTS_OF(cvtbuf); digits = 0; - while (!LL_IS_ZERO(num)) { + while (num != 0) { int32_t digit; int64_t quot, rem; LL_UDIVMOD(", &rem, num, rad);