Kouhei Sutou
null+****@clear*****
Thu May 5 12:17:47 JST 2016
Kouhei Sutou 2016-05-05 12:17:47 +0900 (Thu, 05 May 2016) New Revision: 852af9e72335baffceadb5571fb2857fee253085 https://github.com/groonga/groonga/commit/852af9e72335baffceadb5571fb2857fee253085 Message: select: share common macro Modified files: lib/proc/proc_select.c Modified: lib/proc/proc_select.c (+14 -14) =================================================================== --- lib/proc/proc_select.c 2016-05-05 12:17:03 +0900 (dab9dbb) +++ lib/proc/proc_select.c 2016-05-05 12:17:47 +0900 (1ff609d) @@ -32,6 +32,15 @@ #define DEFAULT_DRILLDOWN_LIMIT 10 #define DEFAULT_DRILLDOWN_OUTPUT_COLUMNS "_key, _nsubrecs" +#define GRN_SELECT_FILL_STRING(string, bulk) \ + if (bulk && GRN_TEXT_LEN(bulk) > 0) { \ + string.value = GRN_TEXT_VALUE(bulk); \ + string.length = GRN_TEXT_LEN(bulk); \ + } else { \ + string.value = NULL; \ + string.length = 0; \ + } \ + typedef struct { const char *value; size_t length; @@ -329,20 +338,11 @@ grn_drilldown_data_fill(grn_ctx *ctx, grn_obj *calc_target, grn_obj *table) { -#define FILL_STRING(string, bulk) \ - if (bulk && GRN_TEXT_LEN(bulk) > 0) { \ - string.value = GRN_TEXT_VALUE(bulk); \ - string.length = GRN_TEXT_LEN(bulk); \ - } else { \ - string.value = NULL; \ - string.length = 0; \ - } \ - - FILL_STRING(drilldown->keys, keys); + GRN_SELECT_FILL_STRING(drilldown->keys, keys); - FILL_STRING(drilldown->sortby, sortby); + GRN_SELECT_FILL_STRING(drilldown->sortby, sortby); - FILL_STRING(drilldown->output_columns, output_columns); + GRN_SELECT_FILL_STRING(drilldown->output_columns, output_columns); if (drilldown->output_columns.length == 0) { drilldown->output_columns.value = DEFAULT_DRILLDOWN_OUTPUT_COLUMNS; drilldown->output_columns.length = strlen(DEFAULT_DRILLDOWN_OUTPUT_COLUMNS); @@ -371,9 +371,9 @@ grn_drilldown_data_fill(grn_ctx *ctx, drilldown->calc_types = 0; } - FILL_STRING(drilldown->calc_target_name, calc_target); + GRN_SELECT_FILL_STRING(drilldown->calc_target_name, calc_target); - FILL_STRING(drilldown->table_name, table); + GRN_SELECT_FILL_STRING(drilldown->table_name, table); } static void -------------- next part -------------- HTML����������������������������...Download