Back out changeset ea8093d8be6a (bug 1197313) for Linux xpcshell bustage in test_offlinecache_custom-directory.js

CLOSED TREE

netwerk/cache/nsDiskCacheDeviceSQL.cpp

@@ -7,9 +7,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
 
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/Snprintf.h"
-
 #include "nsCache.h"
 #include "nsDiskCache.h"
 #include "nsDiskCacheDeviceSQL.h"
@@ -414,7 +411,7 @@ nsOfflineCacheBinding::Create(nsIFile *cacheDir,
 
     for (generation = 0; ; ++generation)
     {
-      snprintf_literal(leaf, "%014" PRIx64 "-%X", hash, generation);
+      PR_snprintf(leaf, sizeof(leaf), "%014llX-%X", hash, generation);
 
       rv = file->SetNativeLeafName(nsDependentCString(leaf));
       if (NS_FAILED(rv))
@@ -428,7 +425,7 @@ nsOfflineCacheBinding::Create(nsIFile *cacheDir,
   }
   else
   {
-    snprintf_literal(leaf, "%014" PRIx64 "-%X", hash, generation);
+    PR_snprintf(leaf, sizeof(leaf), "%014llX-%X", hash, generation);
     rv = file->AppendNative(nsDependentCString(leaf));
     if (NS_FAILED(rv))
       return nullptr;

netwerk/protocol/http/Http2Session.cpp

@@ -32,9 +32,9 @@
 #include "nsISupportsPriority.h"
 #include "nsStandardURL.h"
 #include "nsURLHelper.h"
+#include "prprf.h"
 #include "prnetdb.h"
 #include "sslt.h"
-#include "mozilla/Snprintf.h"
 
 #ifdef DEBUG
 // defined by the socket transport service while active
@@ -225,10 +225,11 @@ Http2Session::LogIO(Http2Session *self, Http2Stream *stream,
         LOG5(("%s", linebuf));
       }
       line = linebuf;
-      snprintf(line, 128, "%08X: ", index);
+      PR_snprintf(line, 128, "%08X: ", index);
       line += 10;
     }
-    snprintf(line, 128 - (line - linebuf), "%02X ", (reinterpret_cast<const uint8_t *>(data))[index]);
+    PR_snprintf(line, 128 - (line - linebuf), "%02X ",
+                (reinterpret_cast<const uint8_t *>(data))[index]);
     line += 3;
   }
   if (index) {

netwerk/protocol/http/SpdySession31.cpp

@@ -15,12 +15,12 @@
 
 #include "mozilla/Telemetry.h"
 #include "mozilla/Preferences.h"
-#include "mozilla/Snprintf.h"
 #include "nsHttp.h"
 #include "nsHttpHandler.h"
 #include "nsHttpConnection.h"
 #include "nsISchedulingContext.h"
 #include "nsISupportsPriority.h"
+#include "prprf.h"
 #include "prnetdb.h"
 #include "SpdyPush31.h"
 #include "SpdySession31.h"
@@ -177,10 +177,11 @@ SpdySession31::LogIO(SpdySession31 *self, SpdyStream31 *stream, const char *labe
         LOG5(("%s", linebuf));
       }
       line = linebuf;
-      snprintf(line, 128, "%08X: ", index);
+      PR_snprintf(line, 128, "%08X: ", index);
       line += 10;
     }
-    snprintf(line, 128 - (line - linebuf), "%02X ", ((unsigned char *)data)[index]);
+    PR_snprintf(line, 128 - (line - linebuf), "%02X ",
+                ((unsigned char *)data)[index]);
     line += 3;
   }
   if (index) {

netwerk/protocol/http/nsHttpHandler.cpp

@@ -29,7 +29,6 @@
 #include "nsCOMPtr.h"
 #include "nsNetCID.h"
 #include "prprf.h"
-#include "mozilla/Snprintf.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsSocketTransportService2.h"
 #include "nsAlgorithm.h"
@@ -1763,9 +1762,9 @@ PrepareAcceptLanguages(const char *i_AcceptLanguages, nsACString &o_AcceptLangua
                     qval_str = "%s%s;q=0.%02u";
                 }
 
-                wrote = snprintf(p2, available, qval_str, comma, token, u);
+                wrote = PR_snprintf(p2, available, qval_str, comma, token, u);
             } else {
-                wrote = snprintf(p2, available, "%s%s", comma, token);
+                wrote = PR_snprintf(p2, available, "%s%s", comma, token);
             }
 
             q -= dec;

netwerk/streamconv/converters/ParseFTPList.cpp

@@ -10,8 +10,6 @@
 #include "plstr.h"
 #include "nsDebug.h"
 #include "prprf.h"
-#include "mozilla/IntegerPrintfMacros.h"
-#include "mozilla/Snprintf.h"
 
 /* ==================================================================== */
 
@@ -487,7 +485,8 @@ int ParseFTPList(const char *line, struct list_state *state,
                * than not showing the size at all.
               */
               uint64_t fsz = uint64_t(strtoul(tokens[1], (char **)0, 10) * 512);
-              snprintf_literal(result->fe_size, "%" PRId64, fsz);
+              PR_snprintf(result->fe_size, sizeof(result->fe_size), 
+                          "%lld", fsz);
             } 
 
           } /* if (result->fe_type != 'd') */

netwerk/test/urltest.cpp

@@ -23,7 +23,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsXPCOM.h"
 #include "prprf.h"
-#include "mozilla/Snprintf.h"
 
 // Define CIDs...
 static NS_DEFINE_CID(kIOServiceCID,              NS_IOSERVICE_CID);
@@ -93,7 +92,7 @@ nsresult writeoutto(const char* i_pURL, char** o_Result, int32_t urlFactory = UR
         output += ',';
         rv = tURL->GetPort(&port);
         char portbuffer[40];
-        snprintf_literal(portbuffer, "%d", port);
+        PR_snprintf(portbuffer, sizeof(portbuffer), "%d", port);
         output.Append(portbuffer);
         output += ',';
         rv = tURL->GetDirectory(temp);