Kouhei Sutou
null+****@clear*****
Wed Mar 16 22:55:43 JST 2016
Kouhei Sutou 2016-03-16 22:55:43 +0900 (Wed, 16 Mar 2016) New Revision: 375775a40e0cfd1b34df2c3f4bbfdfc8f198bc37 https://github.com/groonga/groonga/commit/375775a40e0cfd1b34df2c3f4bbfdfc8f198bc37 Message: Unify common code Modified files: lib/request_canceler.c Modified: lib/request_canceler.c (+13 -4) =================================================================== --- lib/request_canceler.c 2016-03-16 18:51:57 +0900 (b3591d3) +++ lib/request_canceler.c 2016-03-16 22:55:43 +0900 (d95705c) @@ -91,6 +91,17 @@ grn_request_canceler_unregister(grn_ctx *ctx, } } +static grn_bool +grn_request_canceler_cancel_entry(grn_request_canceler_entry *entry) +{ + if (entry->ctx->rc == GRN_SUCCESS) { + entry->ctx->rc = GRN_CANCEL; + return GRN_TRUE; + } else { + return GRN_FALSE; + } +} + grn_bool grn_request_canceler_cancel(const char *request_id, unsigned int size) { @@ -101,8 +112,7 @@ grn_request_canceler_cancel(const char *request_id, unsigned int size) void *value; if (grn_hash_get(&grn_gctx, entries, request_id, size, &value)) { grn_request_canceler_entry *entry = value; - if (entry->ctx->rc == GRN_SUCCESS) { - entry->ctx->rc = GRN_CANCEL; + if (grn_request_canceler_cancel_entry(entry)) { canceled = GRN_TRUE; } } @@ -129,8 +139,7 @@ grn_request_canceler_cancel_all(void) void *value; if (grn_hash_cursor_get_value(ctx, cursor, &value) > 0) { grn_request_canceler_entry *entry = value; - if (entry->ctx->rc == GRN_SUCCESS) { - entry->ctx->rc = GRN_CANCEL; + if (grn_request_canceler_cancel_entry(entry)) { canceled = GRN_TRUE; } } -------------- next part -------------- HTML����������������������������...下载
