null+****@clear*****
null+****@clear*****
2012年 4月 22日 (日) 08:57:54 JST
Kouhei Sutou 2012-04-22 08:57:54 +0900 (Sun, 22 Apr 2012)
New Revision: 83de3b618a81ce35437ef418095cd271611fef28
Log:
Use suitable variable name for key column name
Modified files:
lib/db.c
Modified: lib/db.c (+5 -4)
===================================================================
--- lib/db.c 2012-04-22 08:30:06 +0900 (ab4e03f)
+++ lib/db.c 2012-04-22 08:57:54 +0900 (7081790)
@@ -8732,20 +8732,21 @@ brace_close(grn_ctx *ctx, grn_loader *loader)
case GRN_TABLE_PAT_KEY :
case GRN_TABLE_DAT_KEY :
{
- grn_obj *v, *key_value = NULL;
+ grn_obj *v, *key_column_name = NULL;
for (v = value; v + 1 < ve; v = values_next(ctx, v)) {
char *column_name = GRN_TEXT_VALUE(v);
unsigned int column_name_size = GRN_TEXT_LEN(v);
if (v->header.domain == GRN_DB_TEXT &&
(name_equal(column_name, column_name_size, KEY_NAME) ||
name_equal(column_name, column_name_size, ID_NAME))) {
- if (key_value) {
+ if (key_column_name) {
GRN_LOG(ctx, GRN_LOG_ERROR, "duplicated key columns: %.*s and %.*s",
- GRN_TEXT_LEN(key_value), GRN_TEXT_VALUE(key_value),
+ GRN_TEXT_LEN(key_column_name),
+ GRN_TEXT_VALUE(key_column_name),
column_name_size, column_name);
return;
}
- key_value = value;
+ key_column_name = value;
v++;
id = loader_add(ctx, v);
} else {