Dan McGee <dpmcgee@gmail.com>

* Lots of code cleanup, and type fixes
* Make 'makeworld' a bit more in-line with the other stuff
* Make -Si and -Qi operations appear the same

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index 77f092bb..688fd009 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -40,7 +40,7 @@ include_HEADERS = alpm_list.h alpm.h
 libalpm_la_SOURCES = $(TARGETS)
 
 libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO)
-libalpm_la_LIBADD = -larchive -ldownload
+libalpm_la_LIBADD = -larchive -ldownload -lm
 
 if HAS_DOXYGEN
 all: doxygen.in
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 6bfaaada..3c06971e 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -566,7 +566,7 @@ char *alpm_pkg_name_hasarch(char *pkgname)
 	 * and
 	 *    package-name-bar-1.2.3-1
 	 */
-	int i = 0;
+	size_t i = 0;
 	char *arch, *cmp, *p;
 
 	if((p = strrchr(pkgname, '-'))) {
@@ -1008,7 +1008,7 @@ int alpm_parse_config(char *file, alpm_cb_db_register callback, const char *this
 						_alpm_log(PM_LOG_DEBUG, _("config: xfercommand: %s"), ptr);
 					} else if (!strcmp(key, "UPGRADEDELAY")) {
 						/* The config value is in days, we use seconds */
-						long ud = atol(ptr) * 60 * 60 *24;
+						time_t ud = atol(ptr) * 60 * 60 *24;
 						alpm_option_set_upgradedelay(ud);
 						_alpm_log(PM_LOG_DEBUG, _("config: upgradedelay: %d"), ud);
 					} else {
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 3393f01f..607dd673 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -249,9 +249,9 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
 				}
 				if(!_alpm_depcmp(tp, &depend)) {
 					_alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"),
-							depend.name, p->name);
+										depend.name, p->name);
 					miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod,
-							depend.name, depend.version);
+																	 depend.name, depend.version);
 					if(!_alpm_depmiss_isin(miss, baddeps)) {
 						baddeps = alpm_list_add(baddeps, miss);
 					} else {