Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2d1c937637d16371b70fa3b0ac357c7fbe609e69
commit 2d1c937637d16371b70fa3b0ac357c7fbe609e69
Author: Michel Hermier <herm...@frugalware.org>
Date: Wed Dec 11 13:50:05 2013 +0100
libpacman: Remove fstdlib.h and fstring.h includes from util.h (reorder
includes while at it).
diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c
index ded0dc3..a1fc883 100644
--- a/lib/libpacman/add.c
+++ b/lib/libpacman/add.c
@@ -42,7 +42,8 @@
#include "util/list.h"
#include "util/log.h"
#include "util/stringlist.h"
-#include "trans.h"
+#include "fstdlib.h"
+#include "fstring.h"
#include "util.h"
#include "error.h"
#include "cache.h"
@@ -54,6 +55,7 @@
#include "remove.h"
#include "handle.h"
#include "packages_transaction.h"
+#include "trans.h"
pmpkg_t *_pacman_filedb_load(pmdb_t *db, const char *name)
{
diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c
index ecf86a4..1770d7a 100644
--- a/lib/libpacman/cache.c
+++ b/lib/libpacman/cache.c
@@ -36,6 +36,7 @@
#include "util/list.h"
#include "util/log.h"
#include "util/stringlist.h"
+#include "fstring.h"
#include "pacman.h"
#include "util.h"
#include "package.h"
diff --git a/lib/libpacman/config_parser.c b/lib/libpacman/config_parser.c
index 5528fdf..b442472 100644
--- a/lib/libpacman/config_parser.c
+++ b/lib/libpacman/config_parser.c
@@ -46,6 +46,7 @@
#include "util/list.h"
#include "util/log.h"
#include "util/stringlist.h"
+#include "fstring.h"
#include "error.h"
#include "deps.h"
#include "versioncmp.h"
diff --git a/lib/libpacman/conflict.c b/lib/libpacman/conflict.c
index f721994..7137e87 100644
--- a/lib/libpacman/conflict.c
+++ b/lib/libpacman/conflict.c
@@ -37,6 +37,7 @@
#include "util/list.h"
#include "util/log.h"
#include "util/stringlist.h"
+#include "fstdlib.h"
#include "util.h"
#include "error.h"
#include "cache.h"
diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index c446145..8b92408 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -43,6 +43,8 @@
#include "util/list.h"
#include "util/log.h"
#include "util/time.h"
+#include "fstdlib.h"
+#include "fstring.h"
#include "util.h"
#include "error.h"
#include "server.h"
diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c
index 485e41f..f089cfa 100644
--- a/lib/libpacman/db/localdb.c
+++ b/lib/libpacman/db/localdb.c
@@ -37,6 +37,7 @@
#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"
diff --git a/lib/libpacman/db/syncdb.c b/lib/libpacman/db/syncdb.c
index cffc7de..0b30c37 100644
--- a/lib/libpacman/db/syncdb.c
+++ b/lib/libpacman/db/syncdb.c
@@ -39,6 +39,7 @@
#include "util/log.h"
#include "util/stringlist.h"
#include "util/time.h"
+#include "fstring.h"
#include "util.h"
#include "cache.h"
#include "db.h"
diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c
index 6a91641..bd25fa3 100644
--- a/lib/libpacman/deps.c
+++ b/lib/libpacman/deps.c
@@ -33,6 +33,8 @@
#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 "package.h"
diff --git a/lib/libpacman/group.c b/lib/libpacman/group.c
index 2854b90..e3d56b2 100644
--- a/lib/libpacman/group.c
+++ b/lib/libpacman/group.c
@@ -21,18 +21,15 @@
#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* pacman-g2 */
#include "group.h"
-#include "util/list.h"
-#include "util.h"
-#include "error.h"
#include "pacman.h"
+#include "util/list.h"
+#include "fstdlib.h"
+
+#include <string.h>
+
pmgrp_t *_pacman_grp_new()
{
pmgrp_t* grp = _pacman_zalloc(sizeof(pmgrp_t));
diff --git a/lib/libpacman/handle.c b/lib/libpacman/handle.c
index 68f2f5d..8eaa6ce 100644
--- a/lib/libpacman/handle.c
+++ b/lib/libpacman/handle.c
@@ -23,28 +23,28 @@
#include "config.h"
-#include <sys/types.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <time.h>
-#include <unistd.h>
-
-/* pacman-g2 */
#include "handle.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
#include "error.h"
#include "trans.h"
#include "pacman.h"
#include "server.h"
#include "util.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstdlib.h"
+#include "fstring.h"
+
+#include <sys/types.h>
+#include <limits.h>
+#include <locale.h>
+#include <stdarg.h>
+#include <syslog.h>
+#include <time.h>
+#include <unistd.h>
+
pmhandle_t *_pacman_handle_new()
{
pmhandle_t *ph = _pacman_zalloc(sizeof(pmhandle_t));
diff --git a/lib/libpacman/io/archive.c b/lib/libpacman/io/archive.c
index 1d45913..049ec5f 100644
--- a/lib/libpacman/io/archive.c
+++ b/lib/libpacman/io/archive.c
@@ -29,6 +29,7 @@
#include "archive.h"
+#include "fstring.h"
#include "util.h"
struct archive *_pacman_archive_read_open_all_file(const char *file)
diff --git a/lib/libpacman/io/ffilelock.c b/lib/libpacman/io/ffilelock.c
index 288514b..46f436d 100644
--- a/lib/libpacman/io/ffilelock.c
+++ b/lib/libpacman/io/ffilelock.c
@@ -31,6 +31,7 @@
#include "io/ffilelock.h"
#include "fstdlib.h"
+#include "fstring.h"
#include "util.h"
struct FFileLock {
diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c
index 3d30f2d..f1fc2b3 100644
--- a/lib/libpacman/package.c
+++ b/lib/libpacman/package.c
@@ -24,21 +24,9 @@
#include "config.h"
-#include <sys/utsname.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
/* pacman-g2 */
#include "package.h"
-#include "io/archive.h"
-#include "package/pkginfo.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
#include "util.h"
#include "error.h"
#include "db.h"
@@ -46,6 +34,19 @@
#include "cache.h"
#include "pacman.h"
+#include "io/archive.h"
+#include "package/pkginfo.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstdlib.h"
+#include "fstring.h"
+
+#include <sys/utsname.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+
pmpkg_t *_pacman_pkg_new(const char *name, const char *version)
{
pmpkg_t* pkg = NULL;
diff --git a/lib/libpacman/package/pkginfo.c b/lib/libpacman/package/pkginfo.c
index 0cde4ae..e132e4b 100644
--- a/lib/libpacman/package/pkginfo.c
+++ b/lib/libpacman/package/pkginfo.c
@@ -35,6 +35,7 @@
#include "util/list.h"
#include "util/log.h"
#include "util/stringlist.h"
+#include "fstring.h"
#include "util.h"
#include "error.h"
#include "db.h"
diff --git a/lib/libpacman/packages_transaction.c
b/lib/libpacman/packages_transaction.c
index a7d5b97..d810cc5 100644
--- a/lib/libpacman/packages_transaction.c
+++ b/lib/libpacman/packages_transaction.c
@@ -23,9 +23,11 @@
#include "packages_transaction.h"
-#include "util/list.h"
#include "util.h"
+#include "util/list.h"
+#include "fstring.h"
+
static const char *trigger_function_table[STATE_MAX] = {
[STATE_COMMITED] = "commited",
};
diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c
index 6a629c2..d2ab5c3 100644
--- a/lib/libpacman/pacman.c
+++ b/lib/libpacman/pacman.c
@@ -24,27 +24,9 @@
#include "config.h"
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h> /* PATH_MAX */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
/* pacman-g2 */
#include "pacman.h"
-#include "db/syncdb.h"
-#include "hash/md5.h"
-#include "hash/sha1.h"
-#include "package/packagecache.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
#include "config_parser.h"
#include "error.h"
#include "deps.h"
@@ -61,6 +43,25 @@
#include "handle.h"
#include "server.h"
+#include "db/syncdb.h"
+#include "hash/md5.h"
+#include "hash/sha1.h"
+#include "package/packagecache.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstring.h"
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h> /* PATH_MAX */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
/* Globals */
pmhandle_t *handle = NULL;
enum __pmerrno_t pm_errno;
diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c
index 178d7e5..d82662a 100644
--- a/lib/libpacman/remove.c
+++ b/lib/libpacman/remove.c
@@ -25,19 +25,9 @@
#include "config.h"
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
/* pacman-g2 */
#include "remove.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
#include "trans.h"
#include "util.h"
#include "error.h"
@@ -50,6 +40,17 @@
#include "pacman.h"
#include "packages_transaction.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstring.h"
+
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+
int _pacman_remove_addtarget(pmtrans_t *trans, const char *name)
{
pmpkg_t *pkg_local;
diff --git a/lib/libpacman/server.c b/lib/libpacman/server.c
index 9a021ed..590c35f 100644
--- a/lib/libpacman/server.c
+++ b/lib/libpacman/server.c
@@ -21,30 +21,31 @@
#include "config.h"
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
-
-#include <curl.h>
-
/* pacman-g2 */
#include "server.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
-#include "util/time.h"
#include "error.h"
#include "pacman.h"
#include "util.h"
#include "handle.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "util/time.h"
+#include "fstdlib.h"
+#include "fstring.h"
+
+#include <curl.h>
+
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <time.h>
+
pacman_trans_cb_download pm_dlcb = NULL;
/* progress bar */
char *pm_dlfnm=NULL;
diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c
index 714791b..683a54f 100644
--- a/lib/libpacman/sync.c
+++ b/lib/libpacman/sync.c
@@ -24,22 +24,9 @@
#include "config.h"
-#include <dirent.h>
-#include <fcntl.h>
-#include <limits.h> /* PATH_MAX */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
/* pacman-g2 */
#include "sync.h"
-#include "hash/md5.h"
-#include "hash/sha1.h"
-#include "util/list.h"
-#include "util/log.h"
-#include "util/stringlist.h"
#include "error.h"
#include "package.h"
#include "db.h"
@@ -57,6 +44,21 @@
#include "server.h"
#include "packages_transaction.h"
+#include "hash/md5.h"
+#include "hash/sha1.h"
+#include "util/list.h"
+#include "util/log.h"
+#include "util/stringlist.h"
+#include "fstdlib.h"
+#include "fstring.h"
+
+#include <sys/stat.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <limits.h> /* PATH_MAX */
+#include <stdio.h>
+#include <time.h>
+
pmsyncpkg_t *_pacman_syncpkg_new(int type, pmpkg_t *spkg, void *data)
{
pmsyncpkg_t *ps = _pacman_malloc(sizeof(pmsyncpkg_t));
diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c
index 723b1ea..ef459b5 100644
--- a/lib/libpacman/trans.c
+++ b/lib/libpacman/trans.c
@@ -34,6 +34,7 @@
#include "util/list.h"
#include "util/log.h"
#include "util/stringlist.h"
+#include "fstdlib.h"
#include "error.h"
#include "package.h"
#include "util.h"
diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c
index b80e164..ef7ab92 100644
--- a/lib/libpacman/util.c
+++ b/lib/libpacman/util.c
@@ -60,6 +60,8 @@
#include "io/archive.h"
#include "util/list.h"
#include "util/log.h"
+#include "fstdlib.h"
+#include "fstring.h"
#include "trans.h"
#include "sync.h"
#include "error.h"
diff --git a/lib/libpacman/util.h b/lib/libpacman/util.h
index 9f3e174..25893d1 100644
--- a/lib/libpacman/util.h
+++ b/lib/libpacman/util.h
@@ -52,9 +52,6 @@
#define STARTSTR "START "
#define DONESTR "DONE "
-#include "fstdlib.h"
-#include "fstring.h"
-
char *_pacman_basename(const char *path);
int _pacman_makepath(char *path);
int _pacman_copyfile(char *src, char *dest);
diff --git a/lib/libpacman/util/log.c b/lib/libpacman/util/log.c
index 417c8ec..9d0f18c 100644
--- a/lib/libpacman/util/log.c
+++ b/lib/libpacman/util/log.c
@@ -29,6 +29,7 @@
#include "util/log.h"
#include "util/time.h"
+#include "fstring.h"
#include "util.h"
/* Internal library log mechanism */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
