diff options
author | Sameer Prakash Pradhan <sp.pradhan@samsung.com> | 2018-12-11 18:39:37 +0530 |
---|---|---|
committer | Sameer Prakash Pradhan <sp.pradhan@samsung.com> | 2018-12-12 16:09:39 +0530 |
commit | 025c68c6ac141e042e44c68a50fb387421d89759 (patch) | |
tree | 25f82f55f220f11e346ee1999a95efbe8e5204ef | |
parent | 096bda73775f5389b393f4029f5d14fccf0ac448 (diff) | |
download | email-service-025c68c6ac141e042e44c68a50fb387421d89759.tar.gz email-service-025c68c6ac141e042e44c68a50fb387421d89759.tar.bz2 email-service-025c68c6ac141e042e44c68a50fb387421d89759.zip |
[Non-ACR][email-service][Updating for Dlog API format check enforcement]submit/tizen/20181214.061228submit/tizen/20181212.095503accepted/tizen/unified/20181217.142158
Signed-off-by: Sameer Prakash Pradhan <sp.pradhan@samsung.com>
Change-Id: Ic9c6995b653aa87565360afee1f890790ee75368
-rw-r--r-- | email-api/email-api-mailbox.c | 6 | ||||
-rw-r--r-- | email-api/email-api-network.c | 2 | ||||
-rwxr-xr-x | email-api/email-api-smime.c | 2 | ||||
-rwxr-xr-x | email-common-use/email-convert.c | 4 | ||||
-rwxr-xr-x | email-core/email-core-account.c | 4 | ||||
-rwxr-xr-x | email-core/email-core-auto-download.c | 4 | ||||
-rwxr-xr-x | email-core/email-core-gmime.c | 12 | ||||
-rwxr-xr-x | email-core/email-core-imap-idle.c | 2 | ||||
-rwxr-xr-x | email-core/email-core-key-manager.c | 2 | ||||
-rwxr-xr-x | email-core/email-core-mail.c | 24 | ||||
-rwxr-xr-x | email-core/email-core-mailbox-sync.c | 18 | ||||
-rwxr-xr-x | email-core/email-core-mime.c | 6 | ||||
-rwxr-xr-x | email-core/email-core-mm-callbacks.c | 2 | ||||
-rwxr-xr-x | email-core/email-core-signal.c | 6 | ||||
-rwxr-xr-x | email-core/email-core-smtp.c | 24 | ||||
-rwxr-xr-x | email-core/email-core-task-manager.c | 2 | ||||
-rwxr-xr-x | email-core/email-core-timer.c | 2 | ||||
-rwxr-xr-x | email-core/email-core-utils.c | 8 | ||||
-rwxr-xr-x | email-core/email-storage/email-storage.c | 30 | ||||
-rwxr-xr-x | email-daemon/email-daemon-mail.c | 6 | ||||
-rwxr-xr-x | email-ipc/email-ipc-api/email-ipc-param-list.c | 4 | ||||
-rwxr-xr-x | email-ipc/email-proxy/email-proxy-socket.c | 2 |
22 files changed, 86 insertions, 86 deletions
diff --git a/email-api/email-api-mailbox.c b/email-api/email-api-mailbox.c index dbe079b..6bb752d 100644 --- a/email-api/email-api-mailbox.c +++ b/email-api/email-api-mailbox.c @@ -482,7 +482,7 @@ EXPORT_API int email_delete_mailbox(int input_mailbox_id, int input_on_server, i if (input_on_server) { emipc_get_parameter(hAPI, ePARAMETER_OUT, 1, sizeof(int), output_handle); - EM_DEBUG_LOG("output_handle [%d]", output_handle); + EM_DEBUG_LOG("output_handle [%p]", output_handle); } emipc_destroy_email_api(hAPI); @@ -505,8 +505,8 @@ EXPORT_API int email_delete_mailbox_ex(int input_account_id, int *input_mailbox_ CHECK_EMAILS_SUPPORTED(EMAIL_FEATURE); EM_DEBUG_API_BEGIN("input_account_id[%d] input_mailbox_id_array[%p] " "input_mailbox_id_count[%d] input_on_server[%d] " - "output_handle[%p]", input_mailbox_id_array, input_mailbox_id_array, - input_mailbox_id_count, input_on_server, output_handle); + "output_handle[%p]",input_account_id, input_mailbox_id_array, input_mailbox_id_count, + input_on_server, output_handle); int err = EMAIL_ERROR_NONE; char *multi_user_name = NULL; diff --git a/email-api/email-api-network.c b/email-api/email-api-network.c index 4d58685..e1ed241 100644 --- a/email-api/email-api-network.c +++ b/email-api/email-api-network.c @@ -256,7 +256,7 @@ FINISH_OFF: EXPORT_API int email_schedule_sending_mail(int input_mail_id, time_t input_scheduled_time) { CHECK_EMAILS_SUPPORTED(EMAIL_FEATURE); - EM_DEBUG_API_BEGIN("mail_id[%d] input_time[%d]", input_mail_id, input_scheduled_time); + EM_DEBUG_API_BEGIN("mail_id[%d] input_time[%ld]", input_mail_id, input_scheduled_time); int err = EMAIL_ERROR_NONE; char *multi_user_name = NULL; diff --git a/email-api/email-api-smime.c b/email-api/email-api-smime.c index 2730865..40b9fcf 100755 --- a/email-api/email-api-smime.c +++ b/email-api/email-api-smime.c @@ -100,7 +100,7 @@ EXPORT_API int email_get_decrypt_message(int mail_id, email_mail_data_t **output } if ((err = emipc_get_user_name(&multi_user_name)) != EMAIL_ERROR_NONE) { - EM_DEBUG_EXCEPTION("emipc_get_user_name failed : [%d]"); + EM_DEBUG_EXCEPTION("emipc_get_user_name failed : [%d]", err); goto FINISH_OFF; } diff --git a/email-common-use/email-convert.c b/email-common-use/email-convert.c index 57486fa..7beab38 100755 --- a/email-common-use/email-convert.c +++ b/email-common-use/email-convert.c @@ -510,7 +510,7 @@ INTERNAL_FUNC int em_convert_string_to_time_t(char *input_datetime_string, time_ *output_time = timegm(&temp_time_info); - EM_DEBUG_LOG("*output_time [%d", *output_time); + EM_DEBUG_LOG("*output_time [%ld]", *output_time); EM_DEBUG_FUNC_END("err %d", EMAIL_ERROR_NONE); return EMAIL_ERROR_NONE; @@ -982,7 +982,7 @@ INTERNAL_FUNC char* em_convert_attachment_data_to_byte_stream(email_attachment_d *stream_len = len; - EM_DEBUG_LOG("stream_len: %d", len); + EM_DEBUG_LOG("stream_len: %zu", len); EM_DEBUG_FUNC_END(); return (char*) buf; diff --git a/email-core/email-core-account.c b/email-core/email-core-account.c index 2386f88..711d166 100755 --- a/email-core/email-core-account.c +++ b/email-core/email-core-account.c @@ -358,7 +358,7 @@ INTERNAL_FUNC int emcore_validate_account(char *multi_user_name, int account_id, if (account_id <= 0) { - EM_DEBUG_EXCEPTION("account_id[%p]", account_id); + EM_DEBUG_EXCEPTION("account_id[%d]", account_id); err = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -1402,7 +1402,7 @@ size_t emcore_curl_write_callback(char* data, size_t size, size_t nmemb, void* t size_t received_length = size * nmemb; if (*result_string == NULL) { - EM_DEBUG_LOG("received_length[%d]", received_length); + EM_DEBUG_LOG("received_length[%zu]", received_length); *result_string = em_malloc(received_length + 1); } else { int new_buffer_length = 0; diff --git a/email-core/email-core-auto-download.c b/email-core/email-core-auto-download.c index 7a4cb6e..3b73a51 100755 --- a/email-core/email-core-auto-download.c +++ b/email-core/email-core-auto-download.c @@ -579,7 +579,7 @@ CHECK_CONTINUE: else { EM_DEBUG_LOG("partially downloaded mail"); if (account_ref->incoming_server_type == EMAIL_SERVER_TYPE_POP3) { - EM_DEBUG_LOG("#####AUTO DOWNLOAD BODY: ACCOUNT_ID[%d] MAILBOX_ID[%d] MAIL_ID[%d] UID[%d] ACTIVITY[%d]#####", + EM_DEBUG_LOG("#####AUTO DOWNLOAD BODY: ACCOUNT_ID[%d] MAILBOX_ID[%d] MAIL_ID[%d] UID[%lu] ACTIVITY[%d]#####", event_data->account_id, event_data->mailbox_id, event_data->mail_id, event_data->server_mail_id, event_data->activity_id); if (!emcore_gmime_download_body_sections(event_data->multi_user_name, @@ -619,7 +619,7 @@ CHECK_CONTINUE: continue; EM_DEBUG_LOG("#####AUTO DOWNLOAD ATTACHMENT[%d]: ACCOUNT_ID[%d] " - "MAILBOX_ID[%d] MAIL_ID[%d] UID[%d] ACTIVITY[%d]#####", + "MAILBOX_ID[%d] MAIL_ID[%d] UID[%lu] ACTIVITY[%d]#####", j, event_data->account_id, event_data->mailbox_id, event_data->mail_id, event_data->server_mail_id, event_data->activity_id); diff --git a/email-core/email-core-gmime.c b/email-core/email-core-gmime.c index c778881..caa8b60 100755 --- a/email-core/email-core-gmime.c +++ b/email-core/email-core-gmime.c @@ -1076,8 +1076,8 @@ static void emcore_gmime_eml_parse_foreach_cb(GMimeObject *parent, GMimeObject * /* Set the partial body */ GMimeStream *part_stream = g_mime_data_wrapper_get_stream(data); if (part_stream) { - EM_DEBUG_LOG("part_stream->bound_end : [%lld]", part_stream->bound_end); - EM_DEBUG_LOG("super_stream->position : [%lld]", part_stream->super_stream->position); + EM_DEBUG_LOG("part_stream->bound_end : [%" G_GUINT64_FORMAT "]", part_stream->bound_end); + EM_DEBUG_LOG("super_stream->position : [%" G_GUINT64_FORMAT "]", part_stream->super_stream->position); EM_DEBUG_LOG("multipart_status : [%d]", multipart_status); if (multipart_status && part_stream->super_stream->position <= part_stream->bound_end) { save_status = EMAIL_PART_DOWNLOAD_STATUS_PARTIALLY_DOWNLOADED; @@ -3193,7 +3193,7 @@ INTERNAL_FUNC void emcore_gmime_construct_multipart(GMimeMultipart *multipart, if (total_mail_size != NULL) { *total_mail_size = *total_mail_size + (int)part->body.size.bytes; - EM_DEBUG_LOG("body.size.bytes [%d]", part->body.size.bytes); + EM_DEBUG_LOG("body.size.bytes [%lu]", part->body.size.bytes); EM_DEBUG_LOG("total_mail_size [%d]", *total_mail_size); } @@ -4219,7 +4219,7 @@ INTERNAL_FUNC int emcore_gmime_fetch_imap_body_sections(MAILSTREAM *stream, int if (fp != NULL) fclose(fp); } - EM_DEBUG_LOG("%d has been written", EM_SAFE_STRLEN((char *)test_buffer)); + EM_DEBUG_LOG("%zu has been written", EM_SAFE_STRLEN((char *)test_buffer)); } if (signed_message) { @@ -4438,7 +4438,7 @@ INTERNAL_FUNC int emcore_gmime_fetch_imap_attachment_section(MAILSTREAM *stream, } if (!stream || !cnt_info || !message) { - EM_DEBUG_EXCEPTION_SEC("stream[%p], section[%s], cnt_info[%p], message[%p]", + EM_DEBUG_EXCEPTION_SEC("stream[%p], cnt_info[%p], message[%p]", stream, cnt_info, message); err = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; @@ -4916,7 +4916,7 @@ INTERNAL_FUNC int emcore_gmime_fetch_imap_attachment_section(MAILSTREAM *stream, if (fp != NULL) fclose(fp); } - EM_DEBUG_LOG("%d has been written", EM_SAFE_STRLEN((char *)test_buffer)); + EM_DEBUG_LOG("%zu has been written", EM_SAFE_STRLEN((char *)test_buffer)); } if (GMIME_IS_PART(mime_object) && mime_part) { diff --git a/email-core/email-core-imap-idle.c b/email-core/email-core-imap-idle.c index 63d2a09..42fae66 100755 --- a/email-core/email-core-imap-idle.c +++ b/email-core/email-core-imap-idle.c @@ -591,7 +591,7 @@ void* emcore_imap_idle_worker(void* thread_user_data) if (!node->data) node = g_list_next(node); - EM_DEBUG_LOG("Data name of node : [%s]", node->data); + EM_DEBUG_LOG("Data name of node : [%p]", node->data); if ((err = emcore_get_account_reference_list(node->data, &account_ref_list, diff --git a/email-core/email-core-key-manager.c b/email-core/email-core-key-manager.c index 17fcb21..497e74d 100755 --- a/email-core/email-core-key-manager.c +++ b/email-core/email-core-key-manager.c @@ -217,7 +217,7 @@ INTERNAL_FUNC int emcore_get_certificate_in_key_manager(char *alias, char *passw goto FINISH_OFF; } - EM_DEBUG_LOG("Cert size : [%d]", output_cert->cert_size); + EM_DEBUG_LOG("Cert size : [%zu]", output_cert->cert_size); EM_DEBUG_LOG("Cert format : [%d]", output_cert->data_format); EM_DEBUG_LOG_DEV("Cert string : [%s]", output_cert->raw_cert); diff --git a/email-core/email-core-mail.c b/email-core/email-core-mail.c index 72f6f59..1e67e69 100755 --- a/email-core/email-core-mail.c +++ b/email-core/email-core-mail.c @@ -5196,7 +5196,7 @@ INTERNAL_FUNC int emcore_move_mail(char *multi_user_name, int mail_ids[], int ma if (EM_SAFE_STRLEN(stripped_subject) >= 2) { find_striped_subject = 1; } - EM_DEBUG_LOG_SEC("em_find_pos_stripped_subject_for_thread_view returns[len = %d] = %s", + EM_DEBUG_LOG_SEC("em_find_pos_stripped_subject_for_thread_view returns[len = %zu] = %s", EM_SAFE_STRLEN(stripped_subject), stripped_subject); } @@ -6161,7 +6161,7 @@ int emcore_mail_cmd_read_mail_pop3(void *stream, int msgno, int limited_size, in POP3LOCAL *pop3local; if (!stream || !result_total_body_size) { - EM_DEBUG_EXCEPTION("stream[%p], total_body_size[%p]", stream, msgno, result_total_body_size); + EM_DEBUG_EXCEPTION("stream[%p], msgno[%d], total_body_size[%p]", stream, msgno, result_total_body_size); err = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -7496,7 +7496,7 @@ static int create_searchpgm_from_filter_string(email_search_filter_t *search_fil break; case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_BEFORE: - EM_DEBUG_LOG("time_type_key_value [%d]", search_filter[i].search_filter_key_value.time_type_key_value); + EM_DEBUG_LOG("time_type_key_value [%ld]", search_filter[i].search_filter_key_value.time_type_key_value); err = emcore_make_date_string_for_search(search_filter[i].search_filter_key_value.time_type_key_value, &temp_string); @@ -7616,7 +7616,7 @@ static int create_searchpgm_from_filter_string(email_search_filter_t *search_fil break; case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_ON: - EM_DEBUG_LOG("time_type_key_value [%d]", + EM_DEBUG_LOG("time_type_key_value [%ld]", search_filter[i].search_filter_key_value.time_type_key_value); err = emcore_make_date_string_for_search(search_filter[i].search_filter_key_value.time_type_key_value, @@ -7657,7 +7657,7 @@ static int create_searchpgm_from_filter_string(email_search_filter_t *search_fil break; case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_SINCE: - EM_DEBUG_LOG("time_type_key_value [%d]", + EM_DEBUG_LOG("time_type_key_value [%ld]", search_filter[i].search_filter_key_value.time_type_key_value); err = emcore_make_date_string_for_search(search_filter[i].search_filter_key_value.time_type_key_value, @@ -7812,7 +7812,7 @@ static int create_searchpgm_from_filter_string(email_search_filter_t *search_fil break; default: - EM_DEBUG_EXCEPTION("Invalid list_filter_item_type [%d]", search_filter); + EM_DEBUG_EXCEPTION("Invalid list_filter_item_type [%p]", search_filter); err = EMAIL_ERROR_INVALID_PARAM; break; } @@ -7909,7 +7909,7 @@ static int get_search_filter_string(email_search_filter_t *search_filter, int se break; case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_BEFORE: - EM_DEBUG_LOG("time_type_key_value [%d]", search_filter[i].search_filter_key_value.time_type_key_value); + EM_DEBUG_LOG("time_type_key_value [%ld]", search_filter[i].search_filter_key_value.time_type_key_value); emcore_make_date_string_for_search(search_filter[i].search_filter_key_value.time_type_key_value, &time_string); SNPRINTF(temp_criteria, STRING_LENGTH_FOR_DISPLAY, "BEFORE %s ", time_string); @@ -7987,7 +7987,7 @@ static int get_search_filter_string(email_search_filter_t *search_filter, int se break; case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_ON: - EM_DEBUG_LOG("time_type_key_value [%d]", search_filter[i].search_filter_key_value.time_type_key_value); + EM_DEBUG_LOG("time_type_key_value [%ld]", search_filter[i].search_filter_key_value.time_type_key_value); emcore_make_date_string_for_search(search_filter[i].search_filter_key_value.time_type_key_value, &time_string); SNPRINTF(temp_criteria, STRING_LENGTH_FOR_DISPLAY, "ON %s ", time_string); @@ -8015,7 +8015,7 @@ static int get_search_filter_string(email_search_filter_t *search_filter, int se break; case EMAIL_SEARCH_FILTER_TYPE_SENT_DATE_SINCE: - EM_DEBUG_LOG("time_type_key_value [%d]", search_filter[i].search_filter_key_value.time_type_key_value); + EM_DEBUG_LOG("time_type_key_value [%ld]", search_filter[i].search_filter_key_value.time_type_key_value); emcore_make_date_string_for_search(search_filter[i].search_filter_key_value.time_type_key_value, &time_string); SNPRINTF(temp_criteria, STRING_LENGTH_FOR_DISPLAY, "SINCE %s ", time_string); @@ -8100,7 +8100,7 @@ static int get_search_filter_string(email_search_filter_t *search_filter, int se break; default: - EM_DEBUG_EXCEPTION("Invalid list_filter_item_type [%d]", search_filter); + EM_DEBUG_EXCEPTION("Invalid list_filter_item_type [%p]", search_filter); err = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -8571,7 +8571,7 @@ INTERNAL_FUNC int emcore_search_on_server(char *multi_user_name, int account_id, mail_fetch_fast(stream, uid_range, FT_UID | FT_PEEK | FT_NEEDENV); EM_SAFE_FREE(uid_range); - EM_DEBUG_LOG("stream->nmsgs : [%d]", stream->nmsgs); + EM_DEBUG_LOG("stream->nmsgs : [%lu]", stream->nmsgs); } search_mailbox = em_malloc(sizeof(emstorage_mailbox_tbl_t)); @@ -8593,7 +8593,7 @@ INTERNAL_FUNC int emcore_search_on_server(char *multi_user_name, int account_id, if (cancellable) FINISH_OFF_IF_EVENT_CANCELED(err, event_handle); - EM_DEBUG_LOG("msgno : [%4lu]", uid_elem->msgno); + EM_DEBUG_LOG("msgno : [%d]", uid_elem->msgno); #ifdef __FEATURE_HEADER_OPTIMIZATION__ env = mail_fetchstructure_full(stream, uid_elem->msgno, NULL, FT_PEEK, 0); #else diff --git a/email-core/email-core-mailbox-sync.c b/email-core/email-core-mailbox-sync.c index 9aa69f6..95b8a41 100755 --- a/email-core/email-core-mailbox-sync.c +++ b/email-core/email-core-mailbox-sync.c @@ -744,7 +744,7 @@ int imap4_mailbox_get_uids_by_timestamp(MAILSTREAM *stream, emcore_uid_list** ui goto FINISH_OFF; } - EM_DEBUG_LOG(">>>>>Current TIme %d %d %d %d %d %d", 1900+timeinfo->tm_year, timeinfo->tm_mon+1, timeinfo->tm_mday); + EM_DEBUG_LOG(">>>>>Current TIme %d %d %d", 1900+timeinfo->tm_year, timeinfo->tm_mon+1, timeinfo->tm_mday); week_before_RawTime = RawTime - 604800; @@ -757,7 +757,7 @@ int imap4_mailbox_get_uids_by_timestamp(MAILSTREAM *stream, emcore_uid_list** ui goto FINISH_OFF; } - EM_DEBUG_LOG(">>>>>Mobile Date a Week before %d %d %d %d %d %d", 1900 + timeinfo->tm_year, timeinfo->tm_mon+1, timeinfo->tm_mday); + EM_DEBUG_LOG(">>>>>Mobile Date a Week before %d %d %d", 1900 + timeinfo->tm_year, timeinfo->tm_mon+1, timeinfo->tm_mday); memset(&date_string, 0x00, 16); @@ -1199,7 +1199,7 @@ static int emcore_get_uids_to_download(char *multi_user_name, goto FINISH_OFF; } } else { /* EMAIL_SERVER_TYPE_IMAP4 */ - EM_DEBUG_LOG("nmsgs[%d]", ((MAILSTREAM *)stream)->nmsgs); + EM_DEBUG_LOG("nmsgs[%lu]", ((MAILSTREAM *)stream)->nmsgs); if ((limit_count < ((MAILSTREAM *)stream)->nmsgs)) { if ((err = emcore_get_uids_order_by_datetime_from_imap_server(stream, limit_count, @@ -2284,7 +2284,7 @@ INTERNAL_FUNC int emcore_sync_header(char *multi_user_name, uid_elem = uid_list; if (*stream && uid_elem) { - EM_DEBUG_LOG("msgno : %d", ((MAILSTREAM *)*stream)->nmsgs); + EM_DEBUG_LOG("msgno : %lu", ((MAILSTREAM *)*stream)->nmsgs); } else { EM_DEBUG_LOG("Uid List Null"); } @@ -2311,7 +2311,7 @@ INTERNAL_FUNC int emcore_sync_header(char *multi_user_name, env = NULL; if (uid_elem->msgno > ((MAILSTREAM *)*stream)->nmsgs) { - EM_DEBUG_LOG("WARN: msgno[%d] can't be greater than nmsgs[%d].", + EM_DEBUG_LOG("WARN: msgno[%d] can't be greater than nmsgs[%lu].", uid_elem->msgno, ((MAILSTREAM *)*stream)->nmsgs); } else { #ifdef __FEATURE_HEADER_OPTIMIZATION__ @@ -3722,7 +3722,7 @@ INTERNAL_FUNC int emcore_initiate_pbd(char *multi_user_name, MAILSTREAM *stream, EM_DEBUG_LOG("input_mailbox_name name [%d]", pbd_event.mailbox_id); EM_DEBUG_LOG("uid [%s]", uid); - EM_DEBUG_LOG("pbd_event.account_id[%d], pbd_event.mail_id[%d], pbd_event.server_mail_id [%d]", + EM_DEBUG_LOG("pbd_event.account_id[%d], pbd_event.mail_id[%d], pbd_event.server_mail_id [%lu]", pbd_event.account_id, pbd_event.mail_id , pbd_event.server_mail_id); if (!emcore_insert_pbd_activity(&pbd_event, &pbd_event.activity_id, &err)) { @@ -3952,7 +3952,7 @@ static int emcore_gmime_download_imap_partial_mail_body(MAILSTREAM *stream, int if (!(imap_response[i].bodystructure) || imap_response[i].bodystructure_len <= 0) continue; /* Search the account id of pbd_event */ - EM_DEBUG_LOG("Find server_mail_id: [%d]", imap_response[i].uid_no); + EM_DEBUG_LOG("Find server_mail_id: [%lu]", imap_response[i].uid_no); for (temp_count = 0; temp_count < item_count && pbd_event[temp_count].server_mail_id != imap_response[i].uid_no; temp_count++) continue; @@ -3962,7 +3962,7 @@ static int emcore_gmime_download_imap_partial_mail_body(MAILSTREAM *stream, int } /* Start to parse the body */ - EM_DEBUG_LOG("Start partial body of server_mail_id %d", imap_response[i].uid_no); + EM_DEBUG_LOG("Start partial body of server_mail_id %lu", imap_response[i].uid_no); /* Check the body download status and body size */ SNPRINTF(uid_string, sizeof(uid_string), "%ld", imap_response[i].uid_no); @@ -4615,7 +4615,7 @@ INTERNAL_FUNC int emcore_download_bulk_partial_mail_body_for_pop3(MAILSTREAM *st } for (i = 0; i < item_count; i++) { - EM_DEBUG_LOG_SEC("pbd_event[%d].account_id [%d], mail_id [%d], server_mail_id [%d], activity_id [%d]", \ + EM_DEBUG_LOG_SEC("pbd_event[%d].account_id [%d], mail_id [%d], server_mail_id [%lu], activity_id [%d]", \ i, pbd_event[i].account_id, pbd_event[i].mail_id, pbd_event[i].server_mail_id, pbd_event[i].activity_id); if (!emcore_gmime_download_body_sections(pbd_event[i].multi_user_name, stream, pbd_event[i].account_id, diff --git a/email-core/email-core-mime.c b/email-core/email-core-mime.c index 8f25874..484ee2d 100755 --- a/email-core/email-core-mime.c +++ b/email-core/email-core-mime.c @@ -587,7 +587,7 @@ INTERNAL_FUNC int emcore_get_content_type_from_mime_string(char *input_mime_stri EM_DEBUG_LOG_SEC("result_content_type [%s]", result_content_type); *output_content_type = EM_SAFE_STRDUP(em_trim_left(result_content_type)); } else { - EM_DEBUG_EXCEPTION("temp_content_type_end - temp_content_type_start [%d]", temp_content_type_end - temp_content_type_start); + EM_DEBUG_EXCEPTION("temp_content_type_end - temp_content_type_start [%ld]", (long int)(temp_content_type_end - temp_content_type_start)); err = EMAIL_ERROR_DATA_TOO_LONG; goto FINISH_OFF; } @@ -890,13 +890,13 @@ int emcore_set_fetch_part_section(BODY *body, char *section_pfx, int section_sub if (total_mail_size != NULL) { *total_mail_size = *total_mail_size + (int)body->size.bytes; - EM_DEBUG_LOG("body->size.bytes [%d]", body->size.bytes); + EM_DEBUG_LOG("body->size.bytes [%lu]", body->size.bytes); EM_DEBUG_LOG("total_mail_size [%d]", *total_mail_size); } if ((total_body_size != NULL) && !(body->disposition.type && (body->disposition.type[0] == 'a' || body->disposition.type[0] == 'A'))) { *total_body_size = *total_body_size + (int)body->size.bytes; - EM_DEBUG_LOG("body->size.bytes [%d]", body->size.bytes); + EM_DEBUG_LOG("body->size.bytes [%lu]", body->size.bytes); EM_DEBUG_LOG("total_mail_size [%d]", *total_body_size); } diff --git a/email-core/email-core-mm-callbacks.c b/email-core/email-core-mm-callbacks.c index fa1dc4e..85c6907 100755 --- a/email-core/email-core-mm-callbacks.c +++ b/email-core/email-core-mm-callbacks.c @@ -221,7 +221,7 @@ INTERNAL_FUNC void mm_login(NETMBX *mb, char *user, char *pwd, long trial) user_info = EM_SAFE_STRDUP(mb->user); token = strtok_r(user_info, TOKEN_FOR_MULTI_USER, &temp); - EM_DEBUG_LOG_SEC("Token : [%s], multi_user_name:[%s][%d]", token, temp, EM_SAFE_STRLEN(temp)); + EM_DEBUG_LOG_SEC("Token : [%s], multi_user_name:[%s][%zu]", token, temp, EM_SAFE_STRLEN(temp)); account_id = atoi(token); token = NULL; diff --git a/email-core/email-core-signal.c b/email-core/email-core-signal.c index 2f3bcaf..1b4fd0e 100755 --- a/email-core/email-core-signal.c +++ b/email-core/email-core-signal.c @@ -200,10 +200,10 @@ INTERNAL_FUNC int em_send_notification_to_active_sync_engine(int subType, ASNoti break;
case ACTIVE_SYNC_NOTI_SEND_SAVED: /* publish a send notification to ASE (active sync engine) */
- EM_DEBUG_EXCEPTION("Not support yet : subType[ACTIVE_SYNC_NOTI_SEND_SAVED]", subType);
+ EM_DEBUG_EXCEPTION("Not support yet : subType[ACTIVE_SYNC_NOTI_SEND_SAVED] %d", subType);
break;
case ACTIVE_SYNC_NOTI_SEND_REPORT:
- EM_DEBUG_EXCEPTION("Not support yet : subType[ACTIVE_SYNC_NOTI_SEND_REPORT]", subType);
+ EM_DEBUG_EXCEPTION("Not support yet : subType[ACTIVE_SYNC_NOTI_SEND_REPORT] %d", subType);
break;
case ACTIVE_SYNC_NOTI_SYNC_HEADER:
EM_DEBUG_LOG("handle:[%d]", data->sync_header.handle);
@@ -255,7 +255,7 @@ INTERNAL_FUNC int em_send_notification_to_active_sync_engine(int subType, ASNoti break;
case ACTIVE_SYNC_NOTI_VALIDATE_ACCOUNT:
- EM_DEBUG_EXCEPTION("Not support yet : subType[ACTIVE_SYNC_NOTI_VALIDATE_ACCOUNT]", subType);
+ EM_DEBUG_EXCEPTION("Not support yet : subType[ACTIVE_SYNC_NOTI_VALIDATE_ACCOUNT] %d", subType);
break;
case ACTIVE_SYNC_NOTI_CANCEL_JOB:
diff --git a/email-core/email-core-smtp.c b/email-core/email-core-smtp.c index 29bc680..321ba17 100755 --- a/email-core/email-core-smtp.c +++ b/email-core/email-core-smtp.c @@ -410,7 +410,7 @@ static int emcore_write_body(BODY *body, BODY *root_body, FILE *fp) nwrite = fprintf(fp, "%s", (p ? p : buf)); if (nwrite != len) { - EM_DEBUG_EXCEPTION("fprintf error: nwrite[%d] len[%d] error[%d]", nwrite, len, errno); + EM_DEBUG_EXCEPTION("fprintf error: nwrite[%d] len[%lu] error[%d]", nwrite, len, errno); error = EMAIL_ERROR_FILE ; goto FINISH_OFF; } @@ -538,7 +538,7 @@ static int emcore_write_rfc822(ENVELOPE *env, BODY *body, email_mail_priority_t header_buffer_lenth += address_count * MAX_EMAIL_ADDRESS_LENGTH; header_buffer_lenth += 8192; - EM_DEBUG_LOG("header_buffer_lenth [%d]", header_buffer_lenth); + EM_DEBUG_LOG("header_buffer_lenth [%zu]", header_buffer_lenth); if (!(header_buffer = em_malloc(header_buffer_lenth))) { EM_DEBUG_EXCEPTION(" malloc failed..."); @@ -555,7 +555,7 @@ static int emcore_write_rfc822(ENVELOPE *env, BODY *body, email_mail_priority_t /* rfc822_output_header(&buf, env, body, NIL, T); */ /* including BCC */ rfc822_output_header(&buf, env, body, NIL, NIL); /* Excluding BCC */ - EM_DEBUG_LOG("header_buffer [%d]", strlen(header_buffer)); + EM_DEBUG_LOG("header_buffer [%zu]", strlen(header_buffer)); { gchar **tokens = g_strsplit(header_buffer, "CHARSET=X-UNKNOWN", 2); @@ -705,7 +705,7 @@ INTERNAL_FUNC int emcore_add_mail(char *multi_user_name, email_mail_data_t *inpu } } - EM_DEBUG_LOG("read del_id, account_id [%d]", (del_account_id ? *del_account_id : -100), input_mail_data->account_id); + EM_DEBUG_LOG("read del_id[%d], account_id [%d]", (del_account_id ? *del_account_id : -100), input_mail_data->account_id); int err = EMAIL_ERROR_NONE; int attachment_id = 0, thread_id = -1, thread_item_count = 0, latest_mail_id_in_thread = -1; @@ -759,7 +759,7 @@ INTERNAL_FUNC int emcore_add_mail(char *multi_user_name, email_mail_data_t *inpu if (input_from_eas == 0 && input_mail_data->smime_type && input_mail_data->mailbox_type != EMAIL_MAILBOX_TYPE_DRAFT) { dl_handle = dlopen("libemail-smime-api.so.1", RTLD_LAZY); if (!dl_handle) { - EM_DEBUG_EXCEPTION("Open failed : [%s]", dl_handle); + EM_DEBUG_EXCEPTION("Open failed : [%p]", dl_handle); err = EMAIL_ERROR_INVALID_PATH; goto FINISH_OFF; } @@ -767,7 +767,7 @@ INTERNAL_FUNC int emcore_add_mail(char *multi_user_name, email_mail_data_t *inpu dlerror(); convert_mail_data_to_smime = dlsym(dl_handle, "emcore_convert_mail_data_to_smime_data"); if ((dl_error = dlerror()) != NULL) { - EM_DEBUG_EXCEPTION("Symbol open failed [%s]", err); + EM_DEBUG_EXCEPTION("Symbol open failed [%d]", err); err = EMAIL_ERROR_SYSTEM_FAILURE; goto FINISH_OFF; } @@ -1107,7 +1107,7 @@ INTERNAL_FUNC int emcore_add_mail(char *multi_user_name, email_mail_data_t *inpu converted_mail_tbl->user_name = EM_SAFE_STRDUP(account_tbl_item->user_name); if (!emstorage_begin_transaction(multi_user_name, NULL, NULL, NULL)) { - EM_DEBUG_EXCEPTION("emstorage_begin_transaction failed [%d]"); + EM_DEBUG_EXCEPTION("emstorage_begin_transaction failed"); goto FINISH_OFF; } @@ -2722,7 +2722,7 @@ static int emcore_send_mail_smtp(char *multi_user_name, total = ftell(fp); total_fixed = total; fseek(fp, 0, SEEK_SET); - EM_DEBUG_LOG("total size [%d]", total); + EM_DEBUG_LOG("total size [%ld]", total); if (total < gMaxAllocSize) allocSize = total + 1; @@ -2781,7 +2781,7 @@ static int emcore_send_mail_smtp(char *multi_user_name, emcore_update_notification_for_send(account_id, mail_id, progress); } - EM_DEBUG_LOG("Sent data Successfully. sent[%d] total[%d] datasize[%d]", + EM_DEBUG_LOG("Sent data Successfully. sent[%ld] total[%ld] datasize[%d]", sent, total, dataSize); } total -= dataSize; @@ -3432,7 +3432,7 @@ static int emcore_make_envelope_from_mail(char *multi_user_name, emstorage_mail_ } if ((input_mail_tbl_data->report_status & EMAIL_MAIL_REPORT_MDN) != 0 && !input_mail_tbl_data->body_download_status) { - EM_DEBUG_EXCEPTION("input_mail_tbl_data->body_download_status[%p]", input_mail_tbl_data->body_download_status); + EM_DEBUG_EXCEPTION("input_mail_tbl_data->body_download_status[%d]", input_mail_tbl_data->body_download_status); error = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -3766,7 +3766,7 @@ INTERNAL_FUNC int emcore_make_rfc822_file_from_mail(char *multi_user_name, emsto } if ((input_mail_tbl_data->report_status & EMAIL_MAIL_REPORT_MDN) != 0 && !input_mail_tbl_data->body_download_status) { - EM_DEBUG_EXCEPTION("input_mail_tbl_data->body_download_status[%p]", input_mail_tbl_data->body_download_status); + EM_DEBUG_EXCEPTION("input_mail_tbl_data->body_download_status[%d]", input_mail_tbl_data->body_download_status); error = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -4404,7 +4404,7 @@ INTERNAL_FUNC int emcore_get_body_buff(char *file_path, char **buff) struct stat stbuf; if (stat(file_path, &stbuf) == 0 && stbuf.st_size > 0) { - EM_DEBUG_LOG(" File Size [ %d ] ", stbuf.st_size); + EM_DEBUG_LOG(" File Size [ %jd ] ", stbuf.st_size); read_buff = calloc((stbuf.st_size + 1), sizeof(char)); if (read_buff == NULL) { EM_DEBUG_EXCEPTION("calloc failed"); diff --git a/email-core/email-core-task-manager.c b/email-core/email-core-task-manager.c index de449ae..2234840 100755 --- a/email-core/email-core-task-manager.c +++ b/email-core/email-core-task-manager.c @@ -482,7 +482,7 @@ INTERNAL_FUNC int emcore_get_active_task_by_thread_id(thread_t input_thread_id, } if (i >= MAX_ACTIVE_TASK) { - EM_DEBUG_LOG("couldn't find proper task in active task pool [%d]", input_thread_id); + EM_DEBUG_LOG("couldn't find proper task in active task pool [%lu]", input_thread_id); err = EMAIL_ERROR_TASK_NOT_FOUND; } diff --git a/email-core/email-core-timer.c b/email-core/email-core-timer.c index bb1cc96..07eb822 100755 --- a/email-core/email-core-timer.c +++ b/email-core/email-core-timer.c @@ -75,7 +75,7 @@ INTERNAL_FUNC int emcore_timer_ex_callback(void *a_pData) INTERNAL_FUNC int emcore_set_timer_ex(long a_nSetTimeValue, EMAIL_TIMER_CALLBACK a_pCallBack, void *a_pData) { - EM_DEBUG_LOG("emcore_set_timer_ex %d", a_nSetTimeValue); + EM_DEBUG_LOG("emcore_set_timer_ex %ld", a_nSetTimeValue); em_timer_callback_data *pTimerData = NULL; pTimerData = malloc(sizeof(em_timer_callback_data)); if (!pTimerData) diff --git a/email-core/email-core-utils.c b/email-core/email-core-utils.c index 2e1f5d6..ed7b3fc 100755 --- a/email-core/email-core-utils.c +++ b/email-core/email-core-utils.c @@ -437,7 +437,7 @@ int emcore_get_encoded_mailbox_name(char *name, char **enc_name, int *err_code) goto FINISH_OFF; } - EM_DEBUG_LOG_SEC("UTF-7 [%s](%d)->[%s](%d)", last_word, strlen(last_word), last_enc_word, strlen(last_enc_word)); + EM_DEBUG_LOG_SEC("UTF-7 [%s](%zu)->[%s](%zu)", last_word, strlen(last_word), last_enc_word, strlen(last_enc_word)); /* if last word of mailbox name is UTF-8, replace it */ /* it is not a subfolder */ @@ -1597,7 +1597,7 @@ INTERNAL_FUNC int emcore_add_notification(char *multi_user_name, int account_id, goto FINISH_OFF; } - EM_DEBUG_LOG_SEC("single layout:account_name[%s], alias_sender[%s], time[%d], subject[%s]", account_tbl->account_name, p_mail_data->alias_sender, p_mail_data->date_time, p_mail_data->subject); + EM_DEBUG_LOG_SEC("single layout:account_name[%s], alias_sender[%s], time[%ld], subject[%s]", account_tbl->account_name, p_mail_data->alias_sender, p_mail_data->date_time, p_mail_data->subject); if ((noti_err = emcore_layout_single_noti(noti, account_tbl->account_name, 0, p_mail_data->alias_sender, p_mail_data->date_time, p_mail_data->subject, display_status)) != NOTIFICATION_ERROR_NONE) { EM_DEBUG_EXCEPTION("notification_layout_single_noti failed [%d]", noti_err); err = EMAIL_ERROR_SYSTEM_FAILURE; @@ -5643,7 +5643,7 @@ INTERNAL_FUNC int emcore_make_date_string_for_search(time_t input_time, char **o return err; } - EM_DEBUG_LOG(">>>>>Time %d %d %d %d %d %d", 1900+timeinfo->tm_year, timeinfo->tm_mon+1, timeinfo->tm_mday); + EM_DEBUG_LOG(">>>>>Time %d %d %d", 1900+timeinfo->tm_year, timeinfo->tm_mon+1, timeinfo->tm_mday); mon = __em_get_month_in_string(timeinfo->tm_mon); if (mon) { @@ -5691,7 +5691,7 @@ INTERNAL_FUNC int emcore_make_uid_range_string(emcore_uid_list *uid_list, int to if (uid_list_fast->next == NULL) { /* Single list entry */ snprintf(uid_range, uid_range_size, "%d", atoi(uid_list_fast->uid)); - EM_DEBUG_LOG("uid_range [%d]", uid_range); + EM_DEBUG_LOG("uid_range [%s]", uid_range); } else { /* forming range of uids to be passed */ while (uid_list_fast != NULL) { diff --git a/email-core/email-storage/email-storage.c b/email-core/email-storage/email-storage.c index 5d5157b..12c0914 100755 --- a/email-core/email-storage/email-storage.c +++ b/email-core/email-storage/email-storage.c @@ -248,7 +248,7 @@ sqlite3 *emstorage_get_db_handle(char *multi_user_name) } if (!result_db_handle) - EM_DEBUG_LOG("no db_handle for [%d] found", current_thread_id); + EM_DEBUG_LOG("no db_handle for [%lu] found", current_thread_id); EM_DEBUG_FUNC_END(); return result_db_handle; @@ -267,7 +267,7 @@ int emstorage_set_db_handle(char *multi_user_name, sqlite3 *db_handle) _db_handle_list[i].db_handle = db_handle; /* Only distinguished container and host */ _db_handle_list[i].user_name = EM_SAFE_STRDUP(multi_user_name); - EM_DEBUG_LOG("current_thread_id [%d], index [%d]", current_thread_id, i); + EM_DEBUG_LOG("current_thread_id [%lu], index [%d]", current_thread_id, i); error_code = EMAIL_ERROR_NONE; break; } @@ -1277,7 +1277,7 @@ static int _get_stmt_field_data_time_t(DB_STMT hStmt, time_t *buf, int index) static int _get_stmt_field_data_string(DB_STMT hStmt, char **buf, int ucs2, int index) { if (!hStmt || !buf || (index < 0)) { /*prevent 39619*/ - EM_DEBUG_EXCEPTION("hStmt[%d], buf[%p], index[%d]", hStmt, buf, index); + EM_DEBUG_EXCEPTION("No hStmt, buf[%p], index[%d]", buf, index); return false; } @@ -1312,7 +1312,7 @@ static int _get_stmt_field_data_string(DB_STMT hStmt, char **buf, int ucs2, int static void _get_stmt_field_data_blob(DB_STMT hStmt, void **buf, int index) { if (!hStmt || !buf || (index < 0)) { /*prevent 39618*/ - EM_DEBUG_EXCEPTION("hStmt[%d], buf[%p], index[%d]", hStmt, buf, index); + EM_DEBUG_EXCEPTION("No hStmt, buf[%p], index[%d]", buf, index); return; } @@ -2209,7 +2209,7 @@ INTERNAL_FUNC int emstorage_create_table(char *multi_user_name, emstorage_create EM_DEBUG_DB_EXEC(SQLITE_OK != rc, {goto FINISH_OFF; }, ("SQL(%s) sqlite3_get_table fail:%d -%s", sql, rc, sqlite3_errmsg(local_db_handle))); - EM_DEBUG_LOG("emstorage_create_table - result[1] = %s %c", result[1], result[1]); + EM_DEBUG_LOG("emstorage_create_table - result[1] = %s %s", result[1], result[1]); if (atoi(result[1]) < 1) { EMSTORAGE_PROTECTED_FUNC_CALL(sqlite3_exec(local_db_handle, "BEGIN;", NULL, NULL, NULL), rc); @@ -6596,7 +6596,7 @@ INTERNAL_FUNC int emstorage_get_count_read_mail_uid(char *multi_user_name, int a EM_DEBUG_FUNC_BEGIN("account_id[%d], mailbox_name[%p], count[%p], transaction[%d], err_code[%p]", account_id, mailbox_name , count, transaction, err_code); if (account_id < FIRST_ACCOUNT_ID || !mailbox_name || !count) { - EM_DEBUG_EXCEPTION(" account_id[%d], mailbox_name[%p], count[%p], exist[%p]", account_id, mailbox_name, count); + EM_DEBUG_EXCEPTION(" account_id[%d], mailbox_name[%s], count[%d] ", account_id, mailbox_name, *count); if (err_code != NULL) *err_code = EMAIL_ERROR_INVALID_PARAM; @@ -6782,7 +6782,7 @@ INTERNAL_FUNC int emstorage_get_downloaded_list(char *multi_user_name, int accou EM_PROFILE_BEGIN(emStorageGetDownloadList); EM_DEBUG_FUNC_BEGIN("account_id[%d], mailbox_id[%d], read_mail_uid[%p], count[%p], transaction[%d], err_code[%p]", account_id, mailbox_id, read_mail_uid, count, transaction, err_code); if (account_id < FIRST_ACCOUNT_ID || !read_mail_uid || !count) { - EM_DEBUG_EXCEPTION_SEC(" account_id[%d], mailbox_id[%s], read_mail_uid[%p], count[%p]", account_id, mailbox_id, read_mail_uid, count); + EM_DEBUG_EXCEPTION_SEC(" account_id[%d], mailbox_id[%d], read_mail_uid[%p], count[%p]", account_id, mailbox_id, read_mail_uid, count); if (err_code != NULL) *err_code = EMAIL_ERROR_INVALID_PARAM; @@ -8286,7 +8286,7 @@ INTERNAL_FUNC int emstorage_get_mail_field_by_multiple_mail_id(char *multi_user_ cur_sql_query_string += SNPRINTF_OFFSET(sql_query_string, cur_sql_query_string, query_string_length, "%d,", mail_ids[i]); sql_query_string[EM_SAFE_STRLEN(sql_query_string) - 1] = ')'; - EM_DEBUG_LOG_SEC("Query [%s], Length [%d]", sql_query_string, EM_SAFE_STRLEN(sql_query_string)); + EM_DEBUG_LOG_SEC("Query [%s], Length [%zu]", sql_query_string, EM_SAFE_STRLEN(sql_query_string)); EMSTORAGE_PROTECTED_FUNC_CALL(sqlite3_get_table(local_db_handle, sql_query_string, &result, &item_count, 0, NULL), rc); if (SQLITE_OK != rc && -1 != rc) { @@ -8566,7 +8566,7 @@ INTERNAL_FUNC int emstorage_mail_search_result(DB_STMT search_handle, emstorage_ EM_DEBUG_FUNC_BEGIN("search_handle[%d], type[%d], data[%p], transaction[%d], err_code[%p]", search_handle, type, data, transaction, err_code); if (search_handle == 0 || !data) { - EM_DEBUG_EXCEPTION(" search_handle[%d], type[%d], data[%p]", search_handle, type, data); + EM_DEBUG_EXCEPTION("No Search_handle type[%d], data[%p]", type, data); if (err_code != NULL) *err_code = EMAIL_ERROR_INVALID_PARAM; @@ -8716,7 +8716,7 @@ INTERNAL_FUNC int emstorage_mail_search_end(DB_STMT search_handle, int transacti int rc, ret = false; if (search_handle == 0) { - EM_DEBUG_EXCEPTION(" search_handle[%d]", search_handle); + EM_DEBUG_EXCEPTION("No search_handle"); error = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -11943,7 +11943,7 @@ INTERNAL_FUNC int emstorage_copy_file(char *src_file, char *dst_file, int sync_s error = EMAIL_ERROR_UNKNOWN; goto FINISH_OFF; } - EM_DEBUG_LOG("NWRITTEN [%d]", byte_written); + EM_DEBUG_LOG("NWRITTEN [%zu]", byte_written); remain_byte -= byte_written; buf_ptr += byte_written; } @@ -12957,7 +12957,7 @@ INTERNAL_FUNC int emstorage_get_thread_id_of_thread_mails(char *multi_user_name, goto FINISH_OFF; } - EM_DEBUG_LOG_SEC("em_find_pos_stripped_subject_for_thread_view returns[len = %d] = %s", + EM_DEBUG_LOG_SEC("em_find_pos_stripped_subject_for_thread_view returns[len = %zu] = %s", EM_SAFE_STRLEN(stripped_subject), stripped_subject); if (account_id > 0) { @@ -13103,7 +13103,7 @@ INTERNAL_FUNC int emstorage_get_thread_id_from_mailbox(char *multi_user_name, in goto FINISH_OFF; } - EM_DEBUG_LOG("em_find_pos_stripped_subject_for_thread_view returns[len = %d] = %s", EM_SAFE_STRLEN(stripped_subject), stripped_subject); + EM_DEBUG_LOG("em_find_pos_stripped_subject_for_thread_view returns[len = %zu] = %s", EM_SAFE_STRLEN(stripped_subject), stripped_subject); if (account_id > 0) { query_size_account = 3 + EM_SAFE_STRLEN(sql_format_account); @@ -13410,7 +13410,7 @@ INTERNAL_FUNC int emstorage_add_pbd_activity(char *multi_user_name, email_event_ EM_DEBUG_FUNC_BEGIN("local_activity[%p], activity_id[%p], transaction[%d], err_code[%p]", local_activity, activity_id, transaction, err_code); if (!local_activity || !activity_id) { - EM_DEBUG_EXCEPTION("local_activity[%p], transaction[%d], activity_id[%p], err_code[%p]", local_activity, activity_id, transaction, err_code); + EM_DEBUG_EXCEPTION("local_activity[%p], transaction[%d], activity_id[%p], err_code[%p]", local_activity, transaction, activity_id, err_code); if (err_code != NULL) *err_code = EMAIL_ERROR_INVALID_PARAM; return false; @@ -14646,7 +14646,7 @@ INTERNAL_FUNC int emstorage_add_meeting_request(char *multi_user_name, int accou if (!meeting_req || meeting_req->mail_id <= 0) { if (meeting_req) - EM_DEBUG_EXCEPTION("mail_id[%]d", meeting_req->mail_id); + EM_DEBUG_EXCEPTION("mail_id[%d]", meeting_req->mail_id); if (err_code != NULL) *err_code = EMAIL_ERROR_INVALID_PARAM; diff --git a/email-daemon/email-daemon-mail.c b/email-daemon/email-daemon-mail.c index d4dce4d..4232ef2 100755 --- a/email-daemon/email-daemon-mail.c +++ b/email-daemon/email-daemon-mail.c @@ -428,7 +428,7 @@ int emdaemon_get_attachment(char *multi_user_name, int attachment_id, email_atta int err = EMAIL_ERROR_NONE; if (!attachment_id || !attachment) { - EM_DEBUG_EXCEPTION("mail_id[%d], attachment_id[%d], attachment[%p]\n", attachment_id, attachment); + EM_DEBUG_EXCEPTION("attachment_id[%d], attachment[%p]\n", attachment_id, attachment); err = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -459,7 +459,7 @@ int emdaemon_add_attachment(char *multi_user_name, int mail_id, email_attachment int err = EMAIL_ERROR_NONE; if (!attachment) { - EM_DEBUG_EXCEPTION(" mailbox[%p], mail_id[%d], attachment[%p]", mail_id, attachment); + EM_DEBUG_EXCEPTION("mail_id[%d], attachment[%p]", mail_id, attachment); err = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } @@ -526,7 +526,7 @@ INTERNAL_FUNC int emdaemon_download_attachment(char *multi_user_name, int accoun email_event_t *event_data = NULL; if (!nth) { - EM_DEBUG_EXCEPTION("nth[%p] is invalid", nth); + EM_DEBUG_EXCEPTION("nth[%d] is invalid", nth); err = EMAIL_ERROR_INVALID_PARAM; goto FINISH_OFF; } diff --git a/email-ipc/email-ipc-api/email-ipc-param-list.c b/email-ipc/email-ipc-api/email-ipc-param-list.c index 7cf7c23..f3aefb9 100755 --- a/email-ipc/email-ipc-api/email-ipc-param-list.c +++ b/email-ipc/email-ipc-api/email-ipc-param-list.c @@ -149,7 +149,7 @@ EXPORT_API unsigned char *emipc_serialize_param_list(emipc_param_list *param_lis int pos = sizeof(int) * eSTREAM_COUNT; if (pos + (int)sizeof(param_list->param_count) > stream_len) { - EM_DEBUG_EXCEPTION("%d > stream_len", pos + sizeof(param_list->param_count)); + EM_DEBUG_EXCEPTION("%zu > stream_len", pos + sizeof(param_list->param_count)); EM_SAFE_FREE(param_list->byte_stream); goto FINISH_OFF; } @@ -172,7 +172,7 @@ EXPORT_API unsigned char *emipc_serialize_param_list(emipc_param_list *param_lis } if (pos + (int)sizeof(int) > stream_len) { - EM_DEBUG_EXCEPTION("%d > stream_len", pos + sizeof(int)); + EM_DEBUG_EXCEPTION("%zu > stream_len", pos + sizeof(int)); EM_SAFE_FREE(param_list->byte_stream); goto FINISH_OFF; } diff --git a/email-ipc/email-proxy/email-proxy-socket.c b/email-ipc/email-proxy/email-proxy-socket.c index e9e0ebe..d9ab750 100755 --- a/email-ipc/email-proxy/email-proxy-socket.c +++ b/email-ipc/email-proxy/email-proxy-socket.c @@ -282,7 +282,7 @@ EXPORT_API int emipc_recv_proxy_socket(char **data) EM_DEBUG_FUNC_BEGIN(); int socket_fd = emipc_get_proxy_socket_id(); if (!socket_fd) { - EM_DEBUG_EXCEPTION("[IPCLib] proxy_socket_fd[%p] is not available or disconnected", socket_fd); + EM_DEBUG_EXCEPTION("[IPCLib] proxy_socket_fd[%d] is not available or disconnected", socket_fd); return EMAIL_ERROR_IPC_SOCKET_FAILURE; } |