null+****@clear*****
null+****@clear*****
2012年 4月 24日 (火) 16:58:01 JST
Kouhei Sutou 2012-04-24 16:58:01 +0900 (Tue, 24 Apr 2012)
New Revision: c4ceb7ad954d14c61b6aecb39db4567a8be19adc
Log:
Use suitable name
key_value ->
key_column_name
Modified files:
lib/db.c
Modified: lib/db.c (+4 -3)
===================================================================
--- lib/db.c 2012-04-24 16:55:18 +0900 (fdeada9)
+++ lib/db.c 2012-04-24 16:58:01 +0900 (7819d03)
@@ -8680,7 +8680,7 @@ bracket_close(grn_ctx *ctx, grn_loader *loader)
id = loader_add(ctx, value + loader->key_offset);
} else if (loader->key_offset == -1) {
int i = 0;
- grn_obj *key_value = NULL;
+ grn_obj *key_column_name = NULL;
while (ndata--) {
char *column_name = GRN_TEXT_VALUE(value);
unsigned int column_name_size = GRN_TEXT_LEN(value);
@@ -8690,12 +8690,13 @@ bracket_close(grn_ctx *ctx, grn_loader *loader)
if (loader->key_offset != -1) {
GRN_LOG(ctx, GRN_LOG_ERROR,
"duplicated key columns: <%.*s> at %d and <%.*s> at %i",
- GRN_TEXT_LEN(key_value), GRN_TEXT_VALUE(key_value),
+ GRN_TEXT_LEN(key_column_name),
+ GRN_TEXT_VALUE(key_column_name),
loader->key_offset,
column_name_size, column_name, i);
return;
}
- key_value = value;
+ key_column_name = value;
loader->key_offset = i;
} else {
col = grn_obj_column(ctx, loader->table,