diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-07-30 09:57:50 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-11-14 15:10:03 +0100 |
| commit | 5afa62c02b03161aff2a983647a5894b309ddd6f (patch) | |
| tree | eb5c5fb2d25d9e1ea2214776c3b45945322d146b | |
| parent | c6dcd6d5c03abdcaa075bb4734b78a6bb9de9b94 (diff) | |
prevent C++ locale number formatting in text APIs (try 2)
Followup of b58e2c7c56b1416a343e81f9f80cb1f02c128e25.
Still a regression of sorts of 8b79c94af7f7cf2e5e5342294bc6e5a908cacabf.
Closes: 832044
(cherry picked from commit 7303e11ff28f920a6277c159aa46f80c007350bb)
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | apt-private/acqprogress.cc | 4 | ||||
| -rw-r--r-- | methods/http.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index fd02b6bba..d8921be07 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -2596,7 +2596,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(); diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index a33d51c71..4e6042c3d 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -194,7 +194,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 @@ -204,7 +204,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) diff --git a/methods/http.cc b/methods/http.cc index 46d90e256..96b24a146 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -739,7 +739,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) << "\r\n"; else if (Itm->LastModified != 0) Req << "If-Modified-Since: " << TimeRFC1123(Itm->LastModified).c_str() << "\r\n"; |