From e7e1a81921e21c992dd87a5cd06b8105c789577c Mon Sep 17 00:00:00 2001 From: Sameer Prakash Pradhan Date: Fri, 20 Apr 2018 17:30:07 +0530 Subject: [PATCH] [UTC][accounts,contacts,calendar,context,fido-client][Non-ACR][Svace fixes] Signed-off-by: Sameer Prakash Pradhan Change-Id: I8a62d7857995c1047abdae8645afd742ff84d690 --- src/utc/accounts-svc/utc-accounts-svc.c | 132 +++++++++++++++------ src/utc/calendar-service2/utc-calendar-util.c | 1 + src/utc/calendar-service2/utc-calendar-vcalendar.c | 6 +- .../utc-contacts-service-record-activity-photo.c | 75 ++++++++++-- .../utc-contacts-service-record-company.c | 76 ++++++++++-- .../utc-contacts-service-record-contact.c | 76 ++++++++++-- .../utc-contacts-service-record-group.c | 75 ++++++++++-- .../utc-contacts-service-record-image.c | 77 ++++++++++-- .../utc-contacts-service-record-name.c | 2 - .../utc-contacts-service-record-number.c | 2 - .../utc-contacts-service-record-person.c | 75 ++++++++++-- src/utc/context/utc-context-trigger.c | 8 +- src/utc/fido-client/utc-fido-client.c | 12 +- 13 files changed, 527 insertions(+), 90 deletions(-) diff --git a/src/utc/accounts-svc/utc-accounts-svc.c b/src/utc/accounts-svc/utc-accounts-svc.c index 868bc2c..9c21e1d 100755 --- a/src/utc/accounts-svc/utc-accounts-svc.c +++ b/src/utc/accounts-svc/utc-accounts-svc.c @@ -66,6 +66,19 @@ } \ } while (0) +#define assert_eq_free_only_text(var, ref, var1 ,var2) \ + do { \ + if (var != ref) { \ + fprintf(stderr, \ + "\\n[TCT][%s][Line : %d] Assert fail; Values (%s == 0x%x) and (%s == 0x%x) are not equal\\n", \ + __FILE__, __LINE__, #var, (int)var, #ref, (int)ref); \ + _account_free_text(var1); \ + _account_free_text(var2); \ + return 1; \ + } \ + } while (0) + + #define assert_eq_free_text(var, ref, var1, var2) \ do { \ @@ -4240,9 +4253,6 @@ int utc_account_type_get_icon_path_p(void) char *ret_icon_path = NULL; char* icon_path = NULL; - icon_path = _account_get_path(ICON); - dlog_print(DLOG_ERROR, "ACCOUNT_TC", "icon_path %s", icon_path); - ret = account_type_create(&account_type); if(!is_account_supported){assert_eq(ret, ACCOUNT_ERROR_NOT_SUPPORTED);} else{assert_eq(ret, ACCOUNT_ERROR_NONE);} @@ -4251,16 +4261,19 @@ int utc_account_type_get_icon_path_p(void) if(!is_account_supported){assert_eq(ret, ACCOUNT_ERROR_NOT_SUPPORTED);} else{assert_eq(ret, ACCOUNT_ERROR_NONE);} + icon_path = _account_get_path(ICON); + dlog_print(DLOG_ERROR, "ACCOUNT_TC", "icon_path %s", icon_path); + ret = account_type_get_icon_path(account_type, &ret_icon_path); if(!is_account_supported) { - assert_eq(ret, ACCOUNT_ERROR_NOT_SUPPORTED); + assert_eq_free_only_text(ret, ACCOUNT_ERROR_NOT_SUPPORTED, icon_path, ret_icon_path); } else { - assert_eq(ret, ACCOUNT_ERROR_NONE); + assert_eq_free_only_text(ret, ACCOUNT_ERROR_NONE, icon_path, ret_icon_path); dlog_print(DLOG_ERROR, "ACCOUNT_TC", "ret_icon_path %s", ret_icon_path); - assert_eq(strcmp(ret_icon_path, icon_path), 0); + assert_eq_free_only_text(strcmp(ret_icon_path, icon_path), 0 , icon_path, ret_icon_path); } _account_free_text(ret_icon_path); _account_free_text(icon_path); @@ -4695,9 +4708,6 @@ int utc_account_type_get_small_icon_path_p(void) const char *app_id = TEST_PACKAGE_NAME; char *small_icon_path = NULL; - small_icon_path = _account_get_path(SMALL_ICON); - dlog_print(DLOG_ERROR, "ACCOUNT_TC", "small_icon_path %s", small_icon_path); - ret = account_type_create(&account_type); if(!is_account_supported){assert_eq(ret, ACCOUNT_ERROR_NOT_SUPPORTED);} else{assert_eq(ret, ACCOUNT_ERROR_NONE);} @@ -4706,16 +4716,19 @@ int utc_account_type_get_small_icon_path_p(void) if(!is_account_supported){assert_eq(ret, ACCOUNT_ERROR_NOT_SUPPORTED);} else{assert_eq(ret, ACCOUNT_ERROR_NONE);} + small_icon_path = _account_get_path(SMALL_ICON); + dlog_print(DLOG_ERROR, "ACCOUNT_TC", "small_icon_path %s", small_icon_path); + ret = account_type_get_small_icon_path(account_type, &ret_small_icon_path); if(!is_account_supported) { - assert_eq(ret, ACCOUNT_ERROR_NOT_SUPPORTED); + assert_eq_free_only_text(ret, ACCOUNT_ERROR_NOT_SUPPORTED, small_icon_path, ret_small_icon_path); } else { - assert_eq(ret, ACCOUNT_ERROR_NONE); + assert_eq_free_only_text(ret, ACCOUNT_ERROR_NONE, small_icon_path, ret_small_icon_path); dlog_print(DLOG_ERROR, "ACCOUNT_TC", "ret_small_icon_path %s", ret_small_icon_path); - assert_eq(strcmp(ret_small_icon_path, small_icon_path), 0); + assert_eq_free_only_text(strcmp(ret_small_icon_path, small_icon_path), 0, small_icon_path, ret_small_icon_path); } _account_free_text(ret_small_icon_path); _account_free_text(small_icon_path); @@ -4897,11 +4910,6 @@ static bool account_type_for_query_by_provider_cb(account_type_h account_type, v check_fail(account_type != NULL); - test_icon_path = _account_get_path(ICON); - test_small_icon_path = _account_get_path(SMALL_ICON); - dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_icon_path %s", test_icon_path); - dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_small_icon_path %s", test_small_icon_path); - ret = account_type_get_app_id(account_type, &app_id); if(is_account_supported) { check_fail(ret == ACCOUNT_ERROR_NONE); @@ -4909,21 +4917,50 @@ static bool account_type_for_query_by_provider_cb(account_type_h account_type, v } _account_free_text(app_id); + test_icon_path = _account_get_path(ICON); + dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_icon_path %s", test_icon_path); + + ret = account_type_get_icon_path(account_type, &icon_path); if(is_account_supported) { - check_fail(ret == ACCOUNT_ERROR_NONE); - check_fail(strcmp(test_icon_path, icon_path)==0); + if (!(ret == ACCOUNT_ERROR_NONE)) + { + _is_fail = true; + _account_free_text(icon_path); + _account_free_text(test_icon_path); + return true; + } + if (!(strcmp(test_icon_path, icon_path)==0)) + { + _is_fail = true; + _account_free_text(icon_path); + _account_free_text(test_icon_path); + return true; + } } _account_free_text(icon_path); _account_free_text(test_icon_path); ret = account_type_get_small_icon_path(account_type, &small_icon_path); if(is_account_supported) { - check_fail(ret == ACCOUNT_ERROR_NONE); - check_fail(strcmp(test_small_icon_path, small_icon_path)==0); + if (!(ret == ACCOUNT_ERROR_NONE)) + { + _is_fail = true; + _account_free_text(small_icon_path); + return true; + } + test_small_icon_path = _account_get_path(SMALL_ICON); + dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_small_icon_path %s", test_small_icon_path); + if (!(strcmp(test_small_icon_path, small_icon_path)==0)) + { + _is_fail = true; + _account_free_text(small_icon_path); + _account_free_text(test_small_icon_path); + return true; + } + _account_free_text(small_icon_path); + _account_free_text(test_small_icon_path); } - _account_free_text(small_icon_path); - _account_free_text(test_small_icon_path); ret = account_type_get_multiple_account_support(account_type, &multi_account_support); if(is_account_supported) { @@ -5379,11 +5416,6 @@ static bool account_type_cb_func(account_type_h account_type, void *user_data) { check_fail(account_type != NULL); - test_icon_path = _account_get_path(ICON); - test_small_icon_path = _account_get_path(SMALL_ICON); - dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_icon_path %s", test_icon_path); - dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_small_icon_path %s", test_small_icon_path); - ret = account_type_get_app_id(account_type, &app_id); if(is_account_supported) { if(ret != ACCOUNT_ERROR_NONE) { @@ -5400,21 +5432,53 @@ static bool account_type_cb_func(account_type_h account_type, void *user_data) { } _account_free_text(app_id); + test_icon_path = _account_get_path(ICON); + dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_icon_path %s", test_icon_path); + + ret = account_type_get_icon_path(account_type, &icon_path); - if(is_account_supported) { - check_fail(ret == ACCOUNT_ERROR_NONE); - check_fail(strcmp(test_icon_path, icon_path)==0); + if(is_account_supported) + { + if (!(ret == ACCOUNT_ERROR_NONE)) + { + _is_fail = true; + _account_free_text(icon_path); + _account_free_text(test_icon_path); + return true; + } + if (!(strcmp(test_icon_path, icon_path)==0)) + { + _is_fail = true; + _account_free_text(icon_path); + _account_free_text(test_icon_path); + return true; + } } _account_free_text(icon_path); _account_free_text(test_icon_path); ret = account_type_get_small_icon_path(account_type, &small_icon_path); if(is_account_supported) { - check_fail(ret == ACCOUNT_ERROR_NONE); - check_fail(strcmp(test_small_icon_path, small_icon_path)==0); + if (!(ret == ACCOUNT_ERROR_NONE)) + { + _is_fail = true; + _account_free_text(small_icon_path); + return true; + } + + test_small_icon_path = _account_get_path(SMALL_ICON); + dlog_print(DLOG_ERROR, "ACCOUNT_TC", "test_small_icon_path %s", test_small_icon_path); + + if (!(strcmp(test_small_icon_path, small_icon_path)==0)) + { + _is_fail = true; + _account_free_text(small_icon_path); + _account_free_text(test_small_icon_path); + return true; + } + _account_free_text(test_small_icon_path); } _account_free_text(small_icon_path); - _account_free_text(test_small_icon_path); ret = account_type_get_multiple_account_support(account_type, &multi_account_support); if(is_account_supported) { diff --git a/src/utc/calendar-service2/utc-calendar-util.c b/src/utc/calendar-service2/utc-calendar-util.c index 0fa95cf..e4dc325 100755 --- a/src/utc/calendar-service2/utc-calendar-util.c +++ b/src/utc/calendar-service2/utc-calendar-util.c @@ -137,6 +137,7 @@ void _clean_db_event(void) fprintf(stderr, "Calendar record get error at %s:%d\n", __FILE__, __LINE__); calendar_list_destroy(list, true); calendar_list_destroy(event, true); + free(ids); return; } calendar_list_next(list); diff --git a/src/utc/calendar-service2/utc-calendar-vcalendar.c b/src/utc/calendar-service2/utc-calendar-vcalendar.c index 3a9e59c..6782151 100755 --- a/src/utc/calendar-service2/utc-calendar-vcalendar.c +++ b/src/utc/calendar-service2/utc-calendar-vcalendar.c @@ -71,7 +71,11 @@ void utc_calendar_vcalendar_startup(void) PRINT_UTC_LOG("[Line : %d][%s] 'DEVICE_SUITE_TARGET_30' Values Received = %s\\n", __LINE__, API_NAMESPACE, pszValue); int ics_path_len = strlen(pszValue) + strlen(ics_file) + 6; ics_path = (char*)malloc(ics_path_len); - CHECK_HANDLE(ics_path,"malloc:failure:utc_calendar_vcalendar_startup"); + if (ics_path == NULL) + { + fprintf(stderr, "Malloc error at %s:%d\n", __FILE__, __LINE__); + return; + } snprintf(ics_path, ics_path_len, "%s/res/%s", pszValue, ics_file); } else diff --git a/src/utc/contacts-service2/utc-contacts-service-record-activity-photo.c b/src/utc/contacts-service2/utc-contacts-service-record-activity-photo.c index b90fd87..286fadd 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-activity-photo.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-activity-photo.c @@ -65,14 +65,73 @@ static void _ctsvc_tc_load_view_activity_photo() _view_activity_photo.update2 = calloc(_view_activity_photo.update2_count, sizeof(ctsvc_property_s)); int i; - for (i=0;i<_view_activity_photo.create1_count;i++) - _view_activity_photo.create1[i] = activity_photo_create1[i]; - for (i=0;i<_view_activity_photo.create2_count;i++) - _view_activity_photo.create2[i] = activity_photo_create2[i]; - for (i=0;i<_view_activity_photo.update1_count;i++) - _view_activity_photo.update1[i] = activity_photo_update1[i]; - for (i=0;i<_view_activity_photo.update2_count;i++) - _view_activity_photo.update2[i] = activity_photo_update2[i]; + for (i=0;i<_view_activity_photo.create1_count;i++) { + _view_activity_photo.create1[i].property_id = activity_photo_create1[i].property_id; + _view_activity_photo.create1[i].type = activity_photo_create1[i].type; + if (PROPERTY_STR == _view_activity_photo.create1[i].type) { + _view_activity_photo.create1[i].val.str_val = strdup(activity_photo_create1[i].val.str_val); + free(activity_photo_create1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_activity_photo.create1[i].type) { + _view_activity_photo.create1[i].val.bool_val = activity_photo_create1[i].val.bool_val; + } else if (PROPERTY_INT == _view_activity_photo.create1[i].type) { + _view_activity_photo.create1[i].val.int_val = activity_photo_create1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_activity_photo.create1[i].type) { + _view_activity_photo.create1[i].val.double_val = activity_photo_create1[i].val.double_val; + } else if (PROPERTY_LLI == _view_activity_photo.create1[i].type) { + _view_activity_photo.create1[i].val.lli_val = activity_photo_create1[i].val.lli_val; + } + } + + for (i=0;i<_view_activity_photo.create2_count;i++) { + _view_activity_photo.create2[i].property_id = activity_photo_create2[i].property_id; + _view_activity_photo.create2[i].type = activity_photo_create2[i].type; + if (PROPERTY_STR == _view_activity_photo.create2[i].type) { + _view_activity_photo.create2[i].val.str_val = strdup(activity_photo_create2[i].val.str_val); + free(activity_photo_create2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_activity_photo.create2[i].type) { + _view_activity_photo.create2[i].val.bool_val = activity_photo_create2[i].val.bool_val; + } else if (PROPERTY_INT == _view_activity_photo.create2[i].type) { + _view_activity_photo.create2[i].val.int_val = activity_photo_create2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_activity_photo.create2[i].type) { + _view_activity_photo.create2[i].val.double_val = activity_photo_create2[i].val.double_val; + } else if (PROPERTY_LLI == _view_activity_photo.create2[i].type) { + _view_activity_photo.create2[i].val.lli_val = activity_photo_create2[i].val.lli_val; + } + } + + for (i=0;i<_view_activity_photo.update1_count;i++) { + _view_activity_photo.update1[i].property_id = activity_photo_update1[i].property_id; + _view_activity_photo.update1[i].type = activity_photo_update1[i].type; + if (PROPERTY_STR == _view_activity_photo.update1[i].type) { + _view_activity_photo.update1[i].val.str_val = strdup(activity_photo_update1[i].val.str_val); + free(activity_photo_update1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_activity_photo.update1[i].type) { + _view_activity_photo.update1[i].val.bool_val = activity_photo_update1[i].val.bool_val; + } else if (PROPERTY_INT == _view_activity_photo.update1[i].type) { + _view_activity_photo.update1[i].val.int_val = activity_photo_update1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_activity_photo.update1[i].type) { + _view_activity_photo.update1[i].val.double_val = activity_photo_update1[i].val.double_val; + } else if (PROPERTY_LLI == _view_activity_photo.update1[i].type) { + _view_activity_photo.update1[i].val.lli_val = activity_photo_update1[i].val.lli_val; + } + } + + for (i=0;i<_view_activity_photo.update2_count;i++) { + _view_activity_photo.update2[i].property_id = activity_photo_update2[i].property_id; + _view_activity_photo.update2[i].type = activity_photo_update2[i].type; + if (PROPERTY_STR == _view_activity_photo.update2[i].type) { + _view_activity_photo.update2[i].val.str_val = strdup(activity_photo_update2[i].val.str_val); + free(activity_photo_update2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_activity_photo.update2[i].type) { + _view_activity_photo.update2[i].val.bool_val = activity_photo_update2[i].val.bool_val; + } else if (PROPERTY_INT == _view_activity_photo.update2[i].type) { + _view_activity_photo.update2[i].val.int_val = activity_photo_update2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_activity_photo.update2[i].type) { + _view_activity_photo.update2[i].val.double_val = activity_photo_update2[i].val.double_val; + } else if (PROPERTY_LLI == _view_activity_photo.update2[i].type) { + _view_activity_photo.update2[i].val.lli_val = activity_photo_update2[i].val.lli_val; + } + } } static int _ctsvc_tc_record_free_property_activity_photo() diff --git a/src/utc/contacts-service2/utc-contacts-service-record-company.c b/src/utc/contacts-service2/utc-contacts-service-record-company.c index 8b97b93..24841ea 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-company.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-company.c @@ -133,15 +133,75 @@ static void _ctsvc_tc_load_view_company() _view_company.update1 = calloc(_view_company.update1_count, sizeof(ctsvc_property_s)); _view_company.update2 = calloc(_view_company.update2_count, sizeof(ctsvc_property_s)); + int i; - for (i=0;i<_view_company.create1_count;i++) - _view_company.create1[i] = company_create1[i]; - for (i=0;i<_view_company.create2_count;i++) - _view_company.create2[i] = company_create2[i]; - for (i=0;i<_view_company.update1_count;i++) - _view_company.update1[i] = company_update1[i]; - for (i=0;i<_view_company.update2_count;i++) - _view_company.update2[i] = company_update2[i]; + for (i=0;i<_view_company.create1_count;i++) { + _view_company.create1[i].property_id = company_create1[i].property_id; + _view_company.create1[i].type = company_create1[i].type; + if (PROPERTY_STR == _view_company.create1[i].type) { + _view_company.create1[i].val.str_val = strdup(company_create1[i].val.str_val); + free(company_create1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_company.create1[i].type) { + _view_company.create1[i].val.bool_val = company_create1[i].val.bool_val; + } else if (PROPERTY_INT == _view_company.create1[i].type) { + _view_company.create1[i].val.int_val = company_create1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_company.create1[i].type) { + _view_company.create1[i].val.double_val = company_create1[i].val.double_val; + } else if (PROPERTY_LLI == _view_company.create1[i].type) { + _view_company.create1[i].val.lli_val = company_create1[i].val.lli_val; + } + } + + for (i=0;i<_view_company.create2_count;i++) { + _view_company.create2[i].property_id = company_create2[i].property_id; + _view_company.create2[i].type = company_create2[i].type; + if (PROPERTY_STR == _view_company.create2[i].type) { + _view_company.create2[i].val.str_val = strdup(company_create2[i].val.str_val); + free(company_create2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_company.create2[i].type) { + _view_company.create2[i].val.bool_val = company_create2[i].val.bool_val; + } else if (PROPERTY_INT == _view_company.create2[i].type) { + _view_company.create2[i].val.int_val = company_create2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_company.create2[i].type) { + _view_company.create2[i].val.double_val = company_create2[i].val.double_val; + } else if (PROPERTY_LLI == _view_company.create2[i].type) { + _view_company.create2[i].val.lli_val = company_create2[i].val.lli_val; + } + } + + for (i=0;i<_view_company.update1_count;i++) { + _view_company.update1[i].property_id = company_update1[i].property_id; + _view_company.update1[i].type = company_update1[i].type; + if (PROPERTY_STR == _view_company.update1[i].type) { + _view_company.update1[i].val.str_val = strdup(company_update1[i].val.str_val); + free(company_update1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_company.update1[i].type) { + _view_company.update1[i].val.bool_val = company_update1[i].val.bool_val; + } else if (PROPERTY_INT == _view_company.update1[i].type) { + _view_company.update1[i].val.int_val = company_update1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_company.update1[i].type) { + _view_company.update1[i].val.double_val = company_update1[i].val.double_val; + } else if (PROPERTY_LLI == _view_company.update1[i].type) { + _view_company.update1[i].val.lli_val = company_update1[i].val.lli_val; + } + } + + for (i=0;i<_view_company.update2_count;i++) { + _view_company.update2[i].property_id = company_update2[i].property_id; + _view_company.update2[i].type = company_update2[i].type; + if (PROPERTY_STR == _view_company.update2[i].type) { + _view_company.update2[i].val.str_val = strdup(company_update2[i].val.str_val); + free(company_update2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_company.update2[i].type) { + _view_company.update2[i].val.bool_val = company_update2[i].val.bool_val; + } else if (PROPERTY_INT == _view_company.update2[i].type) { + _view_company.update2[i].val.int_val = company_update2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_company.update2[i].type) { + _view_company.update2[i].val.double_val = company_update2[i].val.double_val; + } else if (PROPERTY_LLI == _view_company.update2[i].type) { + _view_company.update2[i].val.lli_val = company_update2[i].val.lli_val; + } + } } static int _ctsvc_tc_record_free_property_company() diff --git a/src/utc/contacts-service2/utc-contacts-service-record-contact.c b/src/utc/contacts-service2/utc-contacts-service-record-contact.c index 40424cf..ae7bffa 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-contact.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-contact.c @@ -104,15 +104,75 @@ static void _ctsvc_tc_load_view_contact() _view_contact.update1 = calloc(_view_contact.update1_count, sizeof(ctsvc_property_s)); _view_contact.update2 = calloc(_view_contact.update2_count, sizeof(ctsvc_property_s)); + int i; - for (i=0;i<_view_contact.create1_count;i++) - _view_contact.create1[i] = contact_create1[i]; - for (i=0;i<_view_contact.create2_count;i++) - _view_contact.create2[i] = contact_create2[i]; - for (i=0;i<_view_contact.update1_count;i++) - _view_contact.update1[i] = contact_update1[i]; - for (i=0;i<_view_contact.update2_count;i++) - _view_contact.update2[i] = contact_update2[i]; + for (i=0;i<_view_contact.create1_count;i++) { + _view_contact.create1[i].property_id = contact_create1[i].property_id; + _view_contact.create1[i].type = contact_create1[i].type; + if (PROPERTY_STR == _view_contact.create1[i].type) { + _view_contact.create1[i].val.str_val = strdup(contact_create1[i].val.str_val); + free(contact_create1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_contact.create1[i].type) { + _view_contact.create1[i].val.bool_val = contact_create1[i].val.bool_val; + } else if (PROPERTY_INT == _view_contact.create1[i].type) { + _view_contact.create1[i].val.int_val = contact_create1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_contact.create1[i].type) { + _view_contact.create1[i].val.double_val = contact_create1[i].val.double_val; + } else if (PROPERTY_LLI == _view_contact.create1[i].type) { + _view_contact.create1[i].val.lli_val = contact_create1[i].val.lli_val; + } + } + + for (i=0;i<_view_contact.create2_count;i++) { + _view_contact.create2[i].property_id = contact_create2[i].property_id; + _view_contact.create2[i].type = contact_create2[i].type; + if (PROPERTY_STR == _view_contact.create2[i].type) { + _view_contact.create2[i].val.str_val = strdup(contact_create2[i].val.str_val); + free(contact_create2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_contact.create2[i].type) { + _view_contact.create2[i].val.bool_val = contact_create2[i].val.bool_val; + } else if (PROPERTY_INT == _view_contact.create2[i].type) { + _view_contact.create2[i].val.int_val = contact_create2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_contact.create2[i].type) { + _view_contact.create2[i].val.double_val = contact_create2[i].val.double_val; + } else if (PROPERTY_LLI == _view_contact.create2[i].type) { + _view_contact.create2[i].val.lli_val = contact_create2[i].val.lli_val; + } + } + + for (i=0;i<_view_contact.update1_count;i++) { + _view_contact.update1[i].property_id = contact_update1[i].property_id; + _view_contact.update1[i].type = contact_update1[i].type; + if (PROPERTY_STR == _view_contact.update1[i].type) { + _view_contact.update1[i].val.str_val = strdup(contact_update1[i].val.str_val); + free(contact_update1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_contact.update1[i].type) { + _view_contact.update1[i].val.bool_val = contact_update1[i].val.bool_val; + } else if (PROPERTY_INT == _view_contact.update1[i].type) { + _view_contact.update1[i].val.int_val = contact_update1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_contact.update1[i].type) { + _view_contact.update1[i].val.double_val = contact_update1[i].val.double_val; + } else if (PROPERTY_LLI == _view_contact.update1[i].type) { + _view_contact.update1[i].val.lli_val = contact_update1[i].val.lli_val; + } + } + + for (i=0;i<_view_contact.update2_count;i++) { + _view_contact.update2[i].property_id = contact_update2[i].property_id; + _view_contact.update2[i].type = contact_update2[i].type; + if (PROPERTY_STR == _view_contact.update2[i].type) { + _view_contact.update2[i].val.str_val = strdup(contact_update2[i].val.str_val); + free(contact_update2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_contact.update2[i].type) { + _view_contact.update2[i].val.bool_val = contact_update2[i].val.bool_val; + } else if (PROPERTY_INT == _view_contact.update2[i].type) { + _view_contact.update2[i].val.int_val = contact_update2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_contact.update2[i].type) { + _view_contact.update2[i].val.double_val = contact_update2[i].val.double_val; + } else if (PROPERTY_LLI == _view_contact.update2[i].type) { + _view_contact.update2[i].val.lli_val = contact_update2[i].val.lli_val; + } + } } static int _ctsvc_tc_record_free_property_contact() diff --git a/src/utc/contacts-service2/utc-contacts-service-record-group.c b/src/utc/contacts-service2/utc-contacts-service-record-group.c index 7af4561..425e77c 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-group.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-group.c @@ -102,14 +102,73 @@ static void _ctsvc_tc_load_view_group() _view_group.update2 = calloc(_view_group.update2_count, sizeof(ctsvc_property_s)); int i; - for (i=0;i<_view_group.create1_count;i++) - _view_group.create1[i] = group_create1[i]; - for (i=0;i<_view_group.create2_count;i++) - _view_group.create2[i] = group_create2[i]; - for (i=0;i<_view_group.update1_count;i++) - _view_group.update1[i] = group_update1[i]; - for (i=0;i<_view_group.update2_count;i++) - _view_group.update2[i] = group_update2[i]; + for (i=0;i<_view_group.create1_count;i++) { + _view_group.create1[i].property_id = group_create1[i].property_id; + _view_group.create1[i].type = group_create1[i].type; + if (PROPERTY_STR == _view_group.create1[i].type) { + _view_group.create1[i].val.str_val = strdup(group_create1[i].val.str_val); + free(group_create1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_group.create1[i].type) { + _view_group.create1[i].val.bool_val = group_create1[i].val.bool_val; + } else if (PROPERTY_INT == _view_group.create1[i].type) { + _view_group.create1[i].val.int_val = group_create1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_group.create1[i].type) { + _view_group.create1[i].val.double_val = group_create1[i].val.double_val; + } else if (PROPERTY_LLI == _view_group.create1[i].type) { + _view_group.create1[i].val.lli_val = group_create1[i].val.lli_val; + } + } + + for (i=0;i<_view_group.create2_count;i++) { + _view_group.create2[i].property_id = group_create2[i].property_id; + _view_group.create2[i].type = group_create2[i].type; + if (PROPERTY_STR == _view_group.create2[i].type) { + _view_group.create2[i].val.str_val = strdup(group_create2[i].val.str_val); + free(group_create2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_group.create2[i].type) { + _view_group.create2[i].val.bool_val = group_create2[i].val.bool_val; + } else if (PROPERTY_INT == _view_group.create2[i].type) { + _view_group.create2[i].val.int_val = group_create2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_group.create2[i].type) { + _view_group.create2[i].val.double_val = group_create2[i].val.double_val; + } else if (PROPERTY_LLI == _view_group.create2[i].type) { + _view_group.create2[i].val.lli_val = group_create2[i].val.lli_val; + } + } + + for (i=0;i<_view_group.update1_count;i++) { + _view_group.update1[i].property_id = group_update1[i].property_id; + _view_group.update1[i].type = group_update1[i].type; + if (PROPERTY_STR == _view_group.update1[i].type) { + _view_group.update1[i].val.str_val = strdup(group_update1[i].val.str_val); + free(group_update1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_group.update1[i].type) { + _view_group.update1[i].val.bool_val = group_update1[i].val.bool_val; + } else if (PROPERTY_INT == _view_group.update1[i].type) { + _view_group.update1[i].val.int_val = group_update1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_group.update1[i].type) { + _view_group.update1[i].val.double_val = group_update1[i].val.double_val; + } else if (PROPERTY_LLI == _view_group.update1[i].type) { + _view_group.update1[i].val.lli_val = group_update1[i].val.lli_val; + } + } + + for (i=0;i<_view_group.update2_count;i++) { + _view_group.update2[i].property_id = group_update2[i].property_id; + _view_group.update2[i].type = group_update2[i].type; + if (PROPERTY_STR == _view_group.update2[i].type) { + _view_group.update2[i].val.str_val = strdup(group_update2[i].val.str_val); + free(group_update2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_group.update2[i].type) { + _view_group.update2[i].val.bool_val = group_update2[i].val.bool_val; + } else if (PROPERTY_INT == _view_group.update2[i].type) { + _view_group.update2[i].val.int_val = group_update2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_group.update2[i].type) { + _view_group.update2[i].val.double_val = group_update2[i].val.double_val; + } else if (PROPERTY_LLI == _view_group.update2[i].type) { + _view_group.update2[i].val.lli_val = group_update2[i].val.lli_val; + } + } } static int _ctsvc_tc_record_free_property_group() diff --git a/src/utc/contacts-service2/utc-contacts-service-record-image.c b/src/utc/contacts-service2/utc-contacts-service-record-image.c index 1aa3b3e..ea17460 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-image.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-image.c @@ -78,15 +78,76 @@ static void _ctsvc_tc_load_view_image() _view_image.update1 = calloc(_view_image.update1_count, sizeof(ctsvc_property_s)); _view_image.update2 = calloc(_view_image.update2_count, sizeof(ctsvc_property_s)); + int i; - for (i=0;i<_view_image.create1_count;i++) - _view_image.create1[i] = image_create1[i]; - for (i=0;i<_view_image.create2_count;i++) - _view_image.create2[i] = image_create2[i]; - for (i=0;i<_view_image.update1_count;i++) - _view_image.update1[i] = image_update1[i]; - for (i=0;i<_view_image.update2_count;i++) - _view_image.update2[i] = image_update2[i]; + for (i=0;i<_view_image.create1_count;i++) { + _view_image.create1[i].property_id = image_create1[i].property_id; + _view_image.create1[i].type = image_create1[i].type; + if (PROPERTY_STR == _view_image.create1[i].type) { + _view_image.create1[i].val.str_val = strdup(image_create1[i].val.str_val); + free(image_create1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_image.create1[i].type) { + _view_image.create1[i].val.bool_val = image_create1[i].val.bool_val; + } else if (PROPERTY_INT == _view_image.create1[i].type) { + _view_image.create1[i].val.int_val = image_create1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_image.create1[i].type) { + _view_image.create1[i].val.double_val = image_create1[i].val.double_val; + } else if (PROPERTY_LLI == _view_image.create1[i].type) { + _view_image.create1[i].val.lli_val = image_create1[i].val.lli_val; + } + } + + for (i=0;i<_view_image.create2_count;i++) { + _view_image.create2[i].property_id = image_create2[i].property_id; + _view_image.create2[i].type = image_create2[i].type; + if (PROPERTY_STR == _view_image.create2[i].type) { + _view_image.create2[i].val.str_val = strdup(image_create2[i].val.str_val); + free(image_create2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_image.create2[i].type) { + _view_image.create2[i].val.bool_val = image_create2[i].val.bool_val; + } else if (PROPERTY_INT == _view_image.create2[i].type) { + _view_image.create2[i].val.int_val = image_create2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_image.create2[i].type) { + _view_image.create2[i].val.double_val = image_create2[i].val.double_val; + } else if (PROPERTY_LLI == _view_image.create2[i].type) { + _view_image.create2[i].val.lli_val = image_create2[i].val.lli_val; + } + } + + for (i=0;i<_view_image.update1_count;i++) { + _view_image.update1[i].property_id = image_update1[i].property_id; + _view_image.update1[i].type = image_update1[i].type; + if (PROPERTY_STR == _view_image.update1[i].type) { + _view_image.update1[i].val.str_val = strdup(image_update1[i].val.str_val); + free(image_update1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_image.update1[i].type) { + _view_image.update1[i].val.bool_val = image_update1[i].val.bool_val; + } else if (PROPERTY_INT == _view_image.update1[i].type) { + _view_image.update1[i].val.int_val = image_update1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_image.update1[i].type) { + _view_image.update1[i].val.double_val = image_update1[i].val.double_val; + } else if (PROPERTY_LLI == _view_image.update1[i].type) { + _view_image.update1[i].val.lli_val = image_update1[i].val.lli_val; + } + } + + for (i=0;i<_view_image.update2_count;i++) { + _view_image.update2[i].property_id = image_update2[i].property_id; + _view_image.update2[i].type = image_update2[i].type; + if (PROPERTY_STR == _view_image.update2[i].type) { + _view_image.update2[i].val.str_val = strdup(image_update2[i].val.str_val); + free(image_update2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_image.update2[i].type) { + _view_image.update2[i].val.bool_val = image_update2[i].val.bool_val; + } else if (PROPERTY_INT == _view_image.update2[i].type) { + _view_image.update2[i].val.int_val = image_update2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_image.update2[i].type) { + _view_image.update2[i].val.double_val = image_update2[i].val.double_val; + } else if (PROPERTY_LLI == _view_image.update2[i].type) { + _view_image.update2[i].val.lli_val = image_update2[i].val.lli_val; + } + } + } static int _ctsvc_tc_record_free_property_image() diff --git a/src/utc/contacts-service2/utc-contacts-service-record-name.c b/src/utc/contacts-service2/utc-contacts-service-record-name.c index f36d55a..b128fc2 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-name.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-name.c @@ -242,8 +242,6 @@ int ctsvc_tc_record_get_property_name(ctsvc_property_type_e type, ctsvc_property *p_properties = _view_name.update2; *p_property_count = _view_name.update2_count; break; - default : - break; } return 0; } diff --git a/src/utc/contacts-service2/utc-contacts-service-record-number.c b/src/utc/contacts-service2/utc-contacts-service-record-number.c index 4e5d52f..b14e6a0 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-number.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-number.c @@ -160,8 +160,6 @@ int ctsvc_tc_record_get_property_number(ctsvc_property_type_e type, ctsvc_proper *p_properties = _view_number.update2; *p_property_count = _view_number.update2_count; break; - default : - break; } return 0; } diff --git a/src/utc/contacts-service2/utc-contacts-service-record-person.c b/src/utc/contacts-service2/utc-contacts-service-record-person.c index 689ca7a..aaac6ee 100755 --- a/src/utc/contacts-service2/utc-contacts-service-record-person.c +++ b/src/utc/contacts-service2/utc-contacts-service-record-person.c @@ -68,14 +68,73 @@ static void _ctsvc_tc_load_view_person() _view_person.update2 = calloc(_view_person.update2_count, sizeof(ctsvc_property_s)); int i; - for (i=0;i<_view_person.create1_count;i++) - _view_person.create1[i] = person_create1[i]; - for (i=0;i<_view_person.create2_count;i++) - _view_person.create2[i] = person_create2[i]; - for (i=0;i<_view_person.update1_count;i++) - _view_person.update1[i] = person_update1[i]; - for (i=0;i<_view_person.update2_count;i++) - _view_person.update2[i] = person_update2[i]; + for (i=0;i<_view_person.create1_count;i++) { + _view_person.create1[i].property_id = person_create1[i].property_id; + _view_person.create1[i].type = person_create1[i].type; + if (PROPERTY_STR == _view_person.create1[i].type) { + _view_person.create1[i].val.str_val = strdup(person_create1[i].val.str_val); + free(person_create1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_person.create1[i].type) { + _view_person.create1[i].val.bool_val = person_create1[i].val.bool_val; + } else if (PROPERTY_INT == _view_person.create1[i].type) { + _view_person.create1[i].val.int_val = person_create1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_person.create1[i].type) { + _view_person.create1[i].val.double_val = person_create1[i].val.double_val; + } else if (PROPERTY_LLI == _view_person.create1[i].type) { + _view_person.create1[i].val.lli_val = person_create1[i].val.lli_val; + } + } + + for (i=0;i<_view_person.create2_count;i++) { + _view_person.create2[i].property_id = person_create2[i].property_id; + _view_person.create2[i].type = person_create2[i].type; + if (PROPERTY_STR == _view_person.create2[i].type) { + _view_person.create2[i].val.str_val = strdup(person_create2[i].val.str_val); + free(person_create2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_person.create2[i].type) { + _view_person.create2[i].val.bool_val = person_create2[i].val.bool_val; + } else if (PROPERTY_INT == _view_person.create2[i].type) { + _view_person.create2[i].val.int_val = person_create2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_person.create2[i].type) { + _view_person.create2[i].val.double_val = person_create2[i].val.double_val; + } else if (PROPERTY_LLI == _view_person.create2[i].type) { + _view_person.create2[i].val.lli_val = person_create2[i].val.lli_val; + } + } + + for (i=0;i<_view_person.update1_count;i++) { + _view_person.update1[i].property_id = person_update1[i].property_id; + _view_person.update1[i].type = person_update1[i].type; + if (PROPERTY_STR == _view_person.update1[i].type) { + _view_person.update1[i].val.str_val = strdup(person_update1[i].val.str_val); + free(person_update1[i].val.str_val); + } else if (PROPERTY_BOOL == _view_person.update1[i].type) { + _view_person.update1[i].val.bool_val = person_update1[i].val.bool_val; + } else if (PROPERTY_INT == _view_person.update1[i].type) { + _view_person.update1[i].val.int_val = person_update1[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_person.update1[i].type) { + _view_person.update1[i].val.double_val = person_update1[i].val.double_val; + } else if (PROPERTY_LLI == _view_person.update1[i].type) { + _view_person.update1[i].val.lli_val = person_update1[i].val.lli_val; + } + } + + for (i=0;i<_view_person.update2_count;i++) { + _view_person.update2[i].property_id = person_update2[i].property_id; + _view_person.update2[i].type = person_update2[i].type; + if (PROPERTY_STR == _view_person.update2[i].type) { + _view_person.update2[i].val.str_val = strdup(person_update2[i].val.str_val); + free(person_update2[i].val.str_val); + } else if (PROPERTY_BOOL == _view_person.update2[i].type) { + _view_person.update2[i].val.bool_val = person_update2[i].val.bool_val; + } else if (PROPERTY_INT == _view_person.update2[i].type) { + _view_person.update2[i].val.int_val = person_update2[i].val.int_val; + } else if (PROPERTY_DOUBLE == _view_person.update2[i].type) { + _view_person.update2[i].val.double_val = person_update2[i].val.double_val; + } else if (PROPERTY_LLI == _view_person.update2[i].type) { + _view_person.update2[i].val.lli_val = person_update2[i].val.lli_val; + } + } } static int _ctsvc_tc_record_free_property_person() diff --git a/src/utc/context/utc-context-trigger.c b/src/utc/context/utc-context-trigger.c index a1d680b..1913513 100755 --- a/src/utc/context/utc-context-trigger.c +++ b/src/utc/context/utc-context-trigger.c @@ -125,7 +125,13 @@ void utc_context_trigger_cleanup(void) return; error = context_trigger_get_own_rule_ids(&enabled_arr, &enabled_count, &disabled_arr, &disabled_count); - TRIGGER_ASSERT_EQ_WITH_CHECK_SUPPORTED(is_trigger_supported, error, CONTEXT_TRIGGER_ERROR_NONE); + if (is_trigger_supported) + { + if (error != CONTEXT_TRIGGER_ERROR_NONE){ + PRINT_INFO("Feature(%s) is not supported", TRIGGER_FEATURE); + return; + } + } for (i = 0; i < enabled_count; i++) { context_trigger_disable_rule(enabled_arr[i]); diff --git a/src/utc/fido-client/utc-fido-client.c b/src/utc/fido-client/utc-fido-client.c index feb29ed..7d732da 100755 --- a/src/utc/fido-client/utc-fido-client.c +++ b/src/utc/fido-client/utc-fido-client.c @@ -831,8 +831,16 @@ int utc_fido_client_foreach_authenticator_p(void) return 0; } - assert_eq(ret, 0); - assert_eq(*res, 0); + if (ret != 0){ + free(res); + FIDO_CLIENT_UTC_ERR(" fido_foreach_authenticator Fail(%d)", ret); + return 1; + } + if (*res != 0){ + free(res); + FIDO_CLIENT_UTC_ERR("fido_foreach_authenticator Fail(%d)", ret); + return 1; + } free(res); return 0; } -- 2.7.4