make clang default compiler

also fix a couple of compiler warnings along
the way

9 files changed, 18 insertions, 16 deletions

diff --git a/debian/rules b/debian/rules
index 661184d3..3b79134d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,11 @@ stamps/configure:
 
 dbmail: stamps/dbmail
 stamps/dbmail: configure
-	env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFFLAGS) 
+	if [ -e /usr/bin/clang ]; then \
+		env CC="/usr/bin/clang" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFFLAGS); \
+	else \
+		env CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(CONFFLAGS); \
+	fi
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	touch $@
diff --git a/src/dbmail-mailbox.h b/src/dbmail-mailbox.h
index febb6ff5..d36bef13 100644
--- a/src/dbmail-mailbox.h
+++ b/src/dbmail-mailbox.h
@@ -52,6 +52,7 @@ typedef struct {
 
 
 DbmailMailbox * dbmail_mailbox_new(u64_t id);
+int dbmail_mailbox_open(DbmailMailbox *self);
 int dbmail_mailbox_sort(DbmailMailbox *self);
 int dbmail_mailbox_search(DbmailMailbox *self);
 
diff --git a/src/dbmail-user.h b/src/dbmail-user.h
index 3201ae9f..de289c3b 100644
--- a/src/dbmail-user.h
+++ b/src/dbmail-user.h
@@ -22,11 +22,12 @@
 
 #include "dbmail.h"
 
-#define qverbosef(fmt, args...) (!verbose ? 0 : printf(fmt, ##args) )
-#define qprintf(fmt, args...) ((quiet||reallyquiet) ? 0 : printf(fmt, ##args) )
-#define qerrorf(fmt, args...) (reallyquiet ? 0 : fprintf(stderr, fmt, ##args) )
 
-#define null_strncpy(dst, src, len) (src ? strncpy(dst, src, len) : 0 )
+#define qverbosef(fmt, args...) if (verbose) printf(fmt, ##args)
+#define qprintf(fmt, args...) if (! (quiet||reallyquiet)) printf(fmt, ##args) 
+#define qerrorf(fmt, args...) if (! reallyquiet) fprintf(stderr, fmt, ##args) 
+
+#define null_strncpy(dst, src, len) if (src) strncpy(dst, src, len)
 #define null_crypt(src, dst) (src ? crypt(src, dst) : "" )
 
 
diff --git a/src/maintenance.c b/src/maintenance.c
index 2a683afa..87366103 100644
--- a/src/maintenance.c
+++ b/src/maintenance.c
@@ -41,10 +41,6 @@ int quiet = 0;
 /* Don't print errors. */
 int reallyquiet = 0;
 
-#define qverbosef(fmt, args...) (!verbose ? 0 : printf(fmt, ##args) )
-#define qprintf(fmt, args...) ((quiet||reallyquiet) ? 0 : printf(fmt, ##args) )
-#define qerrorf(fmt, args...) (reallyquiet ? 0 : fprintf(stderr, fmt, ##args) )
-
 char *configFile = DEFAULT_CONFIG_FILE;
 
 int has_errors = 0;
diff --git a/src/modules/sortsieve.c b/src/modules/sortsieve.c
index 79d528e5..6eb2fe7f 100644
--- a/src/modules/sortsieve.c
+++ b/src/modules/sortsieve.c
@@ -224,7 +224,7 @@ int sort_vacation(sieve2_context_t *s, void *my)
 	} else {
 		char *tmp;
 		tmp = g_strconcat(subject, message, NULL);
-		rc_handle = md5_handle = dm_md5((const unsigned char * const) tmp);
+		rc_handle = md5_handle = dm_md5((char * const) tmp);
 		g_free(tmp);
 	}
 
diff --git a/src/sievecmd.c b/src/sievecmd.c
index d84d3534..d12a2d9e 100644
--- a/src/sievecmd.c
+++ b/src/sievecmd.c
@@ -34,9 +34,9 @@ int quiet = 0;
 /* Don't print errors. */
 int reallyquiet = 0;
 
-#define qverbosef(fmt, args...) (!verbose ? 0 : printf(fmt, ##args) )
-#define qprintf(fmt, args...) ((quiet||reallyquiet) ? 0 : printf(fmt, ##args) )
-#define qerrorf(fmt, args...) (reallyquiet ? 0 : fprintf(stderr, fmt, ##args) )
+#define qverbosef(fmt, args...) if (verbose) printf(fmt, ##args)
+#define qprintf(fmt, args...) if (! (quiet||reallyquiet)) printf(fmt, ##args) 
+#define qerrorf(fmt, args...) if (! reallyquiet) fprintf(stderr, fmt, ##args) 
 
 char *configFile = DEFAULT_CONFIG_FILE;
 
diff --git a/test/check_dbmail_auth.c b/test/check_dbmail_auth.c
index 22af8744..2b85f1d6 100644
--- a/test/check_dbmail_auth.c
+++ b/test/check_dbmail_auth.c
@@ -178,7 +178,8 @@ START_TEST(test_auth_cram_md5)
 	const char *response = "dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw";
 	const char *expect = "PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+";
 	const char *secret = "tanstaaftanstaaf";
-	char *ch, *r;
+	const char *ch;
+        char *r;
 
 	c = Cram_new();
 	Cram_setChallenge(c, challenge);
diff --git a/test/check_dbmail_db.c b/test/check_dbmail_db.c
index 98e8009f..d031549d 100644
--- a/test/check_dbmail_db.c
+++ b/test/check_dbmail_db.c
@@ -1186,7 +1186,7 @@ END_TEST
 
 START_TEST(test_db_get_sql)
 {
-	char *s = db_get_sql(SQL_CURRENT_TIMESTAMP);
+	const char *s = db_get_sql(SQL_CURRENT_TIMESTAMP);
 	fail_unless(s != NULL);
 }
 END_TEST
diff --git a/test/check_dbmail_memblock.c b/test/check_dbmail_memblock.c
index ecc85d54..d32fc75d 100644
--- a/test/check_dbmail_memblock.c
+++ b/test/check_dbmail_memblock.c
@@ -90,7 +90,6 @@ END_TEST
 
 START_TEST(test_mem_read)
 {
-	char *instr = "abcdefghijklmnopqrstuvwxyz";
 	char indata[DATASIZE+1];
 	char outdata[DATASIZE+1];
 	int l;