summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-cache.cc55
-rw-r--r--cmdline/apt-cdrom.cc16
-rw-r--r--cmdline/apt-config.cc10
-rw-r--r--cmdline/apt-extracttemplates.cc23
-rw-r--r--cmdline/apt-extracttemplates.h2
-rw-r--r--cmdline/apt-get.cc23
-rw-r--r--cmdline/apt-helper.cc18
-rw-r--r--cmdline/apt-internal-planner.cc27
-rw-r--r--cmdline/apt-internal-solver.cc27
-rw-r--r--cmdline/apt-mark.cc23
-rw-r--r--cmdline/apt-sortpkgs.cc18
-rw-r--r--cmdline/apt.cc26
12 files changed, 132 insertions, 136 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 0d7425c48..0f120a4b0 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -13,17 +13,22 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include<config.h>
+#include <config.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/init.h>
+#include <apt-pkg/macros.h>
#include <apt-pkg/metaindex.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/policy.h>
@@ -34,26 +39,15 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/version.h>
-#include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/macros.h>
-#include <apt-pkg/mmap.h>
-#include <apt-pkg/pkgcache.h>
#include <apt-private/private-cacheset.h>
#include <apt-private/private-cmndline.h>
#include <apt-private/private-depends.h>
-#include <apt-private/private-show.h>
+#include <apt-private/private-main.h>
#include <apt-private/private-search.h>
+#include <apt-private/private-show.h>
#include <apt-private/private-unmet.h>
-#include <apt-private/private-main.h>
-#include <regex.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <algorithm>
#include <cstring>
#include <iomanip>
@@ -63,6 +57,11 @@
#include <set>
#include <string>
#include <vector>
+#include <regex.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <apti18n.h>
/*}}}*/
@@ -404,7 +403,7 @@ static bool DumpAvail(CommandLine &)
if (unlikely(Cache == NULL || CacheFile.BuildPolicy() == false))
return false;
- unsigned long Count = Cache->HeaderP->PackageCount+1;
+ auto const Count = Cache->HeaderP->PackageCount+1;
pkgCache::VerFile **VFList = new pkgCache::VerFile *[Count];
memset(VFList,0,sizeof(*VFList)*Count);
@@ -565,18 +564,19 @@ static bool XVcg(CommandLine &CmdL)
0 = None */
enum States {None=0, ToShow, ToShowNR, DoneNR, Done};
enum TheFlags {ForceNR=(1<<0)};
- unsigned char *Show = new unsigned char[Cache->Head().PackageCount];
- unsigned char *Flags = new unsigned char[Cache->Head().PackageCount];
- unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount];
+ auto PackageCount = Cache->Head().PackageCount;
+ unsigned char *Show = new unsigned char[PackageCount];
+ unsigned char *Flags = new unsigned char[PackageCount];
+ unsigned char *ShapeMap = new unsigned char[PackageCount];
// Show everything if no arguments given
if (CmdL.FileList[1] == 0)
- for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)
+ for (decltype(PackageCount) I = 0; I != PackageCount; ++I)
Show[I] = ToShow;
else
- for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)
+ for (decltype(PackageCount) I = 0; I != PackageCount; ++I)
Show[I] = None;
- memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
+ memset(Flags,0,sizeof(*Flags)*PackageCount);
// Map the shapes
for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)
@@ -777,18 +777,19 @@ static bool Dotty(CommandLine &CmdL)
0 = None */
enum States {None=0, ToShow, ToShowNR, DoneNR, Done};
enum TheFlags {ForceNR=(1<<0)};
- unsigned char *Show = new unsigned char[Cache->Head().PackageCount];
- unsigned char *Flags = new unsigned char[Cache->Head().PackageCount];
- unsigned char *ShapeMap = new unsigned char[Cache->Head().PackageCount];
+ auto PackageCount = Cache->Head().PackageCount;
+ unsigned char *Show = new unsigned char[PackageCount];
+ unsigned char *Flags = new unsigned char[PackageCount];
+ unsigned char *ShapeMap = new unsigned char[PackageCount];
// Show everything if no arguments given
if (CmdL.FileList[1] == 0)
- for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)
+ for (decltype(PackageCount) I = 0; I != PackageCount; ++I)
Show[I] = ToShow;
else
- for (unsigned long I = 0; I != Cache->Head().PackageCount; I++)
+ for (decltype(PackageCount) I = 0; I != PackageCount; ++I)
Show[I] = None;
- memset(Flags,0,sizeof(*Flags)*Cache->Head().PackageCount);
+ memset(Flags,0,sizeof(*Flags)*PackageCount);
// Map the shapes
for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); Pkg.end() == false; ++Pkg)
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index bac808a41..577d072db 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -11,28 +11,28 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include<config.h>
+#include <config.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/cdromutl.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
-#include <apt-pkg/init.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/progress.h>
-#include <apt-pkg/cdromutl.h>
#include <apt-pkg/strutl.h>
-#include <apt-pkg/cdrom.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/pkgsystem.h>
#include <iostream>
-#include <vector>
#include <string>
+#include <vector>
#include <sys/stat.h>
#include <unistd.h>
#include <apt-private/private-cmndline.h>
-#include <apt-private/private-output.h>
#include <apt-private/private-main.h>
+#include <apt-private/private-output.h>
#include <apti18n.h>
/*}}}*/
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index adec8dda4..ef1e95de1 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -16,20 +16,20 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include<config.h>
+#include <config.h>
+#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/init.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/strutl.h>
#include <iostream>
+#include <map>
#include <string>
#include <vector>
-#include <map>
#include <string.h>
#include <apt-private/private-cmndline.h>
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index a4468b989..928fb1882 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -13,34 +13,33 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include<config.h>
+#include <config.h>
-#include <apt-pkg/init.h>
#include <apt-pkg/cmndline.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/configuration.h>
-#include <apt-pkg/sourcelist.h>
-#include <apt-pkg/pkgcachegen.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/tagfile.h>
#include <apt-pkg/debfile.h>
#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/dirstream.h>
#include <apt-pkg/error.h>
-#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/dirstream.h>
+#include <apt-pkg/init.h>
#include <apt-pkg/mmap.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/version.h>
#include <apt-private/private-cmndline.h>
#include <apt-private/private-main.h>
#include <iostream>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <stdlib.h>
#include "apt-extracttemplates.h"
diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index 91e385e70..66d98570a 100644
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -10,8 +10,8 @@
#ifndef _APTEXTRACTTEMPLATE_H_
#define _APTEXTRACTTEMPLATE_H_
-#include <apt-pkg/fileutl.h>
#include <apt-pkg/dirstream.h>
+#include <apt-pkg/fileutl.h>
#include <string>
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 95d88e2ad..5cc0a02da 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -28,50 +28,51 @@
#include <config.h>
#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/clean.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/debmetaindex.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/init.h>
+#include <apt-pkg/macros.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/metaindex.h>
+#include <apt-pkg/pkgcache.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/sptr.h>
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/strutl.h>
-#include <apt-pkg/version.h>
-#include <apt-pkg/acquire.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/macros.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/upgrade.h>
-#include <apt-pkg/sptr.h>
+#include <apt-pkg/version.h>
#include <apt-private/acqprogress.h>
-#include <apt-private/private-cacheset.h>
#include <apt-private/private-cachefile.h>
+#include <apt-private/private-cacheset.h>
#include <apt-private/private-cmndline.h>
#include <apt-private/private-download.h>
#include <apt-private/private-install.h>
#include <apt-private/private-main.h>
#include <apt-private/private-moo.h>
#include <apt-private/private-output.h>
+#include <apt-private/private-source.h>
#include <apt-private/private-update.h>
#include <apt-private/private-upgrade.h>
#include <apt-private/private-utils.h>
-#include <apt-private/private-source.h>
#include <errno.h>
+#include <grp.h>
+#include <pwd.h>
#include <signal.h>
#include <stddef.h>
#include <stdio.h>
@@ -80,14 +81,12 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <pwd.h>
-#include <grp.h>
#include <algorithm>
#include <fstream>
#include <iostream>
-#include <sstream>
#include <set>
+#include <sstream>
#include <string>
#include <vector>
diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc
index a6f88ad06..59b72ec25 100644
--- a/cmdline/apt-helper.cc
+++ b/cmdline/apt-helper.cc
@@ -7,30 +7,30 @@
// Include Files /*{{{*/
#include <config.h>
-#include <apt-pkg/configuration.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/acquire.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
+#include <apt-pkg/fileutl.h>
#include <apt-pkg/init.h>
-#include <apt-pkg/strutl.h>
#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/acquire.h>
-#include <apt-pkg/acquire-item.h>
#include <apt-pkg/proxy.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/srvrec.h>
#include <apt-private/acqprogress.h>
-#include <apt-private/private-output.h>
-#include <apt-private/private-download.h>
#include <apt-private/private-cmndline.h>
+#include <apt-private/private-download.h>
#include <apt-private/private-main.h>
-#include <apt-pkg/srvrec.h>
+#include <apt-private/private-output.h>
#include <iostream>
#include <string>
#include <vector>
-#include <unistd.h>
#include <stdlib.h>
+#include <unistd.h>
#include <apti18n.h>
/*}}}*/
diff --git a/cmdline/apt-internal-planner.cc b/cmdline/apt-internal-planner.cc
index 1f74aa78f..be9de4ef4 100644
--- a/cmdline/apt-internal-planner.cc
+++ b/cmdline/apt-internal-planner.cc
@@ -9,34 +9,33 @@
// Include Files /*{{{*/
#include <config.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/init.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
#include <apt-pkg/edsp.h>
+#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/configuration.h>
+#include <apt-pkg/init.h>
#include <apt-pkg/packagemanager.h>
-#include <apt-pkg/prettyprinters.h>
-#include <apt-pkg/depcache.h>
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/prettyprinters.h>
+#include <apt-pkg/strutl.h>
-#include <apt-private/private-output.h>
#include <apt-private/private-cmndline.h>
#include <apt-private/private-main.h>
+#include <apt-private/private-output.h>
-#include <string.h>
+#include <cstdio>
#include <iostream>
-#include <sstream>
#include <list>
+#include <sstream>
#include <string>
-#include <unistd.h>
-#include <cstdio>
#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <apti18n.h>
/*}}}*/
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index aecb0eaba..5c9ca5a35 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -9,34 +9,33 @@
// Include Files /*{{{*/
#include <config.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/cmndline.h>
-#include <apt-pkg/init.h>
+#include <apt-pkg/algorithms.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
#include <apt-pkg/edsp.h>
-#include <apt-pkg/algorithms.h>
+#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/pkgcache.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/strutl.h>
#include <apt-pkg/upgrade.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/cacheiterators.h>
-#include <apt-private/private-output.h>
#include <apt-private/private-cmndline.h>
#include <apt-private/private-main.h>
+#include <apt-private/private-output.h>
-#include <string.h>
+#include <cstdio>
#include <iostream>
-#include <sstream>
#include <list>
+#include <sstream>
#include <string>
-#include <unistd.h>
-#include <cstdio>
#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <apti18n.h>
/*}}}*/
diff --git a/cmdline/apt-mark.cc b/cmdline/apt-mark.cc
index 0cba31e70..8315efa12 100644
--- a/cmdline/apt-mark.cc
+++ b/cmdline/apt-mark.cc
@@ -10,22 +10,26 @@
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/depcache.h>
#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/init.h>
-#include <apt-pkg/pkgsystem.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/statechanges.h>
-#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 <apt-pkg/pkgsystem.h>
+#include <apt-pkg/statechanges.h>
+#include <apt-pkg/strutl.h>
#include <apt-private/private-cmndline.h>
-#include <apt-private/private-output.h>
#include <apt-private/private-main.h>
+#include <apt-private/private-output.h>
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <string>
+#include <vector>
#include <errno.h>
#include <fcntl.h>
#include <stddef.h>
@@ -34,11 +38,6 @@
#include <string.h>
#include <sys/wait.h>
#include <unistd.h>
-#include <algorithm>
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <vector>
#include <apti18n.h>
/*}}}*/
diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index cf19b84ec..40be29c77 100644
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -14,25 +14,25 @@
// Include Files /*{{{*/
#include <config.h>
-#include <apt-pkg/tagfile.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/configuration.h>
#include <apt-pkg/cmndline.h>
-#include <apt-pkg/init.h>
-#include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/error.h>
#include <apt-pkg/fileutl.h>
+#include <apt-pkg/init.h>
#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/strutl.h>
+#include <apt-pkg/tagfile.h>
#include <apt-private/private-cmndline.h>
#include <apt-private/private-main.h>
-#include <vector>
#include <algorithm>
-#include <stdio.h>
-#include <unistd.h>
#include <iostream>
-#include <string>
#include <memory>
+#include <string>
+#include <vector>
+#include <stdio.h>
+#include <unistd.h>
#include <apti18n.h>
/*}}}*/
diff --git a/cmdline/apt.cc b/cmdline/apt.cc
index 4b266bcbe..6bf85467e 100644
--- a/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@ -9,33 +9,33 @@
##################################################################### */
/*}}}*/
// Include Files /*{{{*/
-#include<config.h>
+#include <config.h>
#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
#include <apt-pkg/init.h>
#include <apt-pkg/pkgsystem.h>
#include <apt-pkg/strutl.h>
-#include <apt-pkg/configuration.h>
-#include <apt-private/private-list.h>
-#include <apt-private/private-search.h>
-#include <apt-private/private-install.h>
-#include <apt-private/private-output.h>
-#include <apt-private/private-update.h>
#include <apt-private/private-cmndline.h>
+#include <apt-private/private-depends.h>
+#include <apt-private/private-download.h>
+#include <apt-private/private-install.h>
+#include <apt-private/private-list.h>
+#include <apt-private/private-main.h>
#include <apt-private/private-moo.h>
-#include <apt-private/private-upgrade.h>
+#include <apt-private/private-output.h>
+#include <apt-private/private-search.h>
#include <apt-private/private-show.h>
-#include <apt-private/private-main.h>
-#include <apt-private/private-sources.h>
#include <apt-private/private-source.h>
-#include <apt-private/private-depends.h>
-#include <apt-private/private-download.h>
+#include <apt-private/private-sources.h>
+#include <apt-private/private-update.h>
+#include <apt-private/private-upgrade.h>
-#include <unistd.h>
#include <iostream>
#include <vector>
+#include <unistd.h>
#include <apti18n.h>
/*}}}*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 09:49:56 +0000