Kouhei Sutou
null+****@clear*****
Tue Nov 24 16:47:22 JST 2015
Kouhei Sutou 2015-11-24 16:47:22 +0900 (Tue, 24 Nov 2015) New Revision: 3ba184e491690de966d8132f3e08fd9692c4ca84 https://github.com/groonga/groonga/commit/3ba184e491690de966d8132f3e08fd9692c4ca84 Message: reindex: use "target_name" as parameter name for consistency Other commands such as truncate use the parameter name. Modified files: lib/proc.c Modified: lib/proc.c (+14 -14) =================================================================== --- lib/proc.c 2015-11-24 16:10:27 +0900 (285ab00) +++ lib/proc.c 2015-11-24 16:47:22 +0900 (367ab65) @@ -8185,27 +8185,27 @@ static grn_obj * proc_reindex(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data) { - grn_obj *object_name; - grn_obj *object; + grn_obj *target_name; + grn_obj *target; - object_name = VAR(0); - if (GRN_TEXT_LEN(object_name) == 0) { - object = grn_ctx_db(ctx); + target_name = VAR(0); + if (GRN_TEXT_LEN(target_name) == 0) { + target = grn_ctx_db(ctx); } else { - object = grn_ctx_get(ctx, - GRN_TEXT_VALUE(object_name), - GRN_TEXT_LEN(object_name)); - if (!object) { + target = grn_ctx_get(ctx, + GRN_TEXT_VALUE(target_name), + GRN_TEXT_LEN(target_name)); + if (!target) { ERR(GRN_INVALID_ARGUMENT, - "[reindex] nonexistent object: <%.*s>", - (int)GRN_TEXT_LEN(object_name), - GRN_TEXT_VALUE(object_name)); + "[reindex] nonexistent target: <%.*s>", + (int)GRN_TEXT_LEN(target_name), + GRN_TEXT_VALUE(target_name)); GRN_OUTPUT_BOOL(GRN_FALSE); return NULL; } } - grn_obj_reindex(ctx, object); + grn_obj_reindex(ctx, target); GRN_OUTPUT_BOOL(ctx->rc == GRN_SUCCESS); @@ -8593,7 +8593,7 @@ grn_db_init_builtin_query(grn_ctx *ctx) DEF_COMMAND("schema", proc_schema, 0, vars); - DEF_VAR(vars[0], "object"); + DEF_VAR(vars[0], "target_name"); DEF_COMMAND("reindex", proc_reindex, 1, vars); { -------------- next part -------------- HTML����������������������������...Download