diff options
| author | Sunghyun Kwon <sh0701.kwon@samsung.com> | 2015-09-21 21:45:03 +0900 |
|---|---|---|
| committer | Sunghyun Kwon <sh0701.kwon@samsung.com> | 2015-09-21 21:45:03 +0900 |
| commit | ce389cb24c27e22cefc9d796e60e39305b224c94 (patch) | |
| tree | 65789639d211eeadffcc8e4f8f4169a53541fcbb /email-common-use | |
| parent | 0c7e013d0772cfbdfe692a8b64220e9588d00225 (diff) | |
| download | email-service-ce389cb24c27e22cefc9d796e60e39305b224c94.tar.gz email-service-ce389cb24c27e22cefc9d796e60e39305b224c94.tar.bz2 email-service-ce389cb24c27e22cefc9d796e60e39305b224c94.zip | |
Merged the tizen 2.4
Change-Id: I3fec60f2d5942aee01d1996a664dc3318b756306
Diffstat (limited to 'email-common-use')
| -rwxr-xr-x | email-common-use/email-convert.c | 8 | ||||
| -rwxr-xr-x | email-common-use/email-utilities.c | 8 | ||||
| -rwxr-xr-x | email-common-use/include/email-types.h | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/email-common-use/email-convert.c b/email-common-use/email-convert.c index 3dc30b5..35cc901 100755 --- a/email-common-use/email-convert.c +++ b/email-common-use/email-convert.c @@ -748,8 +748,8 @@ static char *convert_format(char *fmt) c++; } - EM_DEBUG_LOG("original fmt : [%s]", fmt); - EM_DEBUG_LOG("converted_fmt : [%s]", converted_fmt); + EM_DEBUG_LOG_DEV("original fmt : [%s]", fmt); + EM_DEBUG_LOG_DEV("converted_fmt : [%s]", converted_fmt); ret = true; @@ -1410,6 +1410,8 @@ INTERNAL_FUNC char* em_convert_search_filter_to_byte_stream(email_search_filter_ case EMAIL_SEARCH_FILTER_TYPE_TO : case EMAIL_SEARCH_FILTER_TYPE_MESSAGE_ID : case EMAIL_SEARCH_FILTER_TYPE_ATTACHMENT_NAME : + case EMAIL_SEARCH_FILTER_TYPE_CHARSET : + case EMAIL_SEARCH_FILTER_TYPE_USER_DEFINED : result_stream = append_string_to_stream(result_stream, &stream_size, input_search_filter_list[i].search_filter_key_value.string_type_key_value); break; @@ -1490,6 +1492,8 @@ INTERNAL_FUNC void em_convert_byte_stream_to_search_filter(char *input_stream, case EMAIL_SEARCH_FILTER_TYPE_TO : case EMAIL_SEARCH_FILTER_TYPE_MESSAGE_ID : case EMAIL_SEARCH_FILTER_TYPE_ATTACHMENT_NAME : + case EMAIL_SEARCH_FILTER_TYPE_CHARSET : + case EMAIL_SEARCH_FILTER_TYPE_USER_DEFINED : fetch_string_from_stream(input_stream, &stream_offset, &(local_search_filter[i].search_filter_key_value.string_type_key_value)); break; diff --git a/email-common-use/email-utilities.c b/email-common-use/email-utilities.c index 9c86fb5..ea2f78b 100755 --- a/email-common-use/email-utilities.c +++ b/email-common-use/email-utilities.c @@ -52,10 +52,14 @@ INTERNAL_FUNC void* em_malloc(int len) return NULL; } - void *p = calloc(1,len); - if (!p) + void *p = NULL; + p = malloc(len); + if (!p) { EM_DEBUG_PERROR("malloc failed"); + return NULL; + } + memset(p, 0x00, len); return p; } diff --git a/email-common-use/include/email-types.h b/email-common-use/include/email-types.h index 3add43d..e379c48 100755 --- a/email-common-use/include/email-types.h +++ b/email-common-use/include/email-types.h @@ -1112,6 +1112,8 @@ typedef enum { EMAIL_SEARCH_FILTER_TYPE_MESSAGE_ID = 43, /* string type */ /**< Messages with specified message ID */ EMAIL_SEARCH_FILTER_TYPE_HEADER_PRIORITY = 50, /* integer type */ /**< Messages that have a header with the specified priority */ EMAIL_SEARCH_FILTER_TYPE_ATTACHMENT_NAME = 60, /* string type */ /**< Messages that contain the specified string in attachment name */ + EMAIL_SEARCH_FILTER_TYPE_CHARSET = 61, /* string type */ /**< Messages of encoded type */ + EMAIL_SEARCH_FILTER_TYPE_USER_DEFINED = 62, /* string type */ /**< Messages that extend and user defined string */ } email_search_filter_type; typedef enum { |