summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-08-16 16:19:06 -0400
committerDan McGee <dan@archlinux.org>2007-08-16 16:19:06 -0400
commitfc65a9bcb1722ae9768518aa921c5f02cf282b96 (patch)
treec416161dc701dc803cbb02db6d693bd88464284e
parent16c91bedf844f5f7764aa78b801ca023810611c3 (diff)
Fix some errors spit out by -Wextra
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/add.c8
-rw-r--r--lib/libalpm/remove.c4
-rw-r--r--lib/libalpm/trans.c2
-rw-r--r--lib/libalpm/trans.h2
-rw-r--r--src/pacman/callback.c2
-rw-r--r--src/pacman/pacman.c11
-rw-r--r--src/pacman/util.c2
7 files changed, 15 insertions, 16 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index d2b0c582..9ef83d91 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -715,7 +715,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
/* pre_upgrade scriptlet */
if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
_alpm_runscriptlet(handle->root, newpkg->origin_data.file,
- "pre_upgrade", newpkg->version, oldpkg->version, trans);
+ "pre_upgrade", newpkg->version, oldpkg->version);
}
} else {
is_upgrade = 0;
@@ -727,7 +727,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
/* pre_install scriptlet */
if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
_alpm_runscriptlet(handle->root, newpkg->origin_data.file,
- "pre_install", newpkg->version, NULL, trans);
+ "pre_install", newpkg->version, NULL);
}
}
@@ -904,10 +904,10 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
if(is_upgrade) {
_alpm_runscriptlet(handle->root, scriptlet, "post_upgrade",
alpm_pkg_get_version(newpkg),
- oldpkg ? alpm_pkg_get_version(oldpkg) : NULL, trans);
+ oldpkg ? alpm_pkg_get_version(oldpkg) : NULL);
} else {
_alpm_runscriptlet(handle->root, scriptlet, "post_install",
- alpm_pkg_get_version(newpkg), NULL, trans);
+ alpm_pkg_get_version(newpkg), NULL);
}
}
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index cf33d835..a84d2b02 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -293,7 +293,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
/* run the pre-remove scriptlet if it exists */
if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
_alpm_runscriptlet(handle->root, scriptlet, "pre_remove",
- alpm_pkg_get_version(info), NULL, trans);
+ alpm_pkg_get_version(info), NULL);
}
}
@@ -326,7 +326,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db)
/* run the post-remove script if it exists */
if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
_alpm_runscriptlet(handle->root, scriptlet, "post_remove",
- alpm_pkg_get_version(info), NULL, trans);
+ alpm_pkg_get_version(info), NULL);
}
}
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index 7d7e2021..ca8d6ce9 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -569,7 +569,7 @@ static int grep(const char *fn, const char *needle)
int _alpm_runscriptlet(const char *root, const char *installfn,
const char *script, const char *ver,
- const char *oldver, pmtrans_t *trans)
+ const char *oldver)
{
char scriptfn[PATH_MAX];
char cmdline[PATH_MAX];
diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index f3575895..f88c61e1 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -81,7 +81,7 @@ int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data);
int _alpm_trans_update_depends(pmtrans_t *trans, pmpkg_t *pkg);
int _alpm_runscriptlet(const char *root, const char *installfn,
const char *script, const char *ver,
- const char *oldver, pmtrans_t *trans);
+ const char *oldver);
#endif /* _ALPM_TRANS_H */
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index ef67ab75..fac16c5e 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -60,7 +60,7 @@ static int prevpercent=0; /* for less progressbar output */
static float get_update_timediff(int first_call)
{
float retval = 0.0;
- static struct timeval last_time = {0};
+ static struct timeval last_time = {0, 0};
/* on first call, simply set the last time and return */
if(first_call) {
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 47f16c02..499e3b80 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -21,8 +21,7 @@
#include "config.h"
-/* TODO hard to believe all these are needed just for this file */
-#include <stdlib.h>
+#include <stdlib.h> /* atoi */
#include <stdio.h>
#include <limits.h>
#include <getopt.h>
@@ -31,10 +30,10 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/utsname.h>
-#include <libintl.h>
-#include <locale.h>
-#include <time.h>
+#include <sys/utsname.h> /* uname */
+#include <libintl.h> /* bindtextdomain, textdomain */
+#include <locale.h> /* setlocale */
+#include <time.h> /* time_t */
#if defined(PACMAN_DEBUG) && defined(HAVE_MTRACE)
#include <mcheck.h> /* debug tracing (mtrace) */
#endif
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 80a191d9..b2199821 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -162,7 +162,7 @@ void indentprint(const char *str, int indent)
while(*p) {
if(*p == ' ') {
const char *next = NULL;
- unsigned int len;
+ int len;
p++;
if(p == NULL || *p == ' ') continue;
next = strchr(p, ' ');