Kouhei Sutou
null+****@clear*****
Mon May 21 21:16:03 JST 2018
Kouhei Sutou 2018-05-21 21:16:03 +0900 (Mon, 21 May 2018) New Revision: 99ca806ce7e8593f115adc6e1beb2426e15b0983 https://github.com/groonga/groonga/commit/99ca806ce7e8593f115adc6e1beb2426e15b0983 Message: Ensure setting not GRN_SUCCESS rc on error Modified files: lib/expr_executor.c Modified: lib/expr_executor.c (+12 -4) =================================================================== --- lib/expr_executor.c 2018-05-21 20:51:06 +0900 (7dda9d303) +++ lib/expr_executor.c 2018-05-21 21:16:03 +0900 (c775309a1) @@ -3376,11 +3376,15 @@ grn_expr_executor_init(grn_ctx *ctx, GRN_API_ENTER; if (!grn_obj_is_expr(ctx, expr)) { + grn_rc rc = ctx->rc; grn_obj inspected; GRN_TEXT_INIT(&inspected, 0); grn_inspect(ctx, &inspected, expr); - ERR(ctx->rc, - "[expr-executor][open] invalid expression: %.*s", + if (rc == GRN_SUCCESS) { + rc = GRN_INVALID_ARGUMENT; + } + ERR(rc, + "[expr-executor][init] invalid expression: %.*s", (int)GRN_TEXT_LEN(&inspected), GRN_TEXT_VALUE(&inspected)); GRN_OBJ_FIN(ctx, &inspected); @@ -3389,11 +3393,15 @@ grn_expr_executor_init(grn_ctx *ctx, variable = grn_expr_get_var_by_offset(ctx, expr, 0); if (!variable) { + grn_rc rc = ctx->rc; grn_obj inspected; GRN_TEXT_INIT(&inspected, 0); grn_inspect(ctx, &inspected, expr); - ERR(ctx->rc, - "[expr-executor][open] expression has no variable: %.*s", + if (rc == GRN_SUCCESS) { + rc = GRN_INVALID_ARGUMENT; + } + ERR(rc, + "[expr-executor][init] expression has no variable: %.*s", (int)GRN_TEXT_LEN(&inspected), GRN_TEXT_VALUE(&inspected)); GRN_OBJ_FIN(ctx, &inspected); -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180521/791afda2/attachment-0001.htm
