diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-05 23:06:26 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-10-05 23:06:26 +0200 |
| commit | ec6e04244ea7658817b4c21e39939f16490bf89c (patch) | |
| tree | 6e6f781bc170acb29773ac56f7aad187f038d41e | |
| parent | d073d7db69eddd2d9c22e8ded7c6b871bca1716a (diff) | |
| parent | 324fc8af296953857ebfc76deaadd4d224e081e3 (diff) | |
merge with current debian apt/sid
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | ftparchive/cachedb.cc | 14 | ||||
| -rw-r--r-- | po/fr.po | 2 |
3 files changed, 24 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 7cd353718..11d9814c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.8.15.9) UNRELEASED; urgency=low [ David Kalnischkies ] + * Symbol file update * doc/apt-get.8.xml: - change wording of autoremove description as suggested by Robert Simmons, thanks! (Closes: #641490) @@ -22,7 +23,19 @@ apt (0.8.15.9) UNRELEASED; urgency=low * apt-pkg/aptconfiguration.cc: - do not builtin languages only if none is forced (Closes: #643787) - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 03 Oct 2011 23:35:40 +0200 + [ Christian Perrier ] + * Fix spelling error (sensée) in French translation. Thanks + to Corentin Le Gall for spotting it. + + [ Colin Watson ] + * ftparchive/cachedb.cc: + - fix buffersize in bytes2hex + + [ Michael Vogt ] + * ftparchive/cachedb.cc: + - make buffer fully dynamic (thanks to Colin Watson) + + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 05 Oct 2011 23:03:16 +0200 apt (0.8.15.8) unstable; urgency=low diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index b04244347..6573fa264 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -294,11 +294,15 @@ bool CacheDB::LoadContents(bool const &GenOnly) /*}}}*/ static string bytes2hex(uint8_t *bytes, size_t length) { - char space[65]; - if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2; - for (size_t i = 0; i < length; i++) - snprintf(&space[i*2], 3, "%02x", bytes[i]); - return string(space); + char buf[3]; + string space; + + space.reserve(length*2 + 1); + for (size_t i = 0; i < length; i++) { + snprintf(buf, sizeof(buf), "%02x", bytes[i]); + space.append(buf); + } + return space; } static inline unsigned char xdig2num(char const &dig) { @@ -1080,7 +1080,7 @@ msgstr "La commande de mise à jour ne prend pas d'argument" #: cmdline/apt-get.cc:1653 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -"Aucune suppression n'est sensée se produire : impossible de lancer " +"Aucune suppression n'est censée se produire : impossible de lancer " "« Autoremover »" #: cmdline/apt-get.cc:1748 |