From 5a33907bfc9828b0da314dc4768b212b3bb4f21a Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Thu, 7 Apr 2016 12:08:17 +0300 Subject: vis+lto --- CMakeLists.txt | 7 +-- include/media-svc.h | 141 ++++++++++++++++++++++++++------------------------- md5/md5.h | 13 +++-- md5/media-svc-hash.h | 8 ++- 4 files changed, 92 insertions(+), 77 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36d2e42..8fdcf99 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ SET(VERSION "${VERSION_MAJOR}.0.0") SET(MEDIASERVICE-LIB "media-service") SET(MEDIASERVICE-HASH-LIB "media-svc-hash") SET(MEDIACONTENT-PLUGIN-LIB "media-content-plugin") -SET(SRCS +SET(SRCS src/common/media-svc.c src/common/media-svc-media.c src/common/media-svc-album.c @@ -61,7 +61,7 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -flto") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -flto -fvisibility=hidden") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC") @@ -70,6 +70,7 @@ IF("${ARCH}" STREQUAL "arm") MESSAGE("add -DTARGET") ENDIF("${ARCH}" STREQUAL "arm") +ADD_DEFINITIONS("-DLIBMEDIA_SVC_EXPORT_API=__attribute__((visibility(\"default\")))") ADD_DEFINITIONS("-DVENDOR=\"${VENDOR}\"") ADD_DEFINITIONS("-DPACKAGE=\"${PACKAGE}\"") ADD_DEFINITIONS("-DPACKAGE_NAME=\"${PKGNAME}\"") @@ -89,7 +90,7 @@ LINK_DIRECTORIES(${LIB_INSTALL_DIR}) ADD_LIBRARY(${MEDIASERVICE-HASH-LIB} SHARED ${HASH_SRCS}) SET_TARGET_PROPERTIES(${MEDIASERVICE-HASH-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${MEDIASERVICE-HASH-LIB} PROPERTIES VERSION ${VERSION}) -ADD_LIBRARY(${MEDIASERVICE-LIB} SHARED ${SRCS}) +ADD_LIBRARY(${MEDIASERVICE-LIB} SHARED ${SRCS}) TARGET_LINK_LIBRARIES(${MEDIASERVICE-LIB} ${pkgs_LDFLAGS} ${MEDIASERVICE-HASH-LIB}) SET_TARGET_PROPERTIES(${MEDIASERVICE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${MEDIASERVICE-LIB} PROPERTIES VERSION ${VERSION}) diff --git a/include/media-svc.h b/include/media-svc.h index 237c245..54eaa4d 100755 --- a/include/media-svc.h +++ b/include/media-svc.h @@ -32,80 +32,85 @@ extern "C" { #endif +#ifndef LIBMEDIA_SVC_EXPORT_API +#define LIBMEDIA_SVC_EXPORT_API +#endif // LIBMEDIA_SVC_EXPORT_API -int media_svc_connect(MediaSvcHandle **handle, uid_t uid, bool need_write); -int media_svc_disconnect(MediaSvcHandle *handle); -int media_svc_get_user_version(MediaSvcHandle *handle, int *user_version); -int media_svc_create_table(uid_t uid); -int media_svc_check_item_exist_by_path(MediaSvcHandle *handle, const char *storage_id, const char *path); -int media_svc_insert_folder(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, uid_t uid); -int media_svc_insert_item_begin(int with_noti, int data_cnt, int from_pid); -int media_svc_insert_item_end(uid_t uid); -int media_svc_insert_item_bulk(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, int is_burst, uid_t uid); -int media_svc_insert_item_immediately(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, uid_t uid); -int media_svc_move_item(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e src_storage, const char *src_path, media_svc_storage_type_e dest_storage, const char *dest_path, uid_t uid); -int media_svc_set_item_validity_begin(int data_cnt); -int media_svc_set_item_validity_end(uid_t uid); -int media_svc_set_item_validity(const char *storage_id, const char *path, int validity, uid_t uid); -int media_svc_delete_item_by_path(MediaSvcHandle *handle, const char *storage_id, const char *path, uid_t uid); -int media_svc_delete_all_items_in_storage(const char *storage_id, media_svc_storage_type_e storage_type, uid_t uid); -int media_svc_delete_invalid_items_in_storage(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, uid_t uid); -int media_svc_delete_invalid_items_in_folder(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, bool is_recursive, uid_t uid); -int media_svc_set_all_storage_items_validity(const char *storage_id, media_svc_storage_type_e storage_type, int validity, uid_t uid); -int media_svc_set_folder_items_validity(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid); -int media_svc_refresh_item(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, uid_t uid); -int media_svc_rename_folder(MediaSvcHandle *handle, const char *storage_id, const char *src_path, const char *dst_path, uid_t uid); -int media_svc_request_update_db(const char *db_query, uid_t uid); -int media_svc_get_storage_type(const char *path, media_svc_storage_type_e *storage_type, uid_t uid); -int media_svc_get_file_info(MediaSvcHandle *handle, const char *storage_id, const char *path, time_t *modified_time, unsigned long long *size); -int media_svc_send_dir_update_noti(MediaSvcHandle *handle, const char *storage_id, const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid); -int media_svc_count_invalid_items_in_folder(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int *count); -int media_svc_check_db_upgrade(MediaSvcHandle *handle, int user_version, uid_t uid); -int media_svc_check_db_corrupt(MediaSvcHandle *handle); -int media_svc_get_folder_list(MediaSvcHandle *handle, char *start_path, char ***folder_list, time_t **modified_time_list, int **item_num_list, int *count); -int media_svc_update_folder_time(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, uid_t uid); -int media_svc_publish_noti(media_item_type_e update_item, media_item_update_type_e update_type, const char *path, media_type_e media_type, const char *uuid, const char *mime_type); -int media_svc_get_pinyin(const char *src_str, char **pinyin_str); -int media_svc_check_pinyin_support(bool *support); -int media_svc_update_item_begin(int data_cnt); -int media_svc_update_item_end(uid_t uid); -int media_svc_update_item_meta(MediaSvcHandle *handle, const char *file_path, const char *storage_id, int storage_type, uid_t uid); -int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_svc_content_info_s *content_info, uid_t uid); -void media_svc_destroy_content_info(media_svc_content_info_s *content_info); -int media_svc_generate_uuid(char **uuid); -int media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **storage_path, int *validity, bool *info_exist); -int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity); -int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, const char *storage_account, media_svc_storage_type_e storage_type, uid_t uid); -int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, uid_t uid); -int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, uid_t uid); -int media_svc_set_storage_validity(MediaSvcHandle *handle, const char *storage_id, int validity, uid_t uid); -int media_svc_get_storage_id(MediaSvcHandle *handle, const char *path, char *storage_id); -int media_svc_get_storage_path(MediaSvcHandle *handle, const char *storage_uuid, char **storage_path); -int media_svc_get_storage_scan_status(MediaSvcHandle *handle, const char *storage_uuid, media_svc_scan_status_type_e *storage_status); -int media_svc_set_storage_scan_status(const char *storage_uuid, media_svc_scan_status_type_e storage_status, uid_t uid); -int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count); -int media_svc_delete_invalid_folder(const char *storage_id, uid_t uid); -int media_svc_set_folder_validity(MediaSvcHandle *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid); -int media_svc_insert_item_pass1(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, int is_burst, uid_t uid); -int media_svc_insert_item_pass2(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, int scan_type, const char* extract_path, int is_burst, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_connect(MediaSvcHandle **handle, uid_t uid, bool need_write); +LIBMEDIA_SVC_EXPORT_API int media_svc_disconnect(MediaSvcHandle *handle); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_user_version(MediaSvcHandle *handle, int *user_version); +LIBMEDIA_SVC_EXPORT_API int media_svc_create_table(uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_check_item_exist_by_path(MediaSvcHandle *handle, const char *storage_id, const char *path); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_folder(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_item_begin(int with_noti, int data_cnt, int from_pid); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_item_end(uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_item_bulk(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, int is_burst, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_item_immediately(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_move_item(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e src_storage, const char *src_path, media_svc_storage_type_e dest_storage, const char *dest_path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_item_validity_begin(int data_cnt); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_item_validity_end(uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_item_validity(const char *storage_id, const char *path, int validity, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_delete_item_by_path(MediaSvcHandle *handle, const char *storage_id, const char *path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_delete_all_items_in_storage(const char *storage_id, media_svc_storage_type_e storage_type, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_delete_invalid_items_in_storage(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_delete_invalid_items_in_folder(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, bool is_recursive, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_all_storage_items_validity(const char *storage_id, media_svc_storage_type_e storage_type, int validity, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_folder_items_validity(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_refresh_item(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_rename_folder(MediaSvcHandle *handle, const char *storage_id, const char *src_path, const char *dst_path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_request_update_db(const char *db_query, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_storage_type(const char *path, media_svc_storage_type_e *storage_type, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_file_info(MediaSvcHandle *handle, const char *storage_id, const char *path, time_t *modified_time, unsigned long long *size); +LIBMEDIA_SVC_EXPORT_API int media_svc_send_dir_update_noti(MediaSvcHandle *handle, const char *storage_id, const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid); +LIBMEDIA_SVC_EXPORT_API int media_svc_count_invalid_items_in_folder(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int *count); +LIBMEDIA_SVC_EXPORT_API int media_svc_check_db_upgrade(MediaSvcHandle *handle, int user_version, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_check_db_corrupt(MediaSvcHandle *handle); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_folder_list(MediaSvcHandle *handle, char *start_path, char ***folder_list, time_t **modified_time_list, int **item_num_list, int *count); +LIBMEDIA_SVC_EXPORT_API int media_svc_update_folder_time(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_publish_noti(media_item_type_e update_item, media_item_update_type_e update_type, const char *path, media_type_e media_type, const char *uuid, const char *mime_type); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_pinyin(const char *src_str, char **pinyin_str); +LIBMEDIA_SVC_EXPORT_API int media_svc_check_pinyin_support(bool *support); +LIBMEDIA_SVC_EXPORT_API int media_svc_update_item_begin(int data_cnt); +LIBMEDIA_SVC_EXPORT_API int media_svc_update_item_end(uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_update_item_meta(MediaSvcHandle *handle, const char *file_path, const char *storage_id, int storage_type, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_item_immediately_with_data(MediaSvcHandle *handle, media_svc_content_info_s *content_info, uid_t uid); +LIBMEDIA_SVC_EXPORT_API void media_svc_destroy_content_info(media_svc_content_info_s *content_info); -int media_svc_insert_folder_begin(int data_cnt); -int media_svc_insert_folder_end(uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_generate_uuid(char **uuid); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **storage_path, int *validity, bool *info_exist); +LIBMEDIA_SVC_EXPORT_API int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, const char *storage_account, media_svc_storage_type_e storage_type, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_storage_validity(MediaSvcHandle *handle, const char *storage_id, int validity, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_storage_id(MediaSvcHandle *handle, const char *path, char *storage_id); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_storage_path(MediaSvcHandle *handle, const char *storage_uuid, char **storage_path); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_storage_scan_status(MediaSvcHandle *handle, const char *storage_uuid, media_svc_scan_status_type_e *storage_status); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_storage_scan_status(const char *storage_uuid, media_svc_scan_status_type_e storage_status, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count); +LIBMEDIA_SVC_EXPORT_API int media_svc_delete_invalid_folder(const char *storage_id, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_folder_validity(MediaSvcHandle *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid); -int media_svc_get_folder_scan_status(MediaSvcHandle *handle, const char *storage_id, const char *path, int *storage_status); -int media_svc_set_folder_scan_status(const char *storage_id, const char *path, int storage_status, uid_t uid); -int media_svc_get_folder_modified_time(MediaSvcHandle *handle, const char *path, const char *storage_id, bool *modified); -int media_svc_get_null_scan_folder_list(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, char ***folder_list, int *count); -int media_svc_change_validity_item_batch(const char *storage_id, const char *path, int des_validity, int src_validity, uid_t uid); -int media_svc_delete_invalid_folder_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, uid_t uid, int *delete_count); -int media_svc_check_folder_exist_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path); -int media_svc_check_subfolder_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int *count); -int media_svc_get_folder_id(MediaSvcHandle *handle, const char *storage_id, const char *path, char *folder_id); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_item_pass1(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, int is_burst, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_item_pass2(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, int scan_type, const char* extract_path, int is_burst, uid_t uid); -int media_svc_append_query(const char *query, uid_t uid); -int media_svc_send_query(uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_folder_begin(int data_cnt); +LIBMEDIA_SVC_EXPORT_API int media_svc_insert_folder_end(uid_t uid); + +LIBMEDIA_SVC_EXPORT_API int media_svc_get_folder_scan_status(MediaSvcHandle *handle, const char *storage_id, const char *path, int *storage_status); +LIBMEDIA_SVC_EXPORT_API int media_svc_set_folder_scan_status(const char *storage_id, const char *path, int storage_status, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_folder_modified_time(MediaSvcHandle *handle, const char *path, const char *storage_id, bool *modified); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_null_scan_folder_list(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, char ***folder_list, int *count); +LIBMEDIA_SVC_EXPORT_API int media_svc_change_validity_item_batch(const char *storage_id, const char *path, int des_validity, int src_validity, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_delete_invalid_folder_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, uid_t uid, int *delete_count); +LIBMEDIA_SVC_EXPORT_API int media_svc_check_folder_exist_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path); +LIBMEDIA_SVC_EXPORT_API int media_svc_check_subfolder_by_path(MediaSvcHandle *handle, const char *storage_id, const char *folder_path, int *count); +LIBMEDIA_SVC_EXPORT_API int media_svc_get_folder_id(MediaSvcHandle *handle, const char *storage_id, const char *path, char *folder_id); + +LIBMEDIA_SVC_EXPORT_API int media_svc_append_query(const char *query, uid_t uid); +LIBMEDIA_SVC_EXPORT_API int media_svc_send_query(uid_t uid); #ifdef __cplusplus } diff --git a/md5/md5.h b/md5/md5.h index ae9b307..fc30f1c 100755 --- a/md5/md5.h +++ b/md5/md5.h @@ -24,16 +24,21 @@ #define MD5_HASHBYTES 16 +#ifndef LIBMEDIA_SVC_EXPORT_API +#define LIBMEDIA_SVC_EXPORT_API +#endif // LIBMEDIA_SVC_EXPORT_API + + typedef struct MD5Context { uint32_t buf[4]; uint32_t bits[2]; unsigned char in[64]; } MD5_CTX; -extern void media_svc_MD5Init(MD5_CTX *context); -extern void media_svc_MD5Update(MD5_CTX *context, unsigned char const *buf, unsigned len); -extern void media_svc_MD5Final(unsigned char digest[MD5_HASHBYTES], MD5_CTX *context); +LIBMEDIA_SVC_EXPORT_API extern void media_svc_MD5Init(MD5_CTX *context); +LIBMEDIA_SVC_EXPORT_API extern void media_svc_MD5Update(MD5_CTX *context, unsigned char const *buf, unsigned len); +LIBMEDIA_SVC_EXPORT_API extern void media_svc_MD5Final(unsigned char digest[MD5_HASHBYTES], MD5_CTX *context); -extern void MD5Transform(uint32_t buf[4], uint32_t const in[16]); +LIBMEDIA_SVC_EXPORT_API extern void MD5Transform(uint32_t buf[4], uint32_t const in[16]); #endif diff --git a/md5/media-svc-hash.h b/md5/media-svc-hash.h index 41a1f0c..c4dbac9 100755 --- a/md5/media-svc-hash.h +++ b/md5/media-svc-hash.h @@ -22,7 +22,11 @@ #ifndef _MEDIA_SVC_HASH_ #define _MEDIA_SVC_HASH_ -int mb_svc_generate_hash_code(const char *origin_path, char *hash_code, int max_length); +#ifndef LIBMEDIA_SVC_EXPORT_API +#define LIBMEDIA_SVC_EXPORT_API +#endif // LIBMEDIA_SVC_EXPORT_API -#endif /*MEDIA_SVC_HASH_*/ +LIBMEDIA_SVC_EXPORT_API int mb_svc_generate_hash_code(const char *origin_path, char *hash_code, int max_length); + +#endif /*MEDIA_SVC_HASH_*/ -- cgit v1.2.3