libalpm util.c and util.h cleanup

* Remove some unnecessary conditional compiling in util.h- move the
  functions tha required it to trans.c (along with a bunch of new header
  includes).
* Clean up util.h a bit- remove some header includes, remove universal
  libarchive include and only put it in the files that need it.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 1 insertions, 13 deletions

diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h
index 0584b73b..b98d8a7a 100644
--- a/lib/libalpm/util.h
+++ b/lib/libalpm/util.h
@@ -27,15 +27,12 @@
 
 #include <stdio.h>
 #include <libintl.h> /* here so it doesn't need to be included elsewhere */
-#include <archive.h>
-#include <archive_entry.h>
+#include <time.h>
 
 #define FREE(p) do { if (p) { free(p); p = NULL; } } while(0)
 
 #define ASSERT(cond, action) do { if(!(cond)) { action; } } while(0)
 
-#define ARCHIVE_EXTRACT_FLAGS ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | ARCHIVE_EXTRACT_TIME
-
 /* define _() as shortcut for gettext() */
 #ifdef ENABLE_NLS
 #define _(str) dgettext ("libalpm", str)
@@ -57,15 +54,6 @@ int _alpm_unpack(const char *archive, const char *prefix, const char *fn);
 int _alpm_rmrf(const char *path);
 int _alpm_logaction(unsigned short usesyslog, FILE *f, const char *str);
 int _alpm_ldconfig(const char *root);
-/* TODO wtf? this can't be right */
-#ifdef _ALPM_TRANS_H
-int _alpm_runscriptlet(const char *root, const char *installfn,
-											 const char *script, const char *ver,
-											 const char *oldver, pmtrans_t *trans);
-#ifndef __sun__
-int _alpm_check_freespace(pmtrans_t *trans, alpm_list_t **data);
-#endif
-#endif
 void _alpm_time2string(time_t t, char *buffer);
 int _alpm_str_cmp(const void *s1, const void *s2);