Browse Source

prevent C++ locale number formatting in text APIs (try 2)

Followup of b58e2c7c56b1416a343e81f9f80cb1f02c128e25.
Still a regression of sorts of 8b79c94af7f7cf2e5e5342294bc6e5a908cacabf.

Closes: 832044
David Kalnischkies 7 years ago
parent
commit
7303e11ff2
3 changed files with 4 additions and 4 deletions
  1. 1 1
      apt-pkg/acquire-item.cc
  2. 2 2
      apt-private/acqprogress.cc
  3. 1 1
      methods/http.cc

+ 1 - 1
apt-pkg/acquire-item.cc

@@ -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();

+ 2 - 2
apt-private/acqprogress.cc

@@ -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)

+ 1 - 1
methods/http.cc

@@ -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";