- declare *printf format specifiers if gcc detected

[citadel.git] / citadel / serv_vandelay.c

diff --git a/citadel/serv_vandelay.c b/citadel/serv_vandelay.c
index 20c3f96c62b7ba1a42db4c876150faccbaa5b7e9..d364740cbd027c664775a77ba3024067a996f1bc 100644 (file)
--- a/citadel/serv_vandelay.c
+++ b/citadel/serv_vandelay.c
@@ -14,14 +14,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <sys/wait.h>
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
@@ -50,7 +60,7 @@ void artv_export_users_backend(struct usersupp *usbuf, void *data) {
        cprintf("%ld\n", usbuf->posted);
        cprintf("%d\n", usbuf->axlevel);
        cprintf("%ld\n", usbuf->usernum);
-       cprintf("%ld\n", usbuf->lastcall);
+       cprintf("%ld\n", (long)usbuf->lastcall);
        cprintf("%d\n", usbuf->USuserpurge);
        cprintf("%s\n", usbuf->fullname);
        cprintf("%d\n", usbuf->USscreenwidth);
@@ -76,12 +86,12 @@ void artv_export_rooms_backend(struct quickroom *qrbuf, void *data) {
        cprintf("%s\n", qrbuf->QRpasswd);
        cprintf("%ld\n", qrbuf->QRroomaide);
        cprintf("%ld\n", qrbuf->QRhighest);
-       cprintf("%ld\n", qrbuf->QRgen);
+       cprintf("%ld\n", (long)qrbuf->QRgen);
        cprintf("%u\n", qrbuf->QRflags);
        cprintf("%s\n", qrbuf->QRdirname);
        cprintf("%ld\n", qrbuf->QRinfo);
        cprintf("%d\n", qrbuf->QRfloor);
-       cprintf("%ld\n", qrbuf->QRmtime);
+       cprintf("%ld\n", (long)qrbuf->QRmtime);
        cprintf("%d\n", qrbuf->QRep.expire_mode);
        cprintf("%d\n", qrbuf->QRep.expire_value);
        cprintf("%ld\n", qrbuf->QRnumber);
@@ -145,7 +155,6 @@ void artv_export_visits(void) {
        struct visit vbuf;
        struct cdbdata *cdbv;
 
-       cdb_begin_transaction();
        cdb_rewind(CDB_VISIT);
 
        while (cdbv = cdb_next_item(CDB_VISIT), cdbv != NULL) {
@@ -169,7 +178,6 @@ void artv_export_visits(void) {
 
                cprintf("%u\n", vbuf.v_flags);
        }
-       cdb_end_transaction();
 }
 
 
@@ -230,7 +238,7 @@ void artv_export_messages(void) {
                }
        }
        fclose(artv_global_message_list);
-       lprintf(7, "Exported %ld messages.\n", count);
+       lprintf(7, "Exported %d messages.\n", count);
 }
 
 
@@ -457,7 +465,7 @@ void artv_import_visit(void) {
 void artv_import_message(void) {
        struct SuppMsgInfo smi;
        long msgnum;
-       int msglen;
+       long msglen;
        FILE *fp;
        char buf[SIZ];
        char tempfile[SIZ];