The following commit has been merged in the master branch:
commit 1c88ead04c95096f03b61a6032d443a327964926
Author: Guillem Jover <[email protected]>
Date: Sat Oct 17 02:38:03 2009 +0200
Sort order of header includes
Place first <config.h> and <compat.h>, then all <sys/*.h> sorted by
complexity, followed by the rest of the system headers, then <dpkg/*.h>
and finally the local "*.h" ones.
Move <dpkg/i18n.h> inclusion into libdpkg inclusion block, as the
<gettext.h> compatibility header already takes care of including
<locale.h> before <libintl.h> on environments were its probamatic.
Removed duplicated inclusions.
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index daaf1f9..c44f0bf 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -23,27 +23,27 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
-#include <time.h>
+
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <ctype.h>
-#include <assert.h>
+#include <string.h>
+#include <time.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
#ifdef WITH_ZLIB
#include <zlib.h>
#endif
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/path.h>
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 4c429d7..092231f 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -18,29 +18,30 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
+
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <ctype.h>
-#include <assert.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
#include <ar.h>
+#include <stdlib.h>
+#include <stdio.h>
#ifdef WITH_ZLIB
#include <zlib.h>
#endif
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/buffer.h>
#include <dpkg/subproc.h>
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index c9b89e0..a1b5931 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -19,24 +19,25 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
+
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/buffer.h>
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index b478ba9..d99246c 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -18,30 +18,30 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
+
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
-#include <ctype.h>
-#include <assert.h>
-
#if HAVE_LOCALE_H
#include <locale.h>
#endif
+#include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/dpkg-split/info.c b/dpkg-split/info.c
index 10fc9d0..6aad36f 100644
--- a/dpkg-split/info.c
+++ b/dpkg-split/info.c
@@ -18,21 +18,22 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
#include <assert.h>
+#include <limits.h>
+#include <ctype.h>
#include <string.h>
#include <unistd.h>
-#include <sys/stat.h>
#include <ar.h>
-#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/dpkg-split/join.c b/dpkg-split/join.c
index 5da5e22..6ec9a0d 100644
--- a/dpkg-split/join.c
+++ b/dpkg-split/join.c
@@ -18,17 +18,17 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
#include <assert.h>
+#include <limits.h>
#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index db77466..aa2a2bb 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -21,21 +21,20 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <assert.h>
+#include <limits.h>
#if HAVE_LOCALE_H
#include <locale.h>
#endif
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index edfa5fc..75da2c2 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -27,21 +27,22 @@
* <md5sum>.<maxpartlen>.<thispartn>.<maxpartn>
* all numbers in hex
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
#include <assert.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <limits.h>
+#include <string.h>
#include <fcntl.h>
#include <dirent.h>
-#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/dpkg-split/split.c b/dpkg-split/split.c
index a8ceaa9..a611045 100644
--- a/dpkg-split/split.c
+++ b/dpkg-split/split.c
@@ -18,19 +18,20 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <limits.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/stat.h>
#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index 03296fe..aa932dd 100644
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -23,11 +23,10 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index eed4256..db286b2 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -23,16 +23,16 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/ioctl.h>
+#include <sys/termios.h>
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
#include <ctype.h>
+#include <string.h>
#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/termios.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/bindings.cc b/dselect/bindings.cc
index 5827da7..7ef9a28 100644
--- a/dselect/bindings.cc
+++ b/dselect/bindings.cc
@@ -22,11 +22,10 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/dselect.h b/dselect/dselect.h
index 9bf93a5..a61f387 100644
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -23,15 +23,15 @@
#ifndef DSELECT_H
#define DSELECT_H
+#include <signal.h>
+
+#include "dselect-curses.h"
+
#define DSELECT "dselect"
#define TOTAL_LIST_WIDTH 180
#define MAX_DISPLAY_INFO 120
-#include <signal.h>
-
-#include "dselect-curses.h"
-
struct helpmenuentry {
char key;
const struct helpmessage *msg;
diff --git a/dselect/main.cc b/dselect/main.cc
index 4421b11..3f155f8 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -23,25 +23,23 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
-#include <fcntl.h>
+
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
-#include <ctype.h>
-#include <assert.h>
-
#if HAVE_LOCALE_H
#include <locale.h>
#endif
+#include <ctype.h>
+#include <string.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
#if defined(HAVE_NCURSESW_TERM_H)
#include <ncursesw/term.h>
@@ -51,6 +49,7 @@
#include <term.h>
#endif
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 7073954..9e2c856 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -23,13 +23,12 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
#include <errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/method.cc b/dselect/method.cc
index b1d9878..7674732 100644
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -23,25 +23,24 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/file.h>
#include <sys/wait.h>
+
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <ctype.h>
-#include <assert.h>
-#include <unistd.h>
+#include <string.h>
#include <fcntl.h>
-#include <sys/file.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/subproc.h>
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index d9a290c..9880ff7 100644
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -22,21 +22,21 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
+
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <ctype.h>
-#include <assert.h>
+#include <string.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index 659850a..7035521 100644
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -22,8 +22,8 @@
#include <config.h>
#include <compat.h>
-#include <stdio.h>
#include <string.h>
+#include <stdio.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 3e00393..ef9c82a 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -22,9 +22,9 @@
#include <config.h>
#include <compat.h>
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
+#include <string.h>
+#include <stdio.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index fda1107..6c30341 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -22,11 +22,10 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 61ca693..92211d3 100644
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -22,12 +22,11 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index 53535d0..5ee8080 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -23,14 +23,13 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <assert.h>
#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 64696bf..01e6e65 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -22,12 +22,11 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index d3765fe..94278c5 100644
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -22,13 +22,12 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
#include <assert.h>
#include <ctype.h>
+#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/compat/alphasort.c b/lib/compat/alphasort.c
index 7d50c7c..7e455d5 100644
--- a/lib/compat/alphasort.c
+++ b/lib/compat/alphasort.c
@@ -20,8 +20,8 @@
#include <config.h>
-#include <dirent.h>
#include <string.h>
+#include <dirent.h>
#ifndef HAVE_ALPHASORT
int
diff --git a/lib/compat/scandir.c b/lib/compat/scandir.c
index b8854c7..68c24c6 100644
--- a/lib/compat/scandir.c
+++ b/lib/compat/scandir.c
@@ -21,9 +21,10 @@
#include <config.h>
#include <sys/types.h>
+
+#include <string.h>
#include <dirent.h>
#include <stdlib.h>
-#include <string.h>
#ifndef HAVE_SCANDIR
int
diff --git a/lib/compat/unsetenv.c b/lib/compat/unsetenv.c
index 20b4fc0..33f2df5 100644
--- a/lib/compat/unsetenv.c
+++ b/lib/compat/unsetenv.c
@@ -20,8 +20,8 @@
#include <config.h>
-#include <stdlib.h>
#include <string.h>
+#include <stdlib.h>
#ifndef HAVE_UNSETENV
int
diff --git a/lib/compat/vsnprintf.c b/lib/compat/vsnprintf.c
index 72e88d8..ab6dd3f 100644
--- a/lib/compat/vsnprintf.c
+++ b/lib/compat/vsnprintf.c
@@ -21,9 +21,9 @@
#include <config.h>
+#include <unistd.h>
#include <stdarg.h>
#include <stdio.h>
-#include <unistd.h>
#ifndef HAVE_VSNPRINTF
int
diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c
index 92d2fa7..eb8b9ba 100644
--- a/lib/dpkg/buffer.c
+++ b/lib/dpkg/buffer.c
@@ -24,15 +24,15 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <sys/types.h>
+
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/varbuf.h>
#include <dpkg/md5.h>
diff --git a/lib/dpkg/cleanup.c b/lib/dpkg/cleanup.c
index d7afe63..f4561f4 100644
--- a/lib/dpkg/cleanup.c
+++ b/lib/dpkg/cleanup.c
@@ -22,9 +22,9 @@
#include <config.h>
#include <compat.h>
-#include <stdio.h>
-#include <unistd.h>
#include <dirent.h>
+#include <unistd.h>
+#include <stdio.h>
#include <dpkg/dpkg.h>
diff --git a/lib/dpkg/compression.c b/lib/dpkg/compression.c
index 2fa0476..827b2a3 100644
--- a/lib/dpkg/compression.c
+++ b/lib/dpkg/compression.c
@@ -1,12 +1,10 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
#ifdef WITH_ZLIB
#include <zlib.h>
@@ -15,6 +13,7 @@
#include <bzlib.h>
#endif
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/buffer.h>
diff --git a/lib/dpkg/database.c b/lib/dpkg/database.c
index 39924e1..28c54e0 100644
--- a/lib/dpkg/database.c
+++ b/lib/dpkg/database.c
@@ -18,15 +18,15 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c
index 0d8ed32..5399167 100644
--- a/lib/dpkg/dbmodify.c
+++ b/lib/dpkg/dbmodify.c
@@ -19,26 +19,27 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
+
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <ctype.h>
+#include <string.h>
#include <time.h>
-#include <assert.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index f5d7fca..1f54ed0 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -23,15 +23,16 @@
#ifndef DPKG_DB_H
#define DPKG_DB_H
+#include <sys/types.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+
#include <dpkg/macros.h>
#include <dpkg/varbuf.h>
DPKG_BEGIN_DECLS
-#include <sys/types.h>
-#include <stdbool.h>
-#include <stdio.h>
-
struct versionrevision {
unsigned long epoch;
const char *version;
diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h
index afe650f..78a2fe6 100644
--- a/lib/dpkg/dpkg.h
+++ b/lib/dpkg/dpkg.h
@@ -23,22 +23,21 @@
#ifndef DPKG_H
#define DPKG_H
-#include <dpkg/macros.h>
-
-DPKG_BEGIN_DECLS
-
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-
#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif
+#include <sys/types.h>
+#include <setjmp.h>
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
#define MAXCONFFILENAME 1000
#define MAXDIVERTFILENAME 1024
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index 33d0b1c..f901572 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -24,18 +24,18 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <assert.h>
#include <errno.h>
-#include <unistd.h>
#include <ctype.h>
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/parsedump.h>
diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c
index 2951dc1..1cdbf0e 100644
--- a/lib/dpkg/ehandle.c
+++ b/lib/dpkg/ehandle.c
@@ -18,20 +18,20 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <assert.h>
#include <errno.h>
+#include <string.h>
#include <unistd.h>
#include <stdarg.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index 0f21fe1..9caaef9 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -19,15 +19,15 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
#include <ctype.h>
#include <string.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/path.h>
diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c
index c69e34b..000befa 100644
--- a/lib/dpkg/file.c
+++ b/lib/dpkg/file.c
@@ -25,6 +25,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+
#include <errno.h>
#include <unistd.h>
diff --git a/lib/dpkg/lock.c b/lib/dpkg/lock.c
index 0985a76..1288df0 100644
--- a/lib/dpkg/lock.c
+++ b/lib/dpkg/lock.c
@@ -18,20 +18,20 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/file.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
#include <assert.h>
+#include <errno.h>
+#include <string.h>
#include <fcntl.h>
-#include <sys/file.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/log.c b/lib/dpkg/log.c
index 1cc7452..430de2d 100644
--- a/lib/dpkg/log.c
+++ b/lib/dpkg/log.c
@@ -22,15 +22,14 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <assert.h>
+#include <errno.h>
+#include <time.h>
+#include <unistd.h>
#include <stdarg.h>
#include <stdio.h>
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/md5.c b/lib/dpkg/md5.c
index 2ce0575..d6f9577 100644
--- a/lib/dpkg/md5.c
+++ b/lib/dpkg/md5.c
@@ -23,9 +23,10 @@
#include <config.h>
#include <compat.h>
-#include <string.h> /* for memcpy() */
#include <sys/types.h> /* for stupid systems */
+#include <string.h> /* for memcpy() */
+
#include "md5.h"
#ifdef WORDS_BIGENDIAN
diff --git a/lib/dpkg/mlib.c b/lib/dpkg/mlib.c
index eee1c50..cb2e5f0 100644
--- a/lib/dpkg/mlib.c
+++ b/lib/dpkg/mlib.c
@@ -22,18 +22,17 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
#include <errno.h>
+#include <string.h>
#include <fcntl.h>
+#include <signal.h>
#include <unistd.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/myopt-util.c b/lib/dpkg/myopt-util.c
index e976616..be89d51 100644
--- a/lib/dpkg/myopt-util.c
+++ b/lib/dpkg/myopt-util.c
@@ -18,15 +18,15 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/buffer.h>
#include <dpkg/myopt.h>
diff --git a/lib/dpkg/myopt.c b/lib/dpkg/myopt.c
index 63cd931..46d7fac 100644
--- a/lib/dpkg/myopt.c
+++ b/lib/dpkg/myopt.c
@@ -20,18 +20,18 @@
* License along with this file; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <string.h>
#include <errno.h>
#include <ctype.h>
+#include <string.h>
#include <dirent.h>
#include <stdarg.h>
#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/string.h>
#include <dpkg/myopt.h>
diff --git a/lib/dpkg/nfmalloc.c b/lib/dpkg/nfmalloc.c
index f5084ec..4a0c436 100644
--- a/lib/dpkg/nfmalloc.c
+++ b/lib/dpkg/nfmalloc.c
@@ -18,15 +18,15 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
#include <string.h>
+#include <stdlib.h>
#include <obstack.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c
index 1297e4f..dd23886 100644
--- a/lib/dpkg/parse.c
+++ b/lib/dpkg/parse.c
@@ -18,34 +18,32 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-
-
#include <sys/types.h>
#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
+#ifdef HAVE_MMAP
+#include <sys/mman.h>
+#endif
+
#include <assert.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/parsedump.h>
#include <dpkg/buffer.h>
-#ifdef HAVE_MMAP
-#include <sys/mman.h>
-#endif
-
const struct fieldinfo fieldinfos[]= {
/* NB: capitalisation of these strings is important. */
{ "Package", f_name, w_name
},
diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c
index 72a73a5..1dd7382 100644
--- a/lib/dpkg/parsehelp.c
+++ b/lib/dpkg/parsehelp.c
@@ -18,16 +18,16 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/string.h>
diff --git a/lib/dpkg/path.c b/lib/dpkg/path.c
index efe477d..ad32aa7 100644
--- a/lib/dpkg/path.c
+++ b/lib/dpkg/path.c
@@ -23,8 +23,8 @@
#include <config.h>
#include <compat.h>
-#include <stdio.h>
#include <string.h>
+#include <stdio.h>
#include <dpkg/path.h>
diff --git a/lib/dpkg/path.h b/lib/dpkg/path.h
index 5eb069b..861b40f 100644
--- a/lib/dpkg/path.h
+++ b/lib/dpkg/path.h
@@ -22,12 +22,12 @@
#ifndef DPKG_PATH_H
#define DPKG_PATH_H
-#include <dpkg/macros.h>
-
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
+#include <dpkg/macros.h>
+
DPKG_BEGIN_DECLS
size_t path_rtrim_slash_slashdot(char *path);
diff --git a/lib/dpkg/progress.c b/lib/dpkg/progress.c
index cffa1eb..fabd6b7 100644
--- a/lib/dpkg/progress.c
+++ b/lib/dpkg/progress.c
@@ -23,11 +23,11 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <unistd.h>
#include <stdio.h>
+#include <dpkg/i18n.h>
+
#include "progress.h"
void
diff --git a/lib/dpkg/showpkg.c b/lib/dpkg/showpkg.c
index 86cf8e1..cc2369b 100644
--- a/lib/dpkg/showpkg.c
+++ b/lib/dpkg/showpkg.c
@@ -21,12 +21,11 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/parsedump.h>
diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c
index 38dd953..5a42bf8 100644
--- a/lib/dpkg/subproc.c
+++ b/lib/dpkg/subproc.c
@@ -22,15 +22,15 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <sys/types.h>
#include <sys/wait.h>
+
#include <errno.h>
-#include <stdio.h>
#include <string.h>
#include <signal.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/subproc.h>
diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c
index 301f76e..1e97a9c 100644
--- a/lib/dpkg/tarfn.c
+++ b/lib/dpkg/tarfn.c
@@ -8,13 +8,13 @@
#include <config.h>
#include <compat.h>
-#include <stdlib.h>
+#include <errno.h>
#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
#include <pwd.h>
#include <grp.h>
-#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <dpkg/macros.h>
#include <dpkg/dpkg.h>
diff --git a/lib/dpkg/tarfn.h b/lib/dpkg/tarfn.h
index 8c126f3..6a9e527 100644
--- a/lib/dpkg/tarfn.h
+++ b/lib/dpkg/tarfn.h
@@ -8,10 +8,11 @@
* This is free software under the GNU General Public License.
*/
-#include <stdlib.h>
-#include <unistd.h>
#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+
enum tar_format {
tar_format_old,
tar_format_gnu,
diff --git a/lib/dpkg/test.h b/lib/dpkg/test.h
index 646a7da..303ebad 100644
--- a/lib/dpkg/test.h
+++ b/lib/dpkg/test.h
@@ -25,13 +25,13 @@
#include <config.h>
#include <compat.h>
+#include <assert.h>
+#include <string.h>
+
#ifndef TEST_MAIN_PROVIDED
#include <dpkg/dpkg.h>
#endif
-#include <assert.h>
-#include <string.h>
-
/* XXX: Using assert is problematic with NDEBUG. */
#define test_pass(a) assert((a))
diff --git a/lib/dpkg/test/t-buffer.c b/lib/dpkg/test/t-buffer.c
index 00bd7f0..5c3caf4 100644
--- a/lib/dpkg/test/t-buffer.c
+++ b/lib/dpkg/test/t-buffer.c
@@ -19,11 +19,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <stdio.h>
+
#include <dpkg/test.h>
#include <dpkg/buffer.h>
-#include <stdio.h>
-
static void
test_buffer_hash(void)
{
diff --git a/lib/dpkg/test/t-path.c b/lib/dpkg/test/t-path.c
index 4dcd140..d2dabaa 100644
--- a/lib/dpkg/test/t-path.c
+++ b/lib/dpkg/test/t-path.c
@@ -19,11 +19,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <stdlib.h>
+
#include <dpkg/test.h>
#include <dpkg/path.h>
-#include <stdlib.h>
-
/* Use the test_trim_eq_ref macro to avoid leaking the string and to get
* meaningful line numbers from assert. */
#define test_trim_eq_ref(p, ref) \
diff --git a/lib/dpkg/test/t-string.c b/lib/dpkg/test/t-string.c
index e2b957e..5e653c1 100644
--- a/lib/dpkg/test/t-string.c
+++ b/lib/dpkg/test/t-string.c
@@ -19,11 +19,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <string.h>
+
#include <dpkg/test.h>
#include <dpkg/string.h>
-#include <string.h>
-
static void
test_str_escape_fmt(void)
{
diff --git a/lib/dpkg/trigdeferred.l b/lib/dpkg/trigdeferred.l
index 9b6f6a4..04b5461 100644
--- a/lib/dpkg/trigdeferred.l
+++ b/lib/dpkg/trigdeferred.l
@@ -37,11 +37,10 @@
#include <config.h>
-#include <dpkg/i18n.h>
-
#include <sys/stat.h>
#include <sys/fcntl.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index 88e8c93..74edf0a 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -23,15 +23,14 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <assert.h>
-#include <unistd.h>
#include <errno.h>
+#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/pkg-list.h>
diff --git a/lib/dpkg/utils.c b/lib/dpkg/utils.c
index 7ab36fb..caea8e5 100644
--- a/lib/dpkg/utils.c
+++ b/lib/dpkg/utils.c
@@ -21,10 +21,9 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <string.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
/* Reimplementation of the standard ctype.h is* functions. Since gettext
diff --git a/lib/dpkg/varbuf.c b/lib/dpkg/varbuf.c
index 7c6edab..a4f3812 100644
--- a/lib/dpkg/varbuf.c
+++ b/lib/dpkg/varbuf.c
@@ -19,16 +19,17 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <stdlib.h>
#include <string.h>
+#include <stdlib.h>
#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
-#include <dpkg/i18n.h>
void
varbufaddc(struct varbuf *v, int c)
diff --git a/lib/dpkg/vercmp.c b/lib/dpkg/vercmp.c
index 85c7a9e..0433b77 100644
--- a/lib/dpkg/vercmp.c
+++ b/lib/dpkg/vercmp.c
@@ -18,6 +18,7 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index c14290f..a28b177 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -53,10 +53,9 @@ AS_IF([test "x$dpkg_cv_attribute" = "xyes"],
# Try compiling some C99 code to see whether it works
AC_DEFUN([DPKG_TRY_C99],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <stdio.h>
-#include <stdbool.h>
#include <inttypes.h>
-
+#include <stdbool.h>
+#include <stdio.h>
/* Variadic macro arguments */
#define variadic_macro(foo, ...) printf(foo, __VA_ARGS__)
diff --git a/src/archives.c b/src/archives.c
index 48221a7..f8c2d2f 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -19,28 +19,28 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
#include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <utime.h>
-#include <assert.h>
#include <time.h>
-#include <ctype.h>
+#include <utime.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <obstack.h>
#define obstack_chunk_alloc m_malloc
#define obstack_chunk_free free
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/path.h>
diff --git a/src/cleanup.c b/src/cleanup.c
index ff71fd8..c8bab0a 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -18,23 +18,24 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <utime.h>
#include <time.h>
-#include <ctype.h>
+#include <utime.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/tarfn.h>
diff --git a/src/configure.c b/src/configure.c
index 72d15de..b309a31 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -23,27 +23,25 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/termios.h>
+#include <assert.h>
#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
+#include <ctype.h>
#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <time.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <dirent.h>
-#include <ctype.h>
+#include <signal.h>
#include <unistd.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <sys/termios.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/buffer.h>
diff --git a/src/depcon.c b/src/depcon.c
index cf1af9c..3d77dbe 100644
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -18,17 +18,18 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
#include <errno.h>
#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <assert.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/src/divertdb.c b/src/divertdb.c
index bd01af9..897da26 100644
--- a/src/divertdb.c
+++ b/src/divertdb.c
@@ -23,19 +23,18 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <sys/types.h>
#include <sys/stat.h>
+#include <errno.h>
+#include <string.h>
#include <pwd.h>
#include <grp.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/src/enquiry.c b/src/enquiry.c
index 2a6fb1b..b314ca0 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -23,20 +23,20 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <unistd.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
+#include <sys/stat.h>
#include <sys/termios.h>
+
+#include <assert.h>
+#include <string.h>
#include <fcntl.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/src/errors.c b/src/errors.c
index 01f696d..7ba302b 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -18,24 +18,25 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
+
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
#include <ctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/src/filesdb.c b/src/filesdb.c
index d328d55..0cc0791 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -19,23 +19,23 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
#include <errno.h>
-#include <sys/stat.h>
-
+#include <string.h>
#include <pwd.h>
#include <grp.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/path.h>
diff --git a/src/help.c b/src/help.c
index 62221ce..3b76455 100644
--- a/src/help.c
+++ b/src/help.c
@@ -18,22 +18,23 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
#include <assert.h>
+#include <errno.h>
#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
#include <time.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/path.h>
diff --git a/src/main.c b/src/main.c
index 78c34c3..f424e56 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,31 +19,31 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/wait.h>
+
#include <errno.h>
-#include <unistd.h>
-#include <dirent.h>
#include <limits.h>
-#include <ctype.h>
-#include <fcntl.h>
-
#if HAVE_LOCALE_H
#include <locale.h>
#endif
+#include <ctype.h>
+#include <string.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <signal.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/src/packages.c b/src/packages.c
index d9badd8..4105324 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -18,24 +18,23 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
-#include <stdio.h>
+#include <assert.h>
+#include <ctype.h>
#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <dirent.h>
-#include <ctype.h>
#include <unistd.h>
-#include <string.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/pkg-list.h>
diff --git a/src/pkg-show.c b/src/pkg-show.c
index 5563d51..5b5f3f0 100644
--- a/src/pkg-show.c
+++ b/src/pkg-show.c
@@ -22,11 +22,10 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <string.h>
#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/src/processarc.c b/src/processarc.c
index 2d6f320..f29d356 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -18,26 +18,27 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <assert.h>
#include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <utime.h>
-#include <assert.h>
#include <time.h>
-#include <ctype.h>
-#include <dirent.h>
+#include <utime.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/buffer.h>
diff --git a/src/query.c b/src/query.c
index 958cd44..4f790bc 100644
--- a/src/query.c
+++ b/src/query.c
@@ -20,27 +20,27 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fnmatch.h>
-#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/termios.h>
-#include <fcntl.h>
-#include <dirent.h>
#if HAVE_LOCALE_H
#include <locale.h>
#endif
+#include <string.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <fnmatch.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/pkg-array.h>
diff --git a/src/remove.c b/src/remove.c
index 44ff139..5e44a3b 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -18,25 +18,24 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
#include <errno.h>
-#include <stdio.h>
+#include <ctype.h>
#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <dirent.h>
-#include <ctype.h>
#include <unistd.h>
-#include <string.h>
-#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/src/select.c b/src/select.c
index 5371d4b..517f638 100644
--- a/src/select.c
+++ b/src/select.c
@@ -18,17 +18,17 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <fnmatch.h>
#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/pkg-array.h>
diff --git a/src/statcmd.c b/src/statcmd.c
index 3c25220..dd7ff7b 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -23,23 +23,23 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <sys/types.h>
#include <sys/stat.h>
+
#include <errno.h>
-#include <signal.h>
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+#include <string.h>
#include <grp.h>
#include <pwd.h>
#include <fnmatch.h>
+#include <signal.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
-#if HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/path.h>
diff --git a/src/statdb.c b/src/statdb.c
index 16bf4b1..574849d 100644
--- a/src/statdb.c
+++ b/src/statdb.c
@@ -23,19 +23,18 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
+#include <sys/types.h>
#include <sys/stat.h>
+#include <errno.h>
+#include <string.h>
#include <pwd.h>
#include <grp.h>
-#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/buffer.h>
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 89c7d18..53bd678 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -22,22 +22,21 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/ioctl.h>
+#include <sys/stat.h>
#include <sys/termios.h>
-#include <fcntl.h>
+#include <fcntl.h>
#if HAVE_LOCALE_H
#include <locale.h>
#endif
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/src/trigproc.c b/src/trigproc.c
index 597d2da..a114369 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -23,13 +23,13 @@
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
+#include <sys/fcntl.h>
+#include <sys/stat.h>
#include <assert.h>
#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
diff --git a/src/update.c b/src/update.c
index 1fed097..b8d7449 100644
--- a/src/update.c
+++ b/src/update.c
@@ -18,17 +18,17 @@
* License along with dpkg; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <config.h>
#include <compat.h>
-#include <dpkg/i18n.h>
-
#include <errno.h>
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <dpkg/i18n.h>
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/myopt.h>
diff --git a/utils/install-info.c b/utils/install-info.c
index f1bd2dd..83e8aac 100644
--- a/utils/install-info.c
+++ b/utils/install-info.c
@@ -20,11 +20,11 @@
#include <config.h>
-#include <unistd.h>
#include <errno.h>
#include <string.h>
-#include <stdio.h>
+#include <unistd.h>
#include <stdlib.h>
+#include <stdio.h>
#define SELF "/usr/sbin/install-info"
#define WRAPPED "/usr/bin/install-info"
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index e7bb2a4..2cb4519 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -44,6 +44,14 @@
#define MIN_POLL_INTERVAL 20000 /* µs */
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif
+
#if defined(OSHurd)
#include <hurd.h>
#include <ps.h>
@@ -52,17 +60,15 @@
#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
#include <sys/param.h>
#include <sys/proc.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#include <err.h>
-#include <limits.h>
#endif
#ifdef HAVE_KVM_H
-#include <kvm.h>
#include <sys/sysctl.h>
#include <sys/user.h>
+
+#include <kvm.h>
#endif
#if defined(OShpux)
@@ -70,50 +76,42 @@
#include <sys/pstat.h>
#endif
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <dirent.h>
+#include <sys/types.h>
#include <sys/time.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <grp.h>
+#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <sys/types.h>
#include <sys/termios.h>
-#include <fcntl.h>
-#include <limits.h>
+
#include <assert.h>
+#include <errno.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <dirent.h>
#include <ctype.h>
-
-#ifdef _POSIX_PRIORITY_SCHEDULING
-#include <sched.h>
-#else
-#define SCHED_OTHER -1
-#define SCHED_FIFO -1
-#define SCHED_RR -1
-#endif
-
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-
+#include <string.h>
+#include <pwd.h>
+#include <grp.h>
+#include <signal.h>
+#include <unistd.h>
#ifdef HAVE_STDDEF_H
#include <stddef.h>
#endif
+#include <stdbool.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <getopt.h>
#ifdef HAVE_ERROR_H
#include <error.h>
#endif
-#ifdef HAVE_SYS_SYSCALL_H
-#include <sys/syscall.h>
+#ifdef _POSIX_PRIORITY_SCHEDULING
+#include <sched.h>
+#else
+#define SCHED_OTHER -1
+#define SCHED_FIFO -1
+#define SCHED_RR -1
#endif
#if defined(OSLinux)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
