Kouhei Sutou
null+****@clear*****
Thu Oct 27 23:26:30 JST 2016
Kouhei Sutou 2016-10-27 23:26:30 +0900 (Thu, 27 Oct 2016) New Revision: 883127293240d89fb347879fe1e8e7171b991784 https://github.com/pgroonga/pgroonga/commit/883127293240d89fb347879fe1e8e7171b991784 Message: Add PGrnLookupWithSize Modified files: src/pgrn_groonga.c src/pgrn_groonga.h Modified: src/pgrn_groonga.c (+11 -2) =================================================================== --- src/pgrn_groonga.c 2016-10-27 22:23:46 +0900 (7781f85) +++ src/pgrn_groonga.c 2016-10-27 23:26:30 +0900 (8053c96) @@ -70,11 +70,20 @@ PGrnCheck(const char *message) grn_obj * PGrnLookup(const char *name, int errorLevel) { - grn_obj *object = grn_ctx_get(ctx, name, strlen(name)); + return PGrnLookupWithSize(name, strlen(name), errorLevel); +} + +grn_obj * +PGrnLookupWithSize(const char *name, + size_t nameSize, + int errorLevel) +{ + grn_obj *object = grn_ctx_get(ctx, name, nameSize); if (!object) ereport(errorLevel, (errcode(ERRCODE_INVALID_NAME), - errmsg("pgroonga: object isn't found: <%s>", name))); + errmsg("pgroonga: object isn't found: <%.*s>", + (int)nameSize, name))); return object; } Modified: src/pgrn_groonga.h (+3 -0) =================================================================== --- src/pgrn_groonga.h 2016-10-27 22:23:46 +0900 (901a342) +++ src/pgrn_groonga.h 2016-10-27 23:26:30 +0900 (1702e15) @@ -15,6 +15,9 @@ int PGrnRCToPgErrorCode(grn_rc rc); grn_bool PGrnCheck(const char *message); grn_obj *PGrnLookup(const char *name, int errorLevel); +grn_obj *PGrnLookupWithSize(const char *name, + size_t nameSize, + int errorLevel); grn_obj *PGrnLookupColumn(grn_obj *table, const char *name, int errorLevel); grn_obj *PGrnLookupColumnWithSize(grn_obj *table, const char *name, -------------- next part -------------- HTML����������������������������...Download