diff options
Diffstat (limited to 'sort.c')
| -rw-r--r-- | sort.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -46,12 +46,12 @@ dsn_class_t sort_and_deliver(struct DbmailMessage *message, * We skip the Sieve scripts, and down the call * chain we don't check permissions on the mailbox. */ if (source == BOX_BRUTEFORCE) { - TRACE(TRACE_MESSAGE, "Beginning brute force delivery for user [%llu] to mailbox [%s].", + TRACE(TRACE_MESSAGE, "Beginning brute force delivery for user [%" U64_T_FORMAT "] to mailbox [%s].", useridnr, mailbox); return sort_deliver_to_mailbox(message, useridnr, mailbox, source, NULL); } - TRACE(TRACE_INFO, "Destination [%s] useridnr [%llu], mailbox [%s], source [%d]", + TRACE(TRACE_INFO, "Destination [%s] useridnr [%" U64_T_FORMAT "], mailbox [%s], source [%d]", destination, useridnr, mailbox, source); /* This is the only condition when called from pipe.c, actually. */ @@ -124,7 +124,7 @@ dsn_class_t sort_deliver_to_mailbox(struct DbmailMessage *message, field_t val; size_t msgsize = (u64_t)dbmail_message_get_size(message, FALSE); - TRACE(TRACE_INFO,"useridnr [%llu] mailbox [%s]", useridnr, mailbox); + TRACE(TRACE_INFO,"useridnr [%" U64_T_FORMAT "] mailbox [%s]", useridnr, mailbox); if (db_find_create_mailbox(mailbox, source, useridnr, &mboxidnr) != 0) { TRACE(TRACE_ERROR, "mailbox [%s] not found", mailbox); @@ -146,12 +146,12 @@ dsn_class_t sort_deliver_to_mailbox(struct DbmailMessage *message, switch (acl_has_right(&mbox, useridnr, ACL_RIGHT_POST)) { case -1: - TRACE(TRACE_MESSAGE, "error retrieving right for [%llu] to deliver mail to [%s]", + TRACE(TRACE_MESSAGE, "error retrieving right for [%" U64_T_FORMAT "] to deliver mail to [%s]", useridnr, mailbox); return DSN_CLASS_TEMP; case 0: // No right. - TRACE(TRACE_MESSAGE, "user [%llu] does not have right to deliver mail to [%s]", + TRACE(TRACE_MESSAGE, "user [%" U64_T_FORMAT "] does not have right to deliver mail to [%s]", useridnr, mailbox); // Switch to INBOX. if (strcmp(mailbox, "INBOX") == 0) { @@ -162,7 +162,7 @@ dsn_class_t sort_deliver_to_mailbox(struct DbmailMessage *message, return sort_deliver_to_mailbox(message, useridnr, "INBOX", BOX_DEFAULT, msgflags); case 1: // Has right. - TRACE(TRACE_INFO, "user [%llu] has right to deliver mail to [%s]", + TRACE(TRACE_INFO, "user [%" U64_T_FORMAT "] has right to deliver mail to [%s]", useridnr, mailbox); break; default: @@ -184,18 +184,18 @@ dsn_class_t sort_deliver_to_mailbox(struct DbmailMessage *message, // Ok, we have the ACL right, time to deliver the message. switch (db_copymsg(message->mailbox, message->id, mboxidnr, useridnr, &newmsgidnr)) { case -2: - TRACE(TRACE_DEBUG, "error copying message to user [%llu]," + TRACE(TRACE_DEBUG, "error copying message to user [%" U64_T_FORMAT "]," "maxmail exceeded", useridnr); return DSN_CLASS_QUOTA; case -1: - TRACE(TRACE_ERROR, "error copying message to user [%llu]", + TRACE(TRACE_ERROR, "error copying message to user [%" U64_T_FORMAT "]", useridnr); return DSN_CLASS_TEMP; default: - TRACE(TRACE_MESSAGE, "message id=%llu, size=%zd is inserted to mailbox id=%llu", + TRACE(TRACE_MESSAGE, "message id=%" U64_T_FORMAT ", size=%zd is inserted to mailbox id=%" U64_T_FORMAT "", newmsgidnr, msgsize, mboxidnr); if (msgflags) { - TRACE(TRACE_MESSAGE, "mbox id=%llu, message id=%llu, setting imap flags", + TRACE(TRACE_MESSAGE, "mbox id=%" U64_T_FORMAT ", message id=%" U64_T_FORMAT ", setting imap flags", mboxidnr, newmsgidnr); db_set_msgflag(newmsgidnr, mboxidnr, msgflags, IMAPFA_ADD); } |