]> git.saurik.com Git - apt.git/commitdiff
prevent C++ locale number formatting in text APIs (try 2)
authorDavid Kalnischkies <david@kalnischkies.de>
Sat, 30 Jul 2016 07:57:50 +0000 (09:57 +0200)
committerDavid Kalnischkies <david@kalnischkies.de>
Sat, 30 Jul 2016 08:14:47 +0000 (10:14 +0200)
Followup of b58e2c7c56b1416a343e81f9f80cb1f02c128e25.
Still a regression of sorts of 8b79c94af7f7cf2e5e5342294bc6e5a908cacabf.

Closes: 832044
apt-pkg/acquire-item.cc
apt-private/acqprogress.cc
methods/http.cc

index 3f1a4e8630c8e4f1dd4b7820e97b36cfbcad6f95..ad8cb7f245795298c4c5a54d361b86012881e534 100644 (file)
@@ -2777,7 +2777,7 @@ std::string pkgAcqIndexMergeDiffs::Custom600Headers() const               /*{{{*/
    {
       HashStringList const ExpectedHashes = (*I)->patch.patch_hashes;
       for (HashStringList::const_iterator hs = ExpectedHashes.begin(); hs != ExpectedHashes.end(); ++hs)
-        patchhashes <<  "\nPatch-" << seen_patches << "-" << hs->HashType() << "-Hash: " << hs->HashValue();
+        patchhashes <<  "\nPatch-" << std::to_string(seen_patches) << "-" << hs->HashType() << "-Hash: " << hs->HashValue();
       ++seen_patches;
    }
    patchhashes << pkgAcqBaseIndex::Custom600Headers();
index c182fa02dfd4ebd9379d8595656976e61c4773e1..e4bfbd4e5b44372d30573cc85c24fc73ff4ca5fd 100644 (file)
@@ -210,7 +210,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
         // Add in the short description
         S << " [";
         if (I->CurrentItem->Owner->ID != 0)
-           S << I->CurrentItem->Owner->ID << " ";
+           S << std::to_string(I->CurrentItem->Owner->ID) << " ";
         S << I->CurrentItem->ShortDesc;
 
         // Show the short mode string
@@ -220,7 +220,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
         enum {Long = 0,Medium,Short} Mode = Medium;
         // Add the current progress
         if (Mode == Long)
-           S << " " << I->CurrentSize;
+           S << " " << std::to_string(I->CurrentSize);
         else
         {
            if (Mode == Medium || I->TotalSize == 0)
index 64cfe0f85def9e3b5714811c885f59c82a208f54..9fcc80103a425114fcdb5c0a12b5ca16b1df42f4 100644 (file)
@@ -738,7 +738,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
    // Check for a partial file and send if-queries accordingly
    struct stat SBuf;
    if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0)
-      Req << "Range: bytes=" << SBuf.st_size << "-\r\n"
+      Req << "Range: bytes=" << std::to_string(SBuf.st_size) << "-\r\n"
         << "If-Range: " << TimeRFC1123(SBuf.st_mtime, false) << "\r\n";
    else if (Itm->LastModified != 0)
       Req << "If-Modified-Since: " << TimeRFC1123(Itm->LastModified, false).c_str() << "\r\n";