Browse Source

cleanup headers and especially #includes everywhere

Beside being a bit cleaner it hopefully also resolves oddball problems
I have with high levels of parallel jobs.

Git-Dch: Ignore
Reported-By: iwyu (include-what-you-use)
debian/1.8.y
David Kalnischkies 8 years ago
parent
commit
453b82a388
  1. 4
      apt-inst/contrib/arfile.cc
  2. 6
      apt-inst/contrib/extracttar.cc
  3. 12
      apt-inst/deb/debfile.cc
  4. 6
      apt-inst/deb/debfile.h
  5. 1
      apt-inst/dirstream.cc
  6. 9
      apt-inst/extract.cc
  7. 5
      apt-inst/extract.h
  8. 2
      apt-inst/filelist.cc
  9. 15
      apt-pkg/acquire-item.cc
  10. 4
      apt-pkg/acquire-item.h
  11. 12
      apt-pkg/acquire-method.cc
  12. 1
      apt-pkg/acquire-method.h
  13. 7
      apt-pkg/acquire-worker.cc
  14. 3
      apt-pkg/acquire-worker.h
  15. 6
      apt-pkg/acquire.cc
  16. 7
      apt-pkg/acquire.h
  17. 13
      apt-pkg/algorithms.cc
  18. 5
      apt-pkg/algorithms.h
  19. 9
      apt-pkg/aptconfiguration.cc
  20. 9
      apt-pkg/cachefile.cc
  21. 9
      apt-pkg/cachefile.h
  22. 4
      apt-pkg/cachefilter.cc
  23. 1
      apt-pkg/cachefilter.h
  24. 4
      apt-pkg/cacheiterators.h
  25. 16
      apt-pkg/cacheset.cc
  26. 7
      apt-pkg/cacheset.h
  27. 34
      apt-pkg/cdrom.cc
  28. 2
      apt-pkg/cdrom.h
  29. 4
      apt-pkg/clean.cc
  30. 7
      apt-pkg/clean.h
  31. 5
      apt-pkg/contrib/cdromutl.cc
  32. 5
      apt-pkg/contrib/cmndline.cc
  33. 13
      apt-pkg/contrib/configuration.cc
  34. 4
      apt-pkg/contrib/error.cc
  35. 27
      apt-pkg/contrib/error.h
  36. 12
      apt-pkg/contrib/fileutl.cc
  37. 11
      apt-pkg/contrib/fileutl.h
  38. 18
      apt-pkg/contrib/gpgv.cc
  39. 14
      apt-pkg/contrib/gpgv.h
  40. 6
      apt-pkg/contrib/hashes.cc
  41. 13
      apt-pkg/contrib/hashes.h
  42. 3
      apt-pkg/contrib/hashsum.cc
  43. 10
      apt-pkg/contrib/hashsum_template.h
  44. 8
      apt-pkg/contrib/macros.h
  45. 6
      apt-pkg/contrib/md5.cc
  46. 9
      apt-pkg/contrib/md5.h
  47. 4
      apt-pkg/contrib/mmap.cc
  48. 3
      apt-pkg/contrib/netrc.cc
  49. 6
      apt-pkg/contrib/netrc.h
  50. 2
      apt-pkg/contrib/progress.cc
  51. 5
      apt-pkg/contrib/sha1.cc
  52. 7
      apt-pkg/contrib/sha1.h
  53. 10
      apt-pkg/contrib/sha2.h
  54. 1
      apt-pkg/contrib/sha2_internal.cc
  55. 1
      apt-pkg/contrib/sha2_internal.h
  56. 9
      apt-pkg/contrib/strutl.cc
  57. 23
      apt-pkg/contrib/strutl.h
  58. 14
      apt-pkg/deb/debindexfile.cc
  59. 10
      apt-pkg/deb/debindexfile.h
  60. 9
      apt-pkg/deb/deblistparser.cc
  61. 7
      apt-pkg/deb/deblistparser.h
  62. 11
      apt-pkg/deb/debmetaindex.cc
  63. 8
      apt-pkg/deb/debmetaindex.h
  64. 8
      apt-pkg/deb/debrecords.cc
  65. 3
      apt-pkg/deb/debrecords.h
  66. 11
      apt-pkg/deb/debsrcrecords.cc
  67. 7
      apt-pkg/deb/debsrcrecords.h
  68. 9
      apt-pkg/deb/debsystem.cc
  69. 10
      apt-pkg/deb/debsystem.h
  70. 2
      apt-pkg/deb/debversion.cc
  71. 6
      apt-pkg/deb/debversion.h
  72. 52
      apt-pkg/deb/dpkgpm.cc
  73. 13
      apt-pkg/deb/dpkgpm.h
  74. 14
      apt-pkg/depcache.cc
  75. 12
      apt-pkg/depcache.h
  76. 17
      apt-pkg/edsp.cc
  77. 5
      apt-pkg/edsp.h
  78. 17
      apt-pkg/edsp/edspindexfile.cc
  79. 4
      apt-pkg/edsp/edspindexfile.h
  80. 10
      apt-pkg/edsp/edsplistparser.cc
  81. 4
      apt-pkg/edsp/edsplistparser.h
  82. 15
      apt-pkg/edsp/edspsystem.cc
  83. 9
      apt-pkg/edsp/edspsystem.h
  84. 6
      apt-pkg/indexcopy.cc
  85. 10
      apt-pkg/indexcopy.h
  86. 10
      apt-pkg/indexfile.cc
  87. 15
      apt-pkg/indexfile.h
  88. 7
      apt-pkg/indexrecords.cc
  89. 6
      apt-pkg/indexrecords.h
  90. 4
      apt-pkg/init.cc
  91. 2
      apt-pkg/init.h
  92. 30
      apt-pkg/install-progress.cc
  93. 15
      apt-pkg/metaindex.h
  94. 6
      apt-pkg/orderlist.cc
  95. 6
      apt-pkg/orderlist.h
  96. 11
      apt-pkg/packagemanager.cc
  97. 12
      apt-pkg/packagemanager.h
  98. 7
      apt-pkg/pkgcache.cc
  99. 20
      apt-pkg/pkgcachegen.cc
  100. 12
      apt-pkg/pkgcachegen.h

4
apt-inst/contrib/arfile.cc

@ -21,7 +21,9 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <string>
#include <apti18n.h>
/*}}}*/

6
apt-inst/contrib/extracttar.cc

@ -23,9 +23,11 @@
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/macros.h>
#include <apt-pkg/fileutl.h>
#include <stdlib.h>
#include <string.h>
#include <algorithm>
#include <string>
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>

12
apt-inst/deb/debfile.cc

@ -21,11 +21,17 @@
#include <apt-pkg/debfile.h>
#include <apt-pkg/extracttar.h>
#include <apt-pkg/error.h>
#include <apt-pkg/deblistparser.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/arfile.h>
#include <apt-pkg/dirstream.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/tagfile.h>
#include <string.h>
#include <string>
#include <vector>
#include <sys/stat.h>
#include <unistd.h>
#include <apti18n.h>
/*}}}*/

6
apt-inst/deb/debfile.h

@ -27,11 +27,15 @@
#include <apt-pkg/arfile.h>
#include <apt-pkg/dirstream.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/pkgcache.h>
#include <string>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/md5.h>
#endif
#ifndef APT_10_CLEANER_HEADERS
#include <apt-pkg/pkgcache.h>
#endif
class FileFd;

1
apt-inst/dirstream.cc

@ -18,7 +18,6 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/time.h>
#include <errno.h>
#include <unistd.h>

9
apt-inst/extract.cc

@ -50,13 +50,20 @@
#include <apt-pkg/error.h>
#include <apt-pkg/debversion.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/dirstream.h>
#include <apt-pkg/filelist.h>
#include <apt-pkg/mmap.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <string.h>
#include <string>
#include <sys/stat.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <dirent.h>
#include <iostream>
#include <apti18n.h>
/*}}}*/
using namespace std;

5
apt-inst/extract.h

@ -17,11 +17,12 @@
#ifndef PKGLIB_EXTRACT_H
#define PKGLIB_EXTRACT_H
#include <apt-pkg/dirstream.h>
#include <apt-pkg/filelist.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <string>
class pkgExtract : public pkgDirStream
{

2
apt-inst/filelist.cc

@ -39,8 +39,6 @@
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <iostream>
#include <apti18n.h>

15
apt-pkg/acquire-item.cc

@ -22,12 +22,21 @@
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/indexrecords.h>
#include <apt-pkg/metaindex.h>
#include <apt-pkg/acquire.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/pkgrecords.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <iostream>
#include <vector>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>

4
apt-pkg/acquire-item.h

@ -24,6 +24,10 @@
#include <apt-pkg/hashes.h>
#include <apt-pkg/weakptr.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <string>
#include <vector>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/indexfile.h>

12
apt-pkg/acquire-method.cc

@ -23,10 +23,18 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/hashes.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
#include <apt-pkg/sha2.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <string>
#include <vector>
#include <iostream>
#include <stdio.h>
#include <sys/signal.h>
/*}}}*/
using namespace std;

1
apt-pkg/acquire-method.h

@ -21,6 +21,7 @@
#define PKGLIB_ACQUIRE_METHOD_H
#include <stdarg.h>
#include <time.h>
#include <string>
#include <vector>

7
apt-pkg/acquire-worker.cc

@ -14,20 +14,23 @@
// Include Files /*{{{*/
#include <config.h>
#include <apt-pkg/acquire.h>
#include <apt-pkg/acquire-worker.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/hashes.h>
#include <string>
#include <vector>
#include <iostream>
#include <sstream>
#include <fstream>
#include <sys/stat.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
#include <errno.h>

3
apt-pkg/acquire-worker.h

@ -22,6 +22,9 @@
#include <apt-pkg/acquire.h>
#include <apt-pkg/weakptr.h>
#include <sys/types.h>
#include <string>
#include <vector>
/** \brief A fetch subprocess.
*

6
apt-pkg/acquire.cc

@ -23,12 +23,18 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <string>
#include <vector>
#include <iostream>
#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <dirent.h>
#include <sys/time.h>
#include <sys/select.h>
#include <errno.h>
#include <apti18n.h>

7
apt-pkg/acquire.h

@ -72,8 +72,13 @@
#include <vector>
#include <string>
#include <stddef.h>
#include <sys/time.h>
#include <sys/select.h>
#ifndef APT_10_CLEANER_HEADERS
#include <unistd.h>
#endif
#ifndef APT_8_CLEANER_HEADERS
using std::vector;
@ -353,7 +358,7 @@ class pkgAcquire
void SetLog(pkgAcquireStatus *Progress) { Log = Progress; }
/** \brief Construct a new pkgAcquire. */
pkgAcquire(pkgAcquireStatus *Log) __deprecated;
pkgAcquire(pkgAcquireStatus *Log) APT_DEPRECATED;
pkgAcquire();
/** \brief Destroy this pkgAcquire object.

13
apt-pkg/algorithms.cc

@ -19,19 +19,18 @@
#include <apt-pkg/algorithms.h>
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/version.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/edsp.h>
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <sys/types.h>
#include <string.h>
#include <string>
#include <cstdlib>
#include <algorithm>
#include <iostream>
#include <stdio.h>
#include <apti18n.h>
/*}}}*/

5
apt-pkg/algorithms.h

@ -33,8 +33,11 @@
#include <apt-pkg/packagemanager.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <iostream>
#include <string>
#include <apt-pkg/macros.h>
@ -140,7 +143,7 @@ class pkgProblemResolver /*{{{*/
// Try to resolve problems only by using keep
bool ResolveByKeep();
__deprecated void InstallProtect();
APT_DEPRECATED void InstallProtect();
pkgProblemResolver(pkgDepCache *Cache);
~pkgProblemResolver();

9
apt-pkg/aptconfiguration.cc

@ -17,14 +17,19 @@
#include <apt-pkg/macros.h>
#include <apt-pkg/strutl.h>
#include <sys/types.h>
#include <dirent.h>
#include <stdio.h>
#include <fcntl.h>
#include <ctype.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <algorithm>
#include <string>
#include <vector>
#include <apti18n.h>
/*}}}*/
namespace APT {
// getCompressionTypes - Return Vector of usable compressiontypes /*{{{*/

9
apt-pkg/cachefile.cc

@ -21,9 +21,16 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/policy.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/mmap.h>
#include <apt-pkg/pkgcache.h>
#include <string.h>
#include <unistd.h>
#include <string>
#include <vector>
#include <apti18n.h>
/*}}}*/

9
apt-pkg/cachefile.h

@ -17,8 +17,12 @@
#ifndef PKGLIB_CACHEFILE_H
#define PKGLIB_CACHEFILE_H
#include <stddef.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/macros.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/acquire.h>
@ -26,6 +30,7 @@
#include <apt-pkg/sourcelist.h>
#endif
class MMap;
class pkgPolicy;
class pkgSourceList;
class OpProgress;
@ -60,13 +65,13 @@ class pkgCacheFile
inline unsigned char &operator [](pkgCache::DepIterator const &I) {return (*DCache)[I];};
bool BuildCaches(OpProgress *Progress = NULL,bool WithLock = true);
__deprecated bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };
APT_DEPRECATED bool BuildCaches(OpProgress &Progress,bool const &WithLock = true) { return BuildCaches(&Progress, WithLock); };
bool BuildSourceList(OpProgress *Progress = NULL);
bool BuildPolicy(OpProgress *Progress = NULL);
bool BuildDepCache(OpProgress *Progress = NULL);
bool Open(OpProgress *Progress = NULL, bool WithLock = true);
inline bool ReadOnlyOpen(OpProgress *Progress = NULL) { return Open(Progress, false); };
__deprecated bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
APT_DEPRECATED bool Open(OpProgress &Progress,bool const &WithLock = true) { return Open(&Progress, WithLock); };
static void RemoveCaches();
void Close();

4
apt-pkg/cachefilter.cc

@ -9,10 +9,12 @@
#include <apt-pkg/cachefilter.h>
#include <apt-pkg/error.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/macros.h>
#include <string>
#include <string.h>
#include <regex.h>
#include <fnmatch.h>

1
apt-pkg/cachefilter.h

@ -7,6 +7,7 @@
#define APT_CACHEFILTER_H
// Include Files /*{{{*/
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <string>

4
apt-pkg/cacheiterators.h

@ -29,7 +29,11 @@
/*}}}*/
#ifndef PKGLIB_CACHEITERATORS_H
#define PKGLIB_CACHEITERATORS_H
#include<apt-pkg/pkgcache.h>
#include<iterator>
#include <iosfwd>
#include <string>
#include<string.h>

16
apt-pkg/cacheset.cc

@ -16,14 +16,22 @@
#include <apt-pkg/cachefilter.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/versionmatch.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/policy.h>
#include <vector>
#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/macros.h>
#include <apt-pkg/pkgcache.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <regex.h>
#include <list>
#include <string>
#include <vector>
#include <apti18n.h>
/*}}}*/

7
apt-pkg/cacheset.h

@ -9,7 +9,6 @@
#ifndef APT_CACHESET_H
#define APT_CACHESET_H
// Include Files /*{{{*/
#include <iostream>
#include <fstream>
#include <map>
#include <set>
@ -17,11 +16,17 @@
#include <string>
#include <iterator>
#include <stddef.h>
#include <apt-pkg/error.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/cachefile.h>
#endif
#ifndef APT_10_CLEANER_HEADERS
#include <iostream>
#endif
/*}}}*/

34
apt-pkg/cdrom.cc

@ -1,28 +1,30 @@
/*
*/
#include<config.h>
#include<apt-pkg/init.h>
#include<apt-pkg/error.h>
#include<apt-pkg/cdromutl.h>
#include<apt-pkg/strutl.h>
#include<apt-pkg/cdrom.h>
#include<apt-pkg/aptconfiguration.h>
#include<apt-pkg/configuration.h>
#include<apt-pkg/fileutl.h>
#include<sstream>
#include<fstream>
#include <config.h>
#include <apt-pkg/error.h>
#include <apt-pkg/cdromutl.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/cdrom.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/indexcopy.h>
#include <string.h>
#include <iostream>
#include <string>
#include <vector>
#include <sstream>
#include <fstream>
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <stdio.h>
#include <algorithm>
#include <dlfcn.h>
#include "indexcopy.h"
#include<apti18n.h>
using namespace std;

2
apt-pkg/cdrom.h

@ -4,6 +4,8 @@
#include<string>
#include<vector>
#include <stddef.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/init.h>
using namespace std;

4
apt-pkg/clean.cc

@ -16,7 +16,11 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <string>
#include <string.h>
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>

7
apt-pkg/clean.h

@ -10,8 +10,13 @@
#ifndef APTPKG_CLEAN_H
#define APTPKG_CLEAN_H
#ifndef APT_10_CLEANER_HEADERS
#include <apt-pkg/pkgcache.h>
#endif
#include <string>
class pkgCache;
class pkgArchiveCleaner
{

5
apt-pkg/contrib/cdromutl.cc

@ -19,7 +19,10 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
#include <sys/wait.h>
#include <stdlib.h>
#include <string.h>
#include <iostream>
#include <string>
#include <sys/statvfs.h>
#include <dirent.h>
#include <fcntl.h>

5
apt-pkg/contrib/cmndline.cc

@ -18,6 +18,11 @@
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <string>
#include <apti18n.h>
/*}}}*/
using namespace std;

13
apt-pkg/contrib/configuration.cc

@ -21,11 +21,18 @@
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/init.h>
#include <apt-pkg/macros.h>
#include <ctype.h>
#include <regex.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <algorithm>
#include <string>
#include <vector>
#include <fstream>
#include <iostream>
#include <apti18n.h>

4
apt-pkg/contrib/error.cc

@ -17,12 +17,14 @@
#include <apt-pkg/error.h>
#include <stdarg.h>
#include <stddef.h>
#include <list>
#include <iostream>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <string>
#include <cstring>

27
apt-pkg/contrib/error.h

@ -46,6 +46,7 @@
#include <list>
#include <string>
#include <stddef.h>
#include <stdarg.h>
class GlobalError /*{{{*/
@ -73,7 +74,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool FatalE(const char *Function,const char *Description,...) __like_printf(3) __cold;
bool FatalE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
/** \brief add an Error message with errno to the list
*
@ -82,7 +83,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool Errno(const char *Function,const char *Description,...) __like_printf(3) __cold;
bool Errno(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
/** \brief add a warning message with errno to the list
*
@ -94,7 +95,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool WarningE(const char *Function,const char *Description,...) __like_printf(3) __cold;
bool WarningE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
/** \brief add a notice message with errno to the list
*
@ -103,7 +104,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool NoticeE(const char *Function,const char *Description,...) __like_printf(3) __cold;
bool NoticeE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
/** \brief add a debug message with errno to the list
*
@ -112,7 +113,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool DebugE(const char *Function,const char *Description,...) __like_printf(3) __cold;
bool DebugE(const char *Function,const char *Description,...) APT_PRINTF(3) APT_COLD;
/** \brief adds an errno message with the given type
*
@ -121,7 +122,7 @@ public: /*{{{*/
* \param Description of the error
*/
bool InsertErrno(MsgType const &type, const char* Function,
const char* Description,...) __like_printf(4) __cold;
const char* Description,...) APT_PRINTF(4) APT_COLD;
/** \brief adds an errno message with the given type
*
@ -155,7 +156,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool Fatal(const char *Description,...) __like_printf(2) __cold;
bool Fatal(const char *Description,...) APT_PRINTF(2) APT_COLD;
/** \brief add an Error message to the list
*
@ -163,7 +164,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool Error(const char *Description,...) __like_printf(2) __cold;
bool Error(const char *Description,...) APT_PRINTF(2) APT_COLD;
/** \brief add a warning message to the list
*
@ -174,7 +175,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool Warning(const char *Description,...) __like_printf(2) __cold;
bool Warning(const char *Description,...) APT_PRINTF(2) APT_COLD;
/** \brief add a notice message to the list
*
@ -187,7 +188,7 @@ public: /*{{{*/
*
* \return \b false
*/
bool Notice(const char *Description,...) __like_printf(2) __cold;
bool Notice(const char *Description,...) APT_PRINTF(2) APT_COLD;
/** \brief add a debug message to the list
*
@ -195,14 +196,14 @@ public: /*{{{*/
*
* \return \b false
*/
bool Debug(const char *Description,...) __like_printf(2) __cold;
bool Debug(const char *Description,...) APT_PRINTF(2) APT_COLD;
/** \brief adds an error message with the given type
*
* \param type of the error message
* \param Description of the error
*/
bool Insert(MsgType const &type, const char* Description,...) __like_printf(3) __cold;
bool Insert(MsgType const &type, const char* Description,...) APT_PRINTF(3) APT_COLD;
/** \brief adds an error message with the given type
*
@ -218,7 +219,7 @@ public: /*{{{*/
* should call this method again in that case
*/
bool Insert(MsgType type, const char* Description,
va_list &args, size_t &msgSize) __cold;
va_list &args, size_t &msgSize) APT_COLD;
/** \brief is an error in the list?
*

12
apt-pkg/contrib/fileutl.cc

@ -26,16 +26,22 @@
#include <apt-pkg/sptr.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/macros.h>
#include <ctype.h>
#include <stdarg.h>
#include <stddef.h>
#include <sys/select.h>
#include <time.h>
#include <string>
#include <vector>
#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <iostream>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/wait.h>
#include <dirent.h>

11
apt-pkg/contrib/fileutl.h

@ -27,6 +27,7 @@
#include <string>
#include <vector>
#include <set>
#include <time.h>
#include <zlib.h>
@ -94,7 +95,7 @@ class FileFd
And as the auto-conversation converts a 'unsigned long *' to a 'bool'
instead of 'unsigned long long *' we need to provide this explicitely -
otherwise applications magically start to fail */
__deprecated bool Read(void *To,unsigned long long Size,unsigned long *Actual)
bool Read(void *To,unsigned long long Size,unsigned long *Actual) APT_DEPRECATED
{
unsigned long long R;
bool const T = Read(To, Size, &R);
@ -118,7 +119,7 @@ class FileFd
// Simple manipulators
inline int Fd() {return iFd;};
inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);};
__deprecated gzFile gzFd();
gzFile gzFd() APT_DEPRECATED;
inline bool IsOpen() {return iFd >= 0;};
inline bool Failed() {return (Flags & Fail) == Fail;};
@ -152,8 +153,8 @@ class FileFd
bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
// private helpers to set Fail flag and call _error->Error
bool FileFdErrno(const char* Function, const char* Description,...) __like_printf(3) __cold;
bool FileFdError(const char* Description,...) __like_printf(2) __cold;
bool FileFdErrno(const char* Function, const char* Description,...) APT_PRINTF(3) APT_COLD;
bool FileFdError(const char* Description,...) APT_PRINTF(2) APT_COLD;
};
bool RunScripts(const char *Cnf);
@ -161,7 +162,7 @@ bool CopyFile(FileFd &From,FileFd &To);
int GetLock(std::string File,bool Errors = true);
bool FileExists(std::string File);
bool RealFileExists(std::string File);
bool DirectoryExists(std::string const &Path) __attrib_const;
bool DirectoryExists(std::string const &Path) APT_CONST;
bool CreateDirectory(std::string const &Parent, std::string const &Path);
time_t GetModificationTime(std::string const &Path);

18
apt-pkg/contrib/gpgv.cc

@ -2,21 +2,23 @@
// Include Files /*{{{*/
#include<config.h>
#include<apt-pkg/configuration.h>
#include<apt-pkg/error.h>
#include<apt-pkg/strutl.h>
#include<apt-pkg/fileutl.h>
#include<apt-pkg/gpgv.h>
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include<apt-pkg/configuration.h>
#include<apt-pkg/error.h>
#include<apt-pkg/strutl.h>
#include<apt-pkg/fileutl.h>
#include<apt-pkg/gpgv.h>
#include <stddef.h>
#include <iostream>
#include <string>
#include <vector>
#include <apti18n.h>
/*}}}*/

14
apt-pkg/contrib/gpgv.h

@ -9,17 +9,17 @@
#ifndef CONTRIB_GPGV_H
#define CONTRIB_GPGV_H
#include <apt-pkg/macros.h>
#include <string>
#include <vector>
#ifndef APT_10_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#if __GNUC__ >= 4
#define APT_noreturn __attribute__ ((noreturn))
#else
#define APT_noreturn /* no support */
#endif
class FileFd;
/** \brief generates and run the command to verify a file with gpgv
*
* If File and FileSig specify the same file it is assumed that we
@ -40,15 +40,13 @@
* @param FileSig is the signature (detached or clear-signed)
*/
void ExecGPGV(std::string const &File, std::string const &FileSig,
int const &statusfd, int fd[2]) APT_noreturn;
int const &statusfd, int fd[2]) APT_NORETURN;
inline void ExecGPGV(std::string const &File, std::string const &FileSig,
int const &statusfd = -1) {
int fd[2];
ExecGPGV(File, FileSig, statusfd, fd);
}
#undef APT_noreturn
/** \brief Split an inline signature into message and signature
*
* Takes a clear-signed message and puts the first signed message

6
apt-pkg/contrib/hashes.cc

@ -16,8 +16,12 @@
#include <apt-pkg/hashes.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/macros.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
#include <apt-pkg/sha2.h>
#include <stddef.h>
#include <algorithm>
#include <unistd.h>
#include <string>
#include <iostream>

13
apt-pkg/contrib/hashes.h

@ -17,17 +17,22 @@
#include <apt-pkg/md5.h>
#include <apt-pkg/sha1.h>
#include <apt-pkg/sha2.h>
#include <apt-pkg/fileutl.h>
#include <algorithm>
#include <vector>
#include <cstring>
#include <string>
#ifndef APT_8_CLEANER_HEADERS
using std::min;
using std::vector;
#endif
#ifndef APT_10_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#include <algorithm>
#include <vector>
#endif
class FileFd;
// helper class that contains hash function name
// and hash

3
apt-pkg/contrib/hashsum.cc

@ -1,6 +1,9 @@
// Cryptographic API Base
#include <config.h>
#include <apt-pkg/fileutl.h>
#include <algorithm>
#include <unistd.h>
#include "hashsum_template.h"

10
apt-pkg/contrib/hashsum_template.h

@ -10,20 +10,24 @@
#ifndef APTPKG_HASHSUM_TEMPLATE_H
#define APTPKG_HASHSUM_TEMPLATE_H
#include <apt-pkg/fileutl.h>
#include <string>
#include <cstring>
#include <algorithm>
#include <stdint.h>
#include <apt-pkg/strutl.h>
#ifndef APT_10_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
#include <algorithm>
#include <stdint.h>
#endif
#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::min;
#endif
class FileFd;
template<int N>
class HashSumValue
{

8
apt-pkg/contrib/macros.h

@ -71,13 +71,13 @@
#endif
#if APT_GCC_VERSION >= 0x0300
#define APT_UNUSED __attribute__((unused))
#define APT_DEPRECATED __attribute__ ((deprecated))
#define APT_CONST __attribute__((const))
#define APT_PURE __attribute__((pure))
#define APT_NORETURN __attribute__((noreturn))
#define APT_PRINTF(n) __attribute__((format(printf, n, n + 1)))
#else
#define APT_UNUSED
#define APT_DEPRECATED
#define APT_CONST
#define APT_PURE
#define APT_NORETURN
@ -103,8 +103,8 @@
#define APT_COLD __attribute__ ((__cold__))
#define APT_HOT __attribute__ ((__hot__))
#else
#define __cold
#define __hot
#define APT_COLD
#define APT_HOT
#endif
#ifndef APT_10_CLEANER_HEADERS

6
apt-pkg/contrib/md5.cc

@ -38,13 +38,9 @@
#include <config.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/macros.h>
#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include <netinet/in.h> // For htonl
#include <inttypes.h>
/*}}}*/
// byteSwap - Swap bytes in a buffer /*{{{*/

9
apt-pkg/contrib/md5.h

@ -23,14 +23,15 @@
#ifndef APTPKG_MD5_H
#define APTPKG_MD5_H
#include <string>
#include <cstring>
#include <algorithm>
#include <stdint.h>
#include "hashsum_template.h"
#ifndef APT_10_CLEANER_HEADERS
#include <string>
#include <cstring>
#include <algorithm>
#endif
#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::min;

4
apt-pkg/contrib/mmap.cc

@ -22,11 +22,11 @@
#include <apt-pkg/mmap.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/macros.h>
#include <string>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <stdlib.h>
#include <errno.h>
#include <cstring>

3
apt-pkg/contrib/netrc.cc

@ -15,14 +15,13 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stddef.h>
#include <pwd.h>
#include "netrc.h"

6
apt-pkg/contrib/netrc.h

@ -16,6 +16,8 @@
#include <string>
#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/strutl.h>
#endif
@ -25,9 +27,9 @@
class URI;
// kill this export on the next ABI break - strongly doubt its in use anyway
// FIXME: kill this export on the next ABI break - strongly doubt its in use anyway
// outside of the apt itself, its really a internal interface
__deprecated int parsenetrc (char *host, char *login, char *password, char *filename);
APT_DEPRECATED int parsenetrc (char *host, char *login, char *password, char *filename);
void maybe_add_auth (URI &Uri, std::string NetRCFile);
#endif

2
apt-pkg/contrib/progress.cc

@ -14,6 +14,8 @@
#include <apt-pkg/error.h>
#include <apt-pkg/configuration.h>
#include <sys/time.h>
#include <string>
#include <iostream>
#include <stdio.h>
#include <cstring>

5
apt-pkg/contrib/sha1.cc

@ -32,12 +32,9 @@
#include <config.h>
#include <apt-pkg/sha1.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/macros.h>
#include <stdint.h>
#include <string.h>
#include <unistd.h>
#include <inttypes.h>
/*}}}*/
// SHA1Transform - Alters an existing SHA-1 hash /*{{{*/

7
apt-pkg/contrib/sha1.h

@ -14,12 +14,13 @@
#ifndef APTPKG_SHA1_H
#define APTPKG_SHA1_H
#include "hashsum_template.h"
#ifndef APT_10_CLEANER_HEADERS
#include <string>
#include <cstring>
#include <algorithm>
#include "hashsum_template.h"
#endif
#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::min;

10
apt-pkg/contrib/sha2.h

@ -14,14 +14,18 @@
#ifndef APTPKG_SHA2_H
#define APTPKG_SHA2_H
#include <string>
#include <cstring>
#include <algorithm>
#include <stdint.h>
#include "sha2_internal.h"
#include "hashsum_template.h"
#ifndef APT_10_CLEANER_HEADERS
#include <string>
#include <algorithm>
#include <stdint.h>
#endif
typedef HashSumValue<512> SHA512SumValue;
typedef HashSumValue<256> SHA256SumValue;

1
apt-pkg/contrib/sha2_internal.cc

@ -33,6 +33,7 @@
*/
#include <config.h>
#include <endian.h>
#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
#include <assert.h> /* assert() */
#include "sha2_internal.h"

1
apt-pkg/contrib/sha2_internal.h

@ -44,6 +44,7 @@
#ifdef SHA2_USE_INTTYPES_H
#include <stddef.h>
#include <inttypes.h>
#endif /* SHA2_USE_INTTYPES_H */

9
apt-pkg/contrib/strutl.cc

@ -21,6 +21,11 @@
#include <apt-pkg/fileutl.h>
#include <apt-pkg/error.h>
#include <stddef.h>
#include <stdlib.h>
#include <time.h>
#include <string>
#include <vector>
#include <ctype.h>
#include <string.h>
#include <sstream>
@ -33,9 +38,9 @@
#include <iconv.h>
#include <apti18n.h>
using namespace std;
/*}}}*/
using namespace std;
// Strip - Remove white space from the front and back of a string /*{{{*/
// ---------------------------------------------------------------------
namespace APT {

23
apt-pkg/contrib/strutl.h

@ -18,15 +18,18 @@
#include <limits>
#include <stdlib.h>
#include <string>
#include <cstring>
#include <vector>
#include <iostream>
#include <time.h>
#include <stddef.h>
#include "macros.h"
#ifndef APT_10_CLEANER_HEADERS
#include <stdlib.h>
#endif
#ifndef APT_8_CLEANER_HEADERS
using std::string;
using std::vector;
@ -60,9 +63,9 @@ std::string Base64Encode(const std::string &Str);
std::string OutputInDepth(const unsigned long Depth, const char* Separator=" ");
std::string URItoFileName(const std::string &URI);
std::string TimeRFC1123(time_t Date);
bool RFC1123StrToTime(const char* const str,time_t &time) __must_check;
bool FTPMDTMStrToTime(const char* const str,time_t &time) __must_check;
__deprecated bool StrToTime(const std::string &Val,time_t &Result);
bool RFC1123StrToTime(const char* const str,time_t &time) APT_MUSTCHECK;
bool FTPMDTMStrToTime(const char* const str,time_t &time) APT_MUSTCHECK;
APT_DEPRECATED bool StrToTime(const std::string &Val,time_t &Result);
std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);
int StringToBool(const std::string &Text,int Default = -1);
bool ReadMessages(int Fd, std::vector<std::string> &List);
@ -76,7 +79,7 @@ bool TokSplitString(char Tok,char *Input,char **List,
unsigned long ListMax);
// split a given string by a char
std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) __attrib_const;
std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_CONST;
/* \brief Return a vector of strings from string "input" where "sep"
* is used as the delimiter string.