Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e6975d243b564af1e17ea99ab3f909a17d3e9f78
commit e6975d243b564af1e17ea99ab3f909a17d3e9f78
Author: Michel Hermier <herm...@frugalware.org>
Date: Thu Dec 12 19:20:15 2013 +0100
libpacman: Rework include orders.
diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
index a1fc883..4255a67 100644
--- a/lib/libpacman/add.c
+++ b/lib/libpacman/add.c
@@ -25,25 +25,9 @@
#include "config.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
/* pacman-g2 */
#include "add.h"
-#include "db/fakedb.h"
-#include "hash/md5.h"
-#include "hash/sha1.h"
-#include "io/archive.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
-#include "fstdlib.h"
-#include "fstring.h"
#include "util.h"
#include "error.h"
#include "cache.h"
@@ -57,6 +41,21 @@
#include "packages_transaction.h"
#include "trans.h"
+#include "db/fakedb.h"
+#include "hash/md5.h"
+#include "hash/sha1.h"
+#include "io/archive.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstdlib.h"
+#include "fstring.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <time.h>
+
pmpkg_t *_pacman_filedb_load(pmdb_t *db, const char *name)
{
struct stat buf;
diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c
index 7137e87..55f9816 100644
--- a/lib/libpacman/conflict.c
+++ b/lib/libpacman/conflict.c
@@ -25,24 +25,24 @@
#include "config.h"
-#include <sys/stat.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
/* pacman-g2 */
#include "conflict.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
-#include "fstdlib.h"
#include "util.h"
#include "error.h"
#include "cache.h"
#include "deps.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstdlib.h"
+
+#include <sys/stat.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+
/* Returns a pmlist_t* of pmdepmissing_t pointers.
*
* conflicts are always name only
diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index 8b92408..f768837 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -25,18 +25,16 @@
#include "config.h"
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
-#include <limits.h> /* PATH_MAX */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
/* pacman-g2 */
#include "db.h"
+#include "util.h"
+#include "error.h"
+#include "server.h"
+#include "handle.h"
+#include "cache.h"
+#include "pacman.h"
+
#include "db/localdb.h"
#include "db/syncdb.h"
#include "io/ftp.h"
@@ -45,12 +43,15 @@
#include "util/time.h"
#include "fstdlib.h"
#include "fstring.h"
-#include "util.h"
-#include "error.h"
-#include "server.h"
-#include "handle.h"
-#include "cache.h"
-#include "pacman.h"
+
+#include <sys/stat.h>
+#include <dirent.h>
+#include <errno.h>
+#include <limits.h> /* PATH_MAX */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
static int _pacman_db_getlastupdate(pmdb_t *db, char *ts);
static int _pacman_db_setlastupdate(pmdb_t *db, const char *ts);
diff --git a/lib/libpacman/db/fakedb.c b/lib/libpacman/db/fakedb.c
index 5dddad4..9315a59 100644
--- a/lib/libpacman/db/fakedb.c
+++ b/lib/libpacman/db/fakedb.c
@@ -25,16 +25,17 @@
#include "config.h"
-#include <time.h>
-
/* pacman-g2 */
#include "fakedb.h"
-#include "util/list.h"
-#include "util/stringlist.h"
#include "package.h"
#include "util.h"
+#include "util/list.h"
+#include "util/stringlist.h"
+
+#include <time.h>
+
static pmpkg_t *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name)
{
char *ptr, *p;
diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c
index f089cfa..9eeaa36 100644
--- a/lib/libpacman/db/localdb.c
+++ b/lib/libpacman/db/localdb.c
@@ -22,22 +22,9 @@
#include "config.h"
-#include <sys/stat.h>
-#include <dirent.h>
-#include <errno.h>
-#include <limits.h> /* PATH_MAX */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
/* pacman-g2 */
#include "db/localdb.h"
-#include "db/localdb_files.h"
-#include "util/log.h"
-#include "util/stringlist.h"
-#include "fstring.h"
#include "util.h"
#include "db.h"
#include "package.h"
@@ -45,6 +32,19 @@
#include "error.h"
#include "handle.h"
+#include "db/localdb_files.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstring.h"
+
+#include <sys/stat.h>
+#include <dirent.h>
+#include <errno.h>
+#include <limits.h> /* PATH_MAX */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
static
pmpkg_t *_pacman_localdb_pkg_new(pmdb_t *db, const struct dirent *dirent,
unsigned int inforeq)
{
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index ef459b5..542464f 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -24,17 +24,9 @@
#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/* pacman-g2 */
#include "trans.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
-#include "fstdlib.h"
#include "error.h"
#include "package.h"
#include "util.h"
@@ -47,6 +39,15 @@
#include "trans_sysupgrade.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstdlib.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
static int check_oldcache(void)
{
pmdb_t *db = handle->db_local;
diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c
index 3e4b462..c911914 100644
--- a/lib/libpacman/util.c
+++ b/lib/libpacman/util.c
@@ -23,37 +23,8 @@
* USA.
*/
-#if defined(__APPLE__) || defined(__OpenBSD__)
-#include <sys/syslimits.h>
-#endif
-#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__sun__)
-#include <sys/stat.h>
-#endif
-
#include "config.h"
-#include <libgen.h> /* basename (MUST be before string.h to import the posix
version instead of the GNU) */
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef __sun__
-#include <alloca.h>
-#endif
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <sys/wait.h>
-#ifdef CYGWIN
-#include <limits.h> /* PATH_MAX */
-#endif
-#include <sys/statvfs.h>
-#ifndef __sun__
-#include <mntent.h>
-#endif
-#include <regex.h>
-
/* pacman-g2 */
#include "util.h"
@@ -67,6 +38,20 @@
#include "error.h"
#include "pacman.h"
+#include <sys/wait.h>
+#include <sys/statvfs.h>
+#include <alloca.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h> /* PATH_MAX */
+#include <mntent.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
#ifdef __sun__
/* This is a replacement for strsep which is not portable (missing on Solaris).
* Copyright (c) 2001 by François Gouget <fgouget_at_codeweavers.com> */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
