Kouhei Sutou
null+****@clear*****
Mon Apr 15 23:25:57 JST 2013
Kouhei Sutou 2013-04-15 23:25:57 +0900 (Mon, 15 Apr 2013) New Revision: 836b86bbe2fc2a0ea28382efdbe589b8d6073714 https://github.com/mroonga/mroonga/commit/836b86bbe2fc2a0ea28382efdbe589b8d6073714 Message: Remove a needless argument Modified files: mrn_table.cpp mrn_table.hpp Modified: mrn_table.cpp (+4 -9) =================================================================== --- mrn_table.cpp 2013-04-15 23:23:39 +0900 (5609b07) +++ mrn_table.cpp 2013-04-15 23:25:57 +0900 (757805d) @@ -55,7 +55,7 @@ extern handlerton *mrn_hton_ptr; extern HASH mrn_allocated_thds; extern pthread_mutex_t mrn_allocated_thds_mutex; -char *mrn_get_string_between_quote(char *ptr, bool alloc) +char *mrn_get_string_between_quote(char *ptr) { char *start_ptr, *end_ptr, *tmp_ptr, *esc_ptr; bool find_flg = FALSE, esc_flg = FALSE; @@ -146,12 +146,7 @@ char *mrn_get_string_between_quote(char *ptr, bool alloc) strcpy(esc_ptr, esc_ptr + 1); } } - if (alloc) - { - DBUG_RETURN(my_strdup(start_ptr, MYF(MY_WME))); - } else { - DBUG_RETURN(start_ptr); - } + DBUG_RETURN(my_strdup(start_ptr, MYF(MY_WME))); } #ifdef WITH_PARTITION_STORAGE_ENGINE @@ -239,7 +234,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length, if (!share->param_name) \ { \ if ((share->param_name = mrn_get_string_between_quote( \ - start_ptr, TRUE))) \ + start_ptr))) \ share->MRN_PARAM_STR_LEN(param_name) = strlen(share->param_name); \ else { \ error = ER_MRN_INVALID_TABLE_PARAM_NUM; \ @@ -259,7 +254,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length, if (!share->param_name[param_pos]) \ { \ if ((share->param_name[param_pos] = mrn_get_string_between_quote( \ - start_ptr, TRUE))) \ + start_ptr))) \ share->MRN_PARAM_STR_LEN(param_name)[param_pos] = \ strlen(share->param_name[param_pos]); \ else { \ Modified: mrn_table.hpp (+1 -1) =================================================================== --- mrn_table.hpp 2013-04-15 23:23:39 +0900 (3c9ffd3) +++ mrn_table.hpp 2013-04-15 23:25:57 +0900 (7f5d196) @@ -124,7 +124,7 @@ struct st_mrn_slot_data table->key_info = file->base_key_info; \ table->s = share->table_share; -char *mrn_get_string_between_quote(char *ptr, bool alloc); +char *mrn_get_string_between_quote(char *ptr); #ifdef WITH_PARTITION_STORAGE_ENGINE void mrn_get_partition_info(const char *table_name, uint table_name_length, const TABLE *table, partition_element **part_elem, -------------- next part -------------- HTML����������������������������...Download