From: minje.ahn Date: Tue, 12 Jul 2022 00:36:38 +0000 (+0900) Subject: Improve test code X-Git-Tag: submit/tizen/20220714.004316~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7cb06882f64684d18d648d50b59fdd71b3570da9;p=platform%2Fcore%2Fapi%2Fmetadata-editor.git Improve test code 1. Added check for return value. 2. Fixed CC, GV defects. Change-Id: I60f566918a0ed334e496ebb7b81d192c9727251a Signed-off-by: minje.ahn --- diff --git a/test/metadata_editor_test.c b/test/metadata_editor_test.c index 1449497..e287549 100755 --- a/test/metadata_editor_test.c +++ b/test/metadata_editor_test.c @@ -19,221 +19,158 @@ #include #include #include - #include #define SAFE_FREE(src) { if (src) {free(src); src = NULL; } } -#define FILE_NAME_SIZE 30 - -int dummy; +#define ADD_PNG "TestImage.png" +#define ADD_JPG "TestImage.jpg" -void __flush(); -void __printRetValue(const char *func_name, int result); -static bool __get_tag_info(metadata_editor_h metadata); -static bool __write_tag_info(metadata_editor_h metadata); -static bool __add_picture(metadata_editor_h metadata); -static bool __delete_pictures(metadata_editor_h metadata); +static int dummy; - -static int __safe_atoi(char *buffer, int *si) +static unsigned int __safe_atoi(char *buffer) { char *end = NULL; errno = 0; - if (buffer == NULL || si == NULL) - return METADATA_EDITOR_ERROR_INVALID_PARAMETER; + if (!buffer) + return 0; const long sl = strtol(buffer, &end, 10); - if (end == buffer) - return METADATA_EDITOR_ERROR_INVALID_PARAMETER; - if ('\0' != *end) - return METADATA_EDITOR_ERROR_INVALID_PARAMETER; - if ((LONG_MIN == sl || LONG_MAX == sl) && (ERANGE == errno)) - return METADATA_EDITOR_ERROR_INVALID_PARAMETER; - if (sl > INT_MAX) - return METADATA_EDITOR_ERROR_INVALID_PARAMETER; - if (sl < INT_MIN) - return METADATA_EDITOR_ERROR_INVALID_PARAMETER; - - *si = (int)sl; + if (end == buffer || '\0' != *end) + return 0; + if (sl > 255 || sl < 0) + return 0; - return METADATA_EDITOR_ERROR_NONE; + return (unsigned int)sl; } -void __flush() +static void __flush(void) { int c; while ((c = getc(stdin)) != 10); } -void __printRetValue(const char *func_name, int result) +static void __save_picture(metadata_editor_h metadata, unsigned int number) { - printf("In function %s result is ", func_name); - if (result == METADATA_EDITOR_ERROR_NONE) printf("METADATA_EDITOR_ERROR_NONE\n"); - else if (result == METADATA_EDITOR_ERROR_INVALID_PARAMETER) printf("METADATA_EDITOR_ERROR_INVALID_PARAMETER\n"); - else if (result == METADATA_EDITOR_ERROR_OUT_OF_MEMORY) printf("METADATA_EDITOR_ERROR_OUT_OF_MEMORY\n"); - else if (result == METADATA_EDITOR_ERROR_FILE_EXISTS) printf("METADATA_EDITOR_ERROR_FILE_EXISTS\n"); - else if (result == METADATA_EDITOR_ERROR_OPERATION_FAILED) printf("METADATA_EDITOR_ERROR_OPERATION_FAILED\n"); - else printf("Unallowed value. Error!\n"); + unsigned int i = 0; + void *picture = NULL; + int size = 0; + char *mime = NULL; + char file_name[FILENAME_MAX] = {0, }; + FILE *fout; + + for (i = 0; i < number; ++i) { + if (metadata_editor_get_picture(metadata, i, &picture, &size, &mime) != METADATA_EDITOR_ERROR_NONE) + return; + + if (!picture) + continue; + + printf("Saving picture number %u\n", i); + memset(file_name, 0, FILENAME_MAX); + + if (strncmp(mime, "image/jpeg", strlen("image/jpeg")) == 0) + snprintf(file_name, FILENAME_MAX, "outputFile_%u.jpg", i + 1); + else if (strncmp(mime, "image/png", strlen("image/png")) == 0) + snprintf(file_name, FILENAME_MAX, "outputFile_%u.png", i + 1); + + fout = fopen(file_name, "wb"); + if (fout) { + fwrite(picture, size, 1, fout); + fclose(fout); + fout = NULL; + } + + SAFE_FREE(picture); + SAFE_FREE(mime); + } } -static bool __get_tag_info(metadata_editor_h metadata) +static void __get_tag_info(metadata_editor_h metadata) { - int ret = METADATA_EDITOR_ERROR_NONE; - - char *artist = NULL; - char *title = NULL; - char *album = NULL; - char *genre = NULL; - char *composer = NULL; - char *copyright = NULL; - char *date = NULL; - char *description = NULL; - char *comment = NULL; - char *track_num = NULL; - char *picture_index = NULL; - int picture_size = 0; - char *picture_type = NULL; - void *picture = NULL; - char *conductor = NULL; - char *lyric = NULL; - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_ARTIST, &artist); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("1. - artist = [%s]\n", artist); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_TITLE, &title); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("2. - title = [%s]\n", title); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_ALBUM, &album); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("3. - album = [%s]\n", album); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_GENRE, &genre); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("4. - genre = [%s]\n", genre); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_AUTHOR, &composer); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("5. - composer = [%s]\n", composer); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_COPYRIGHT, ©right); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("6. - copyright = [%s]\n", copyright); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_DATE, &date); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("7. - date = [%s]\n", date); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_DESCRIPTION, &description); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("8. - description = [%s]\n", description); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_COMMENT, &comment); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("9. - comment = [%s]\n", comment); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_TRACK_NUM, &track_num); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("10. - track_num = [%s]\n", track_num); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_PICTURE_NUM, &picture_index); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - printf("Picture index is [%s]\n", picture_index); -#if 0 - if ((filetype == METADATA_EDITOR_TYPE_OGG_VORBIS) || (filetype == METADATA_EDITOR_TYPE_OGG_FLAC)) { - if (ret != METADATA_EDITOR_ERROR_INVALID_PARAMETER) - printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - } else { -#endif - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - else if ((ret == METADATA_EDITOR_ERROR_NONE) && picture_index) { - int num = 0, i; - ret = __safe_atoi(picture_index, &num); - if (ret != METADATA_EDITOR_ERROR_NONE || num < 0) { - printf("fail to __safe_atoi[%d]\n", ret); - return false; - } - - printf("Number of pictures: %u\n", num); - - for (i = 0; i < num; ++i) { - ret = metadata_editor_get_picture(metadata, i, &picture, &picture_size, &picture_type); - /*__printRetValue("metadata_editor_get_picture(...)", ret); */ - if (ret == METADATA_EDITOR_ERROR_NONE && picture) { - printf("Saving picture number %u\n", i); - char picture_file_name[FILE_NAME_SIZE] = {0, }; - - memset(picture_file_name, 0, sizeof(picture_file_name)); - - if (strncmp(picture_type, "image/jpeg", strlen("image/jpeg")) == 0) - snprintf(picture_file_name, FILE_NAME_SIZE, "outputFile_%u.jpg", i + 1); - else if (strncmp(picture_type, "image/png", strlen("image/png")) == 0) - snprintf(picture_file_name, FILE_NAME_SIZE, "outputFile_%u.png", i + 1); - - FILE *fout = fopen(picture_file_name, "wb"); - if (fout) { - fwrite(picture, picture_size, 1, fout); - fclose(fout); - } - } else - printf("Error occured while picture extraction\n"); - } - free(picture_index); - } -#if 0 + char *value = NULL; + unsigned int num = 0; + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_ARTIST, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("1. - artist = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_TITLE, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("2. - title = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_ALBUM, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("3. - album = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_GENRE, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("4. - genre = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_AUTHOR, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("5. - composer = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_COPYRIGHT, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("6. - copyright = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_DATE, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("7. - date = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_DESCRIPTION, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("8. - description = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_COMMENT, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("9. - comment = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_TRACK_NUM, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("10. - track_num = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_PICTURE_NUM, &value) == METADATA_EDITOR_ERROR_NONE) + printf("11. - Picture Num = [%s]\n", value); + + num = __safe_atoi(value); + SAFE_FREE(value); + + if (num > 0) + __save_picture(metadata, num); + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_CONDUCTOR, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("12. - conductor = [%s]\n", value); + SAFE_FREE(value); + } + + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS, &value) == METADATA_EDITOR_ERROR_NONE) { + printf("13. - lyric = [%s]\n", value); + SAFE_FREE(value); } -#endif - printf("11. - picture size = [%u]\n", picture_size); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_CONDUCTOR, &conductor); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("12. - conductor = [%s]\n", conductor); - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS, &lyric); - /*__printRetValue("metadata_editor_get_metadata(...)",ret); */ - if (ret != METADATA_EDITOR_ERROR_NONE) printf("Fail metadata_editor_get_metadata() at line [%d]\n", __LINE__); - printf("13. - lyric = [%s]\n", lyric); - - SAFE_FREE(artist); - SAFE_FREE(title); - SAFE_FREE(album); - SAFE_FREE(genre); - SAFE_FREE(composer); - SAFE_FREE(copyright); - SAFE_FREE(date); - SAFE_FREE(description); - SAFE_FREE(comment); - SAFE_FREE(track_num); - SAFE_FREE(picture); - SAFE_FREE(conductor); - SAFE_FREE(lyric); - - return true; } -static bool __write_tag_info(metadata_editor_h metadata) +static void __write_tag_info(metadata_editor_h metadata) { char input_data[400] = {0, }; printf("\n==========================================="); printf("\nPlease, type in the following tag data: "); - printf("\n===========================================\n"); + printf("\n===========================================\n\n"); - printf("\n 1. - Writing artist: "); + printf("1. - Writing artist: "); dummy = scanf("%[^\n]", input_data); __flush(); metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_ARTIST, input_data); @@ -294,46 +231,44 @@ static bool __write_tag_info(metadata_editor_h metadata) metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS, input_data); *input_data = '\0'; - metadata_editor_update_metadata(metadata); - - return true; + if (metadata_editor_update_metadata(metadata) != METADATA_EDITOR_ERROR_NONE) + printf("\n metadata_editor_update_metadata failed.\n"); } -static bool __delete_tag_info(metadata_editor_h metadata) +static void __delete_tag_info(metadata_editor_h metadata) { - printf("\n 1. - Deleting artist: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_ARTIST, ""); - printf("\n 2. - Deleting title: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_TITLE, 0); - printf("\n 3. - Deleting album: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_ALBUM, ""); - printf("\n 4. - Deleting genre: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_GENRE, 0); - printf("\n 5. - Deleting composer: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_AUTHOR, ""); - printf("\n 6. - Deleting copyright: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_COPYRIGHT, 0); - printf("\n 7. - Deleting year: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_DATE, ""); - printf("\n 8. - Deleting description: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_DESCRIPTION, 0); - printf("\n 9. - Deleting track: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_TRACK_NUM, ""); - printf("\n 10. - Deleting comment: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_COMMENT, 0); - printf("\n 11. - Deleting conductor: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_CONDUCTOR, ""); - printf("\n 12. - Deleting lyrics: "); - metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS, 0); - - metadata_editor_update_metadata(metadata); - return true; + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_ARTIST, "") == METADATA_EDITOR_ERROR_NONE) + printf("\n 1. - Deleted artist: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_TITLE, 0) == METADATA_EDITOR_ERROR_NONE) + printf("\n 2. - Deleted title: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_ALBUM, "") == METADATA_EDITOR_ERROR_NONE) + printf("\n 3. - Deleted album: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_GENRE, 0) == METADATA_EDITOR_ERROR_NONE) + printf("\n 4. - Deleted genre: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_AUTHOR, "") == METADATA_EDITOR_ERROR_NONE) + printf("\n 5. - Deleted composer: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_COPYRIGHT, 0) == METADATA_EDITOR_ERROR_NONE) + printf("\n 6. - Deleted copyright: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_DATE, "") == METADATA_EDITOR_ERROR_NONE) + printf("\n 7. - Deleted year: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_DESCRIPTION, 0) == METADATA_EDITOR_ERROR_NONE) + printf("\n 8. - Deleted description: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_TRACK_NUM, "") == METADATA_EDITOR_ERROR_NONE) + printf("\n 9. - Deleted track: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_COMMENT, 0) == METADATA_EDITOR_ERROR_NONE) + printf("\n 10. - Deleted comment: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_CONDUCTOR, "") == METADATA_EDITOR_ERROR_NONE) + printf("\n 11. - Deleted conductor: "); + if (metadata_editor_set_metadata(metadata, METADATA_EDITOR_ATTR_UNSYNCLYRICS, 0) == METADATA_EDITOR_ERROR_NONE) + printf("\n 12. - Deleted lyrics: "); + + if (metadata_editor_update_metadata(metadata) != METADATA_EDITOR_ERROR_NONE) + printf("\n metadata_editor_update_metadata failed.\n"); } -static bool __add_picture(metadata_editor_h metadata) +static void __add_picture(metadata_editor_h metadata) { uint c2 = 0; - char *picture_filename = NULL; printf("\n============================="); printf("\n Choose picture: PNG or JPG "); @@ -349,76 +284,58 @@ static bool __add_picture(metadata_editor_h metadata) case 1: printf("\n==========================="); printf("\n Your choice is TestImage.png\n"); - picture_filename = strdup("TestImage.png"); + if (metadata_editor_append_picture(metadata, ADD_PNG) != METADATA_EDITOR_ERROR_NONE) + printf("metadata_editor_append_picture failed\n"); break; case 2: printf("\n==========================="); printf("\n Your choice is TestImage.jpg\n"); - picture_filename = strdup("TestImage.jpg"); + if (metadata_editor_append_picture(metadata, ADD_JPG) != METADATA_EDITOR_ERROR_NONE) + printf("metadata_editor_append_picture failed\n"); break; default: break; } - metadata_editor_append_picture(metadata, picture_filename); - SAFE_FREE(picture_filename); - return true; + if (metadata_editor_update_metadata(metadata) != METADATA_EDITOR_ERROR_NONE) + printf("\n metadata_editor_update_metadata failed.\n"); } -static bool __delete_pictures(metadata_editor_h metadata) +static void __delete_pictures(metadata_editor_h metadata) { - int ret = METADATA_EDITOR_ERROR_NONE; - char *picture_num = NULL; - int num = 0; - int i = 0; - - ret = metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_PICTURE_NUM, &picture_num); - if (ret != METADATA_EDITOR_ERROR_NONE) { - printf("fail to metadata_editor_get_metadata[%d]\n", ret); - return false; - } + char *number = NULL; + unsigned int num = 0; + unsigned int i = 0; - printf("The number of pictures is [%s]\n", picture_num); - - ret = __safe_atoi(picture_num, &num); - free(picture_num); - if (ret != METADATA_EDITOR_ERROR_NONE || num < 0) { - printf("fail to __safe_atoi[%d]\n", ret); - return false; + if (metadata_editor_get_metadata(metadata, METADATA_EDITOR_ATTR_PICTURE_NUM, &number) != METADATA_EDITOR_ERROR_NONE) { + printf("fail to metadata_editor_get_metadata\n"); + return; } + printf("The number of pictures is [%s]\n", number); + num = __safe_atoi(number); + free(number); if (num == 0) { printf("There are no pictures to delete\n"); - return true; + return; } for (i = 0; i < num; ++i) { - ret = metadata_editor_remove_picture(metadata, 0); - if (ret != METADATA_EDITOR_ERROR_NONE) - printf("fail to metadata_editor_remove_picture[%d]\n", ret); + if (metadata_editor_remove_picture(metadata, 0) != METADATA_EDITOR_ERROR_NONE) + printf("fail to metadata_editor_remove_picture\n"); } - return true; + if (metadata_editor_update_metadata(metadata) != METADATA_EDITOR_ERROR_NONE) + printf("\n metadata_editor_update_metadata failed.\n"); } -static bool __save_tags(metadata_editor_h metadata) -{ - - metadata_editor_update_metadata(metadata); - - return true; -} - - int main(int argc, char *argv[]) { - int ret = METADATA_EDITOR_ERROR_NONE; metadata_editor_h metadata = NULL; - int cnt = argc - 1; uint c2 = 0; - if (cnt < 1) { + if (argc < 2) { printf("\n===================================================================================================="); printf("\n Please type file path and media type as media-metadata-test /opt/usr/media/Sounds/"); printf("\n===================================================================================================="); @@ -426,19 +343,13 @@ int main(int argc, char *argv[]) } printf("\n\n --- media metadata test start ---\n\n"); - ret = metadata_editor_create(&metadata); - /*__printRetValue("metadata_editor_create(...)",ret); */ - - if (ret != METADATA_EDITOR_ERROR_NONE) { - printf("Fail metadata_editor_create() [%d]\n", ret); + if (metadata_editor_create(&metadata) != METADATA_EDITOR_ERROR_NONE) { + printf("metadata_editor_create failed\n"); return 0; } - ret = metadata_editor_set_path(metadata, argv[1]); - /*__printRetValue("metadata_editor_set_path(...)",ret); */ - - if (ret != METADATA_EDITOR_ERROR_NONE) { - printf("Fail metadata_editor_set_path() [%d]\n", ret); + if (metadata_editor_set_path(metadata, argv[1]) != METADATA_EDITOR_ERROR_NONE) { + printf("metadata_editor_set_path failed\n"); goto exception; } @@ -453,7 +364,6 @@ int main(int argc, char *argv[]) printf("3 - Delete tags. Press 3 \n"); printf("4 - Add picture. Press 4 \n"); printf("5 - Delete picture. Press 5 \n"); - printf("6 - Save tags. Press 6 \n"); printf("9 - Quit. Press 9 "); printf("\n=========================\n"); printf("\n Your choice : "); @@ -486,24 +396,16 @@ int main(int argc, char *argv[]) printf("\n Deleting pictures \n"); __delete_pictures(metadata); break; - case 6: - printf("\n=============="); - printf("\n Saving updated tags \n"); - __save_tags(metadata); - break; default: break; } } exception: - ret = metadata_editor_destroy(metadata); - if (ret != METADATA_EDITOR_ERROR_NONE) { - printf("Fail metadata_editor_destroy [%d]\n", ret); - return 0; - } + if (metadata_editor_destroy(metadata) != METADATA_EDITOR_ERROR_NONE) + printf("Fail metadata_editor_destroy\n"); printf("\n\n--- metadata writer test end ---\n\n"); - return ret; + return 0; }