Kouhei Sutou
null+****@clear*****
Fri Oct 19 00:29:12 JST 2012
Kouhei Sutou 2012-10-19 00:29:12 +0900 (Fri, 19 Oct 2012) New Revision: e3371b8ec6bbc32169056379603e0e7a644b82be https://github.com/groonga/groonga/commit/e3371b8ec6bbc32169056379603e0e7a644b82be Merged d02a005: Merge pull request #35 from groonga/get-value-support-vector Log: Move static helper functions to up to use widely Modified files: lib/db.c Modified: lib/db.c (+41 -41) =================================================================== --- lib/db.c 2012-10-19 00:27:49 +0900 (934c04b) +++ lib/db.c 2012-10-19 00:29:12 +0900 (7372a77) @@ -93,6 +93,47 @@ gen_pathname(const char *path, char *buffer, int fno) } } +static grn_bool +is_text_object(grn_obj *object) +{ + if (!object) { + return GRN_FALSE; + } + + if (object->header.type != GRN_BULK) { + return GRN_FALSE; + } + + switch (object->header.domain) { + case GRN_DB_SHORT_TEXT: + case GRN_DB_TEXT: + case GRN_DB_LONG_TEXT: + return GRN_TRUE; + default: + return GRN_FALSE; + } +} + +static void +limited_size_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *object) +{ + unsigned int original_size = 0; + unsigned int max_size = GRN_CTX_MSGSIZE / 2; + + if (object) { + original_size = GRN_BULK_VSIZE(object); + } + + if (original_size > max_size && is_text_object(object)) { + grn_text_esc(ctx, buffer, GRN_TEXT_VALUE(object), max_size); + GRN_TEXT_PUTS(ctx, buffer, "...("); + grn_text_lltoa(ctx, buffer, original_size); + GRN_TEXT_PUTS(ctx, buffer, ")"); + } else { + grn_inspect(ctx, buffer, object); + } +} + typedef struct { grn_obj *ptr; uint32_t lock; @@ -8780,47 +8821,6 @@ name_equal(const char *p, unsigned int size, const char *name) return !memcmp(p + 1, name + 1, size - 1); } -static grn_bool -is_text_object(grn_obj *object) -{ - if (!object) { - return GRN_FALSE; - } - - if (object->header.type != GRN_BULK) { - return GRN_FALSE; - } - - switch (object->header.domain) { - case GRN_DB_SHORT_TEXT: - case GRN_DB_TEXT: - case GRN_DB_LONG_TEXT: - return GRN_TRUE; - default: - return GRN_FALSE; - } -} - -static void -limited_size_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *object) -{ - unsigned int original_size = 0; - unsigned int max_size = GRN_CTX_MSGSIZE / 2; - - if (object) { - original_size = GRN_BULK_VSIZE(object); - } - - if (original_size > max_size && is_text_object(object)) { - grn_text_esc(ctx, buffer, GRN_TEXT_VALUE(object), max_size); - GRN_TEXT_PUTS(ctx, buffer, "...("); - grn_text_lltoa(ctx, buffer, original_size); - GRN_TEXT_PUTS(ctx, buffer, ")"); - } else { - grn_inspect(ctx, buffer, object); - } -} - static void report_set_column_value_failure(grn_ctx *ctx, grn_obj *key, -------------- next part -------------- HTML����������������������������...Download