naoa
null+****@clear*****
Fri Jun 20 17:26:00 JST 2014
naoa 2014-06-20 17:26:00 +0900 (Fri, 20 Jun 2014) New Revision: 3ebc7397e142711725d2fb408a960315eb27d7c5 https://github.com/groonga/groonga/commit/3ebc7397e142711725d2fb408a960315eb27d7c5 Merged b657f4b: Merge pull request #177 from naoa/use-command-create-api-instead-of-macro Message: plugin ruby:use grn_plugin_command_create API instead of the macro Modified files: plugins/ruby/eval.c plugins/ruby/load.c plugins/ruby/ruby_plugin.h Modified: plugins/ruby/eval.c (+2 -2) =================================================================== --- plugins/ruby/eval.c 2014-06-20 10:58:35 +0900 (bd1cd65) +++ plugins/ruby/eval.c 2014-06-20 17:26:00 +0900 (ad1e794) @@ -57,8 +57,8 @@ GRN_PLUGIN_REGISTER(grn_ctx *ctx) { grn_expr_var vars[1]; - DEF_VAR(vars[0], "script"); - DEF_COMMAND("ruby_eval", command_ruby_eval, 1, vars); + grn_plugin_expr_var_init(ctx, &vars[0], "script", -1); + grn_plugin_command_create(ctx, "ruby_eval", -1, command_ruby_eval, 1, vars); return ctx->rc; } Modified: plugins/ruby/load.c (+2 -2) =================================================================== --- plugins/ruby/load.c 2014-06-20 10:58:35 +0900 (cf2bb52) +++ plugins/ruby/load.c 2014-06-20 17:26:00 +0900 (a4e60ac) @@ -56,8 +56,8 @@ GRN_PLUGIN_REGISTER(grn_ctx *ctx) { grn_expr_var vars[1]; - DEF_VAR(vars[0], "path"); - DEF_COMMAND("ruby_load", command_ruby_load, 1, vars); + grn_plugin_expr_var_init(ctx, &vars[0], "path", -1); + grn_plugin_command_create(ctx, "ruby_load", -1, command_ruby_load, 1, vars); return ctx->rc; } Modified: plugins/ruby/ruby_plugin.h (+0 -10) =================================================================== --- plugins/ruby/ruby_plugin.h 2014-06-20 10:58:35 +0900 (c08702b) +++ plugins/ruby/ruby_plugin.h 2014-06-20 17:26:00 +0900 (5314ea6) @@ -69,16 +69,6 @@ GRN_PLUGIN_INIT(grn_ctx *ctx) return GRN_SUCCESS; } -#define DEF_VAR(v,x) do {\ - (v).name = (x);\ - (v).name_size = (x) ? sizeof(x) - 1 : 0;\ - GRN_TEXT_INIT(&(v).value, 0);\ -} while (0) - -#define DEF_COMMAND(name, func, nvars, vars)\ - (grn_proc_create(ctx, (name), (sizeof(name) - 1),\ - GRN_PROC_COMMAND, (func), NULL, NULL, (nvars), (vars))) - grn_rc GRN_PLUGIN_FIN(grn_ctx *ctx) { -------------- next part -------------- HTML����������������������������...下载
