From ea9f1bdc31f523b04b4b7ff9042d8b6bffa10bfb Mon Sep 17 00:00:00 2001 From: ChenHengming Date: Fri, 7 Aug 2015 07:01:09 +0000 Subject: [PATCH] [svn_info]: remove extra author strings to avoid multiple grep result git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@56 6e48237b-75ef-9749-8fc9-41990f28c85a --- mpp/mpp_info.cpp | 14 ++++++++------ mpp/mpp_info.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mpp/mpp_info.cpp b/mpp/mpp_info.cpp index 2748192b..9d940493 100644 --- a/mpp/mpp_info.cpp +++ b/mpp/mpp_info.cpp @@ -27,8 +27,12 @@ mpp_info *mpp_info::singleton = NULL; +/* + * To avoid string | grep author getting multiple results + * use commit to replace author + */ static char mpp_version_revision[] = SVN_VERSION; -static char mpp_version_author[] = SVN_AUTHOR; +static char mpp_version_commit[] = SVN_AUTHOR; static char mpp_version_date[] = SVN_DATE; static char mpp_version_one_line[] = SVN_ONE_LINE; @@ -79,18 +83,16 @@ mpp_info::mpp_info() chip_type = chip_version(); mpp_info_revision = mpp_version_revision; - mpp_info_author = mpp_version_author; + mpp_info_commit = mpp_version_commit; mpp_info_date = mpp_version_date; mpp_revision = atoi(SVN_VERSION); - rk_log("%s\n", mpp_version_one_line); + show_mpp_info(); } void mpp_info::show_mpp_info() { - rk_log("mpp revision : %s", mpp_info_revision); - rk_log("mpp author : %s", mpp_info_author); - rk_log("mpp date : %s", mpp_info_date); + rk_log("%s\n", mpp_version_one_line); } #ifdef __cplusplus diff --git a/mpp/mpp_info.h b/mpp/mpp_info.h index af33efdb..8ac94bf9 100644 --- a/mpp/mpp_info.h +++ b/mpp/mpp_info.h @@ -42,7 +42,7 @@ private: mpp_info(); int mpp_revision; char *mpp_info_revision; - char *mpp_info_author; + char *mpp_info_commit; char *mpp_info_date; RK_CHIP_TYPE chip_type; };