diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2024-02-20 13:43:08 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2024-02-20 13:49:04 +0100 |
| commit | 40a75722c43ae24cb9a99d6730a3b25b65819c49 (patch) | |
| tree | a5e7292b13ed1a77a443f367ea0fd7b2e66b0742 /cmdline | |
| parent | 04ea92054757272c344afdf8d8e68046c7678b37 (diff) | |
Modernize standard library includes
This was automated with sed and git-clang-format, and then I had to
fix up the top of policy.cc by hand as git-clang-format accidentally
indented it by two spaces.
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-cache.cc | 6 | ||||
| -rw-r--r-- | cmdline/apt-config.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-dump-solver.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 6 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 12 | ||||
| -rw-r--r-- | cmdline/apt-helper.cc | 2 | ||||
| -rw-r--r-- | cmdline/apt-internal-planner.cc | 4 | ||||
| -rw-r--r-- | cmdline/apt-internal-solver.cc | 4 | ||||
| -rw-r--r-- | cmdline/apt-mark.cc | 10 | ||||
| -rw-r--r-- | cmdline/apt-sortpkgs.cc | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index ffe650970..531500cc0 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -47,6 +47,9 @@ #include <apt-private/private-unmet.h> #include <algorithm> +#include <cstddef> +#include <cstdio> +#include <cstdlib> #include <cstring> #include <iomanip> #include <iostream> @@ -56,9 +59,6 @@ #include <string> #include <vector> #include <regex.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> #include <unistd.h> #include <apti18n.h> diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 8ad7cac68..6b1e3850e 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -25,11 +25,11 @@ #include <apt-pkg/pkgsystem.h> #include <apt-pkg/strutl.h> +#include <cstring> #include <iostream> #include <map> #include <string> #include <vector> -#include <string.h> #include <apt-private/private-cmndline.h> #include <apt-private/private-main.h> diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc index ab44b9fd1..3e590355e 100644 --- a/cmdline/apt-dump-solver.cc +++ b/cmdline/apt-dump-solver.cc @@ -25,7 +25,7 @@ #include <sys/types.h> #include <sys/wait.h> -#include <string.h> +#include <cstring> #include <unistd.h> #include <apti18n.h> diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 88a204110..a578fa84b 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -35,10 +35,10 @@ #include <apt-private/private-cmndline.h> #include <apt-private/private-main.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <unistd.h> #include "apt-extracttemplates.h" diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d41e0f243..2828ad68a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -67,14 +67,14 @@ #include <apt-private/private-upgrade.h> #include <apt-private/private-utils.h> -#include <errno.h> +#include <cerrno> +#include <csignal> +#include <cstddef> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <grp.h> #include <pwd.h> -#include <signal.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/ioctl.h> #include <sys/stat.h> #include <unistd.h> diff --git a/cmdline/apt-helper.cc b/cmdline/apt-helper.cc index 85795e0d2..f48cb293f 100644 --- a/cmdline/apt-helper.cc +++ b/cmdline/apt-helper.cc @@ -30,7 +30,7 @@ #include <string> #include <vector> -#include <stdlib.h> +#include <cstdlib> #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> diff --git a/cmdline/apt-internal-planner.cc b/cmdline/apt-internal-planner.cc index be9de4ef4..c77997a7a 100644 --- a/cmdline/apt-internal-planner.cc +++ b/cmdline/apt-internal-planner.cc @@ -29,12 +29,12 @@ #include <apt-private/private-output.h> #include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> #include <list> #include <sstream> #include <string> -#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 23af6dab7..094ed183c 100644 --- a/cmdline/apt-internal-solver.cc +++ b/cmdline/apt-internal-solver.cc @@ -29,12 +29,12 @@ #include <apt-private/private-output.h> #include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> #include <list> #include <sstream> #include <string> -#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 3f3b008ba..33716bb3c 100644 --- a/cmdline/apt-mark.cc +++ b/cmdline/apt-mark.cc @@ -26,16 +26,16 @@ #include <apt-private/private-output.h> #include <algorithm> +#include <cerrno> +#include <cstddef> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <fstream> #include <iostream> #include <string> #include <vector> -#include <errno.h> #include <fcntl.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/wait.h> #include <unistd.h> diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index 519825457..acbb2832e 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -27,11 +27,11 @@ #include <apt-private/private-main.h> #include <algorithm> +#include <cstdio> #include <iostream> #include <memory> #include <string> #include <vector> -#include <stdio.h> #include <unistd.h> #include <apti18n.h> |