summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-04-26 16:59:38 -0400
committerDan McGee <dan@archlinux.org>2007-04-26 16:59:38 -0400
commit7bbcaaaae90770247f72cf213498b6934d949023 (patch)
treefb6619b04ab85b3584f6753c34e01ceb4f892088
parent8d46cf6651e4593786621be62216c6ef9f03a172 (diff)
Add -pedantic flag to pacman (frontend) CFLAGS
Now that we got rid of the ERR and WARN macros, compilation with -pedantic turned on works with only minor changes. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/Makefile.am2
-rw-r--r--src/pacman/callback.c11
-rw-r--r--src/util/Makefile.am2
3 files changed, 12 insertions, 3 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 942e5a68..be0374a2 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -10,7 +10,7 @@ localedir = $(datadir)/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
INCLUDES = -I$(top_srcdir)/lib/libalpm
-AM_CFLAGS = -D_GNU_SOURCE
+AM_CFLAGS = -pedantic -D_GNU_SOURCE
pacman_SOURCES = \
add.c \
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 2c4923b4..bbd513d1 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -232,6 +232,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
}
/* callback to handle questions from libalpm transactions (yes/no) */
+/* TODO this is one of the worst ever functions written. void *data ? wtf */
void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
void *data3, int *response)
{
@@ -247,7 +248,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
}
} else if(data2) {
/* TODO we take this route based on data2 being not null? WTF */
- snprintf(str, LOG_STR_LEN, _(":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] "),
+ snprintf(str, LOG_STR_LEN, _(":: %s requires installing %s from IgnorePkg. Install anyway? [Y/n] "),
alpm_pkg_get_name(data1),
alpm_pkg_get_name(data2));
*response = yesno(str);
@@ -435,11 +436,17 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
case PM_TRANS_PROGRESS_ADD_START:
case PM_TRANS_PROGRESS_UPGRADE_START:
case PM_TRANS_PROGRESS_REMOVE_START:
+ /* old way of doing it, but ISO C does not recognize it
printf("(%2$*1$d/%3$*1$d) %4$s %6$-*5$.*5$s", digits, remain, howmany,
- opr, pkglen, pkgname);
+ opr, pkglen, pkgname);*/
+ printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany,
+ opr, pkglen, pkglen, pkgname);
break;
case PM_TRANS_PROGRESS_CONFLICTS_START:
+ /* old way of doing it, but ISO C does not recognize it
printf("(%2$*1$d/%3$*1$d) %5$-*4$s", digits, remain, howmany,
+ textlen, opr);*/
+ printf("(%*d/%*d) %-*s", digits, remain, digits, howmany,
textlen, opr);
break;
}
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e79e726d..8174dd96 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -2,6 +2,8 @@ bin_PROGRAMS = vercmp testpkg
INCLUDES = -I$(top_srcdir)/lib/libalpm
+AM_CFLAGS = -pedantic
+
vercmp_SOURCES = vercmp.c
vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la