Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:42:30 JST 2012
Kouhei Sutou 2012-04-19 20:57:54 +0900 (Thu, 19 Apr 2012) New Revision: 22cdf902ad807e4e401432bae712be3c6ad50726 https://github.com/mroonga/mroonga/commit/22cdf902ad807e4e401432bae712be3c6ad50726 Merged d2a70dc: Merge branch 'master' of github.com:mroonga/mroonga Log: Use suitable return value name for get_error_message() Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+9 -9) =================================================================== --- ha_mroonga.cpp 2012-04-19 20:39:54 +0900 (7b8643d) +++ ha_mroonga.cpp 2012-04-19 20:57:54 +0900 (6243ed8) @@ -6926,36 +6926,36 @@ void ha_mroonga::cond_pop() bool ha_mroonga::wrapper_get_error_message(int error, String *buf) { - bool res; + bool temporay_error; MRN_DBUG_ENTER_METHOD(); MRN_SET_WRAP_SHARE_KEY(share, table->s); MRN_SET_WRAP_TABLE_KEY(this, table); - res = wrap_handler->get_error_message(error, buf); + temporay_error = wrap_handler->get_error_message(error, buf); MRN_SET_BASE_SHARE_KEY(share, table->s); MRN_SET_BASE_TABLE_KEY(this, table); - DBUG_RETURN(res); + DBUG_RETURN(temporay_error); } bool ha_mroonga::storage_get_error_message(int error, String *buf) { MRN_DBUG_ENTER_METHOD(); + bool temporay_error = false; // latest error message buf->copy(ctx->errbuf, (uint) strlen(ctx->errbuf), system_charset_info); - DBUG_RETURN(false); + DBUG_RETURN(temporay_error); } bool ha_mroonga::get_error_message(int error, String *buf) { MRN_DBUG_ENTER_METHOD(); - // XXX: success is valid variable name? - bool success; + bool temporay_error; if (share && share->wrapper_mode) { - success = wrapper_get_error_message(error, buf); + temporay_error = wrapper_get_error_message(error, buf); } else { - success = storage_get_error_message(error, buf); + temporay_error = storage_get_error_message(error, buf); } - DBUG_RETURN(success); + DBUG_RETURN(temporay_error); } void ha_mroonga::push_warning_unsupported_spatial_index_search(enum ha_rkey_function flag) -------------- next part -------------- HTML����������������������������...Download