- declare *printf format specifiers if gcc detected

[citadel.git] / citadel / imap_tools.c

diff --git a/citadel/imap_tools.c b/citadel/imap_tools.c
index 15b35627aaf4a4a3750c07596f8ed7e6d266da96..4f9809879a30262213e6fd84f8b88be96c81b724 100644 (file)
--- a/citadel/imap_tools.c
+++ b/citadel/imap_tools.c
@@ -18,6 +18,10 @@
 #include "imap_tools.h"
 
 
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
 /*
  * Output a string to the IMAP client, either as a literal or quoted.
  * (We do a literal if it has any double-quotes or backslashes.)
@@ -37,7 +41,7 @@ void imap_strout(char *buf)
        }
 
        if (is_literal) {
-               cprintf("{%d}\r\n%s", strlen(buf), buf);
+               cprintf("{%ld}\r\n%s", strlen(buf), buf);
        } else {
                cprintf("\"%s\"", buf);
        }
@@ -149,7 +153,6 @@ int imap_roomname(char *rbuf, int bufsize, char *foldername)
                extract(buf, foldername, 0);
                for (i = 0; i < MAXFLOORS; ++i) {
                        fl = cgetfloor(i);
-                       lprintf(9, "floor %d: %s\n", i, fl->f_name);    /* FIXME take out */
                        if (fl->f_flags & F_INUSE) {
                                if (!strcasecmp(buf, fl->f_name)) {
                                        extract(rbuf, foldername, 1);