Kouhei Sutou
null+****@clear*****
Sun Nov 2 17:17:37 JST 2014
Kouhei Sutou 2014-11-02 17:17:37 +0900 (Sun, 02 Nov 2014) New Revision: 4e92dba73a2587aa99dd31767492e7f0c3865204 https://github.com/groonga/groonga/commit/4e92dba73a2587aa99dd31767492e7f0c3865204 Message: Export grn_inspect() and grn_p() family Copied files: include/groonga/util.h (from lib/grn_util.h) Modified files: include/groonga.h include/groonga/Makefile.am lib/grn_util.h Modified: include/groonga.h (+1 -0) =================================================================== --- include/groonga.h 2014-11-02 17:02:57 +0900 (8b4e802) +++ include/groonga.h 2014-11-02 17:17:37 +0900 (70b5709) @@ -19,5 +19,6 @@ #define GROONGA_H #include <groonga/groonga.h> +#include <groonga/util.h> #endif /* GROONGA_H */ Modified: include/groonga/Makefile.am (+2 -1) =================================================================== --- include/groonga/Makefile.am 2014-11-02 17:02:57 +0900 (a62de1b) +++ include/groonga/Makefile.am 2014-11-02 17:17:37 +0900 (09d96d6) @@ -5,4 +5,5 @@ groonga_include_HEADERS = \ tokenizer.h \ token_filter.h \ nfkc.h \ - normalizer.h + normalizer.h \ + util.h Copied: include/groonga/util.h (+11 -17) 64% =================================================================== --- lib/grn_util.h 2014-11-02 17:02:57 +0900 (62c0e8a) +++ include/groonga/util.h 2014-11-02 17:17:37 +0900 (446cb88) @@ -1,9 +1,10 @@ -/* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2011 Brazil +/* + Copyright(C) 2010-2014 Brazil This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation. + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,33 +15,26 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_UTIL_H -#define GRN_UTIL_H +#ifndef GROONGA_UTIL_H +#define GROONGA_UTIL_H -#include "grn.h" -#include "grn_ctx.h" - -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif -GRN_API grn_rc grn_normalize_offset_and_limit(grn_ctx *ctx, int size, int *offset, int *limit); - GRN_API grn_obj *grn_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj); GRN_API grn_obj *grn_inspect_indented(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj, const char *indent); GRN_API grn_obj *grn_inspect_name(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj); GRN_API grn_obj *grn_inspect_encoding(grn_ctx *ctx, grn_obj *buffer, grn_encoding encoding); GRN_API grn_obj *grn_inspect_type(grn_ctx *ctx, grn_obj *buffer, unsigned char type); -void grn_p(grn_ctx *ctx, grn_obj *obj); -void grn_p_geo_point(grn_ctx *ctx, grn_geo_point *point); -void grn_p_ii_values(grn_ctx *ctx, grn_obj *obj); -GRN_API const char *grn_win32_base_dir(void); -GRN_API char *grn_path_separator_to_system(char *dest, char *groonga_path); +GRN_API void grn_p(grn_ctx *ctx, grn_obj *obj); +GRN_API void grn_p_geo_point(grn_ctx *ctx, grn_geo_point *point); +GRN_API void grn_p_ii_values(grn_ctx *ctx, grn_obj *obj); #ifdef __cplusplus } #endif -#endif /* GRN_UTIL_H */ +#endif /* GROONGA_UTIL_H */ Modified: lib/grn_util.h (+0 -10) =================================================================== --- lib/grn_util.h 2014-11-02 17:02:57 +0900 (62c0e8a) +++ lib/grn_util.h 2014-11-02 17:17:37 +0900 (84aa357) @@ -26,16 +26,6 @@ extern "C" { GRN_API grn_rc grn_normalize_offset_and_limit(grn_ctx *ctx, int size, int *offset, int *limit); -GRN_API grn_obj *grn_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj); -GRN_API grn_obj *grn_inspect_indented(grn_ctx *ctx, grn_obj *buffer, - grn_obj *obj, const char *indent); -GRN_API grn_obj *grn_inspect_name(grn_ctx *ctx, grn_obj *buffer, grn_obj *obj); -GRN_API grn_obj *grn_inspect_encoding(grn_ctx *ctx, grn_obj *buffer, grn_encoding encoding); -GRN_API grn_obj *grn_inspect_type(grn_ctx *ctx, grn_obj *buffer, unsigned char type); -void grn_p(grn_ctx *ctx, grn_obj *obj); -void grn_p_geo_point(grn_ctx *ctx, grn_geo_point *point); -void grn_p_ii_values(grn_ctx *ctx, grn_obj *obj); - GRN_API const char *grn_win32_base_dir(void); GRN_API char *grn_path_separator_to_system(char *dest, char *groonga_path); -------------- next part -------------- HTML����������������������������...ダウンロード
