diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-09 21:44:11 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-09 21:44:11 +0200 |
| commit | e29d7e3e1c7bcff54123b9a69f9b0136d4cf1de5 (patch) | |
| tree | 94a7bbf5d333247bf9d753157398f245e85d4065 | |
| parent | afb093cd9bc9d0b2abb6a87d1b98785183a6452d (diff) | |
* apt-pkg/aptconfiguration.cc:
- use NULL instead of "" for no (un)compress parameters
| -rw-r--r-- | apt-pkg/aptconfiguration.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index e1225b3e6..0fd470ed5 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -477,18 +477,18 @@ const Configuration::getCompressors(bool const Cached) { setDefaultConfigurationForCompressors(); - compressors.push_back(Compressor(".", "", "", "", "", 1)); + compressors.push_back(Compressor(".", "", "", NULL, NULL, 1)); if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true) compressors.push_back(Compressor("gzip",".gz","gzip","-9n","-d",2)); #ifdef HAVE_ZLIB else - compressors.push_back(Compressor("gzip",".gz","false", "", "", 2)); + compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2)); #endif if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true) compressors.push_back(Compressor("bzip2",".bz2","bzip2","-9","-d",3)); #ifdef HAVE_BZ2 else - compressors.push_back(Compressor("bzip2",".bz2","false", "", "", 3)); + compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 3)); #endif if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true) compressors.push_back(Compressor("xz",".xz","xz","-6","-d",4)); diff --git a/debian/changelog b/debian/changelog index 022eac529..b0c74ea31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ apt (0.9.3) UNRELEASED; urgency=low for the report. (Closes: #671721) * apt-pkg/contrib/fileutl.cc: - check that the fd which are closed are valid + * apt-pkg/aptconfiguration.cc: + - use NULL instead of "" for no (un)compress parameters -- David Kalnischkies <kalnischkies@gmail.com> Mon, 07 May 2012 21:12:23 +0200 |