Kouhei Sutou
null+****@clear*****
Thu Feb 15 17:37:28 JST 2018
Kouhei Sutou 2018-02-15 17:37:28 +0900 (Thu, 15 Feb 2018) New Revision: df968bfd439d35e87095c59fc4d9e287c9463aec https://github.com/groonga/groonga/commit/df968bfd439d35e87095c59fc4d9e287c9463aec Message: Use grn_obj_is_table() Modified files: lib/util.c Modified: lib/util.c (+8 -27) =================================================================== --- lib/util.c 2018-02-13 18:19:06 +0900 (a430833c6) +++ lib/util.c 2018-02-15 17:37:28 +0900 (dd6f4410f) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2010-2017 Brazil + Copyright(C) 2010-2018 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -1319,8 +1319,6 @@ grn_uvector_record_inspect(grn_ctx *ctx, grn_obj *buf, grn_obj *obj) grn_obj * grn_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj) { - grn_obj *domain; - if (!buffer) { buffer = grn_obj_open(ctx, GRN_BULK, 0, GRN_DB_TEXT); } @@ -1350,37 +1348,20 @@ grn_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj) grn_json_load_open_brace_inspect(ctx, buffer, obj); return buffer; default : - domain = grn_ctx_at(ctx, obj->header.domain); - if (domain) { - grn_id type = domain->header.type; - switch (type) { - case GRN_TABLE_HASH_KEY : - case GRN_TABLE_PAT_KEY : - case GRN_TABLE_NO_KEY : - grn_record_inspect(ctx, buffer, obj); - return buffer; - default : - break; - } + if (grn_obj_is_table(ctx, grn_ctx_at(ctx, obj->header.domain))) { + grn_record_inspect(ctx, buffer, obj); + return buffer; } + break; } break; case GRN_PTR : grn_ptr_inspect(ctx, buffer, obj); break; case GRN_UVECTOR : - domain = grn_ctx_at(ctx, obj->header.domain); - if (domain) { - grn_id type = domain->header.type; - switch (type) { - case GRN_TABLE_HASH_KEY : - case GRN_TABLE_PAT_KEY : - case GRN_TABLE_NO_KEY : - grn_uvector_record_inspect(ctx, buffer, obj); - return buffer; - default : - break; - } + if (grn_obj_is_table(ctx, grn_ctx_at(ctx, obj->header.domain))) { + grn_uvector_record_inspect(ctx, buffer, obj); + return buffer; } break; case GRN_PVECTOR : -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180215/cc8560fd/attachment-0001.htm
