Bug 895168 - Part 1: Stop using LL_I2L in the tree; r=jcranmer
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 18 Jul 2013 16:47:55 -0400
changeset 139169 b580862e93f6e743b1a4ca0866fbcf4ec684e635
parent 139168 a5a5d2c176f77c6d9d4050d23e4a59300365af7a
child 139170 f900f2d0d3f1aee0d3a08460fa7facc42dd9f7b0
push id1890
push userryanvm@gmail.com
push dateFri, 19 Jul 2013 17:44:21 +0000
treeherderfx-team@20848adc9980 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs895168
milestone25.0a1
Bug 895168 - Part 1: Stop using LL_I2L in the tree; r=jcranmer
content/base/src/nsContentSink.cpp
rdf/base/src/rdfutil.cpp
rdf/datasource/src/nsFileSystemDataSource.cpp
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -1252,20 +1252,19 @@ nsContentSink::IsTimeToNotify()
   }
 
   if (WaitForPendingSheets()) {
     mDeferredFlushTags = true;
     return false;
   }
 
   PRTime now = PR_Now();
-  int64_t interval, diff;
 
-  LL_I2L(interval, GetNotificationInterval());
-  diff = now - mLastNotificationTime;
+  int64_t interval = GetNotificationInterval();
+  int64_t diff = now - mLastNotificationTime;
 
   if (diff > interval) {
     mBackoffCount--;
     return true;
   }
 
   return false;
 }
--- a/rdf/base/src/rdfutil.cpp
+++ b/rdf/base/src/rdfutil.cpp
@@ -99,15 +99,13 @@ rdf_ParseDate(const nsACString &aTime)
     if (digit != begin && *digit == '+') {
         // There's a usec field specified (or, at least, something
         // that looks close enough. Parse it, and add it to the time.
         while (++digit != end) {
             usec *= 10;
             usec += *digit - '0';
         }
 
-        PRTime temp;
-        LL_I2L(temp, usec);
-        t += temp;
+        t += usec;
     }
 
     return t;
 }
--- a/rdf/datasource/src/nsFileSystemDataSource.cpp
+++ b/rdf/datasource/src/nsFileSystemDataSource.cpp
@@ -1104,21 +1104,17 @@ FileSystemDataSource::GetLastMod(nsIRDFR
     // ensure that we DO NOT resolve aliases
     aFile->SetFollowLinks(false);
 
     PRTime lastModDate;
     if (NS_FAILED(rv = aFile->GetLastModifiedTime(&lastModDate)))
         return(rv);
 
     // convert from milliseconds to seconds
-    PRTime      temp64, thousand;
-    LL_I2L(thousand, PR_MSEC_PER_SEC);
-    temp64 = lastModDate * thousand;
-
-    mRDFService->GetDateLiteral(temp64, aResult);
+    mRDFService->GetDateLiteral(lastModDate * PR_MSEC_PER_SEC, aResult);
 
     return(NS_OK);
 }
 
 
 
 nsresult
 FileSystemDataSource::GetFileSize(nsIRDFResource *source, nsIRDFInt **aResult)