groonga/groonga at 6486364 [master] Remove unused QL related code (Groonga-commit) - Groonga - fulltext search engine.

Kouhei Sutou	2014-06-16 15:36:37 +0900 (Mon, 16 Jun 2014)

  New Revision: 64863645d9410900dfcfa226a2c0978b6fcfa813
  https://github.com/groonga/groonga/commit/64863645d9410900dfcfa226a2c0978b6fcfa813

  Message:
    Remove unused QL related code

  Modified files:
    lib/ctx.c
    lib/ctx.h
    lib/ctx_impl.h
    lib/plugin.c

  Modified: lib/ctx.c (+0 -12)
===================================================================

--- lib/ctx.c    2014-06-16 15:33:27 +0900 (b3c2cf4)
+++ lib/ctx.c    2014-06-16 15:36:37 +0900 (2c6d65b)
@@ -493,10 +493,7 @@ grn_ctx_impl_init(grn_ctx *ctx)
 
   ctx->impl->finalizer = NULL;
 
-  ctx->impl->op = GRN_OP_T0LVL;
   ctx->impl->n_entries = 0;
-  ctx->impl->cur = NULL;
-  ctx->impl->str_end = NULL;
   ctx->impl->inbuf = NULL;
   ctx->impl->com = NULL;
   ctx->impl->outbuf = grn_obj_open(ctx, GRN_BULK, 0, 0);
@@ -525,15 +522,6 @@ grn_ctx_set_next_expr(grn_ctx *ctx, grn_obj *expr)
   ctx->impl->qe_next = expr;
 }
 
-void
-grn_ctx_impl_err(grn_ctx *ctx)
-{
-  if (ctx->impl) {
-    ctx->impl->cur = ctx->impl->str_end;
-    ctx->impl->op = GRN_OP_ERR0;
-  }
-}
-
 static void
 grn_ctx_impl_clear_n_same_error_mssagges(grn_ctx *ctx)
 {

  Modified: lib/ctx.h (+0 -5)
===================================================================
--- lib/ctx.h    2014-06-16 15:33:27 +0900 (5ece6ce)
+++ lib/ctx.h    2014-06-16 15:36:37 +0900 (88b2748)
@@ -69,9 +69,6 @@ extern "C" {
 
 /**** error handling ****/
 
-#define GRN_OP_T0LVL 0
-#define GRN_OP_ERR0  1
-
 #define  GRN_EMERG  GRN_LOG_EMERG
 #define  GRN_ALERT  GRN_LOG_ALERT
 #define  GRN_CRIT   GRN_LOG_CRIT
@@ -95,7 +92,6 @@ extern "C" {
 #define BACKTRACE(ctx)
 #endif /* HAVE_BACKTRACE */
 
-GRN_API void grn_ctx_impl_err(grn_ctx *ctx);
 GRN_API grn_bool grn_ctx_impl_should_log(grn_ctx *ctx);
 GRN_API void grn_ctx_impl_set_current_error_message(grn_ctx *ctx);
 
@@ -121,7 +117,6 @@ GRN_API void grn_ctx_impl_set_current_error_message(grn_ctx *ctx);
   ctx_->errfile = __FILE__;\
   ctx_->errline = __LINE__;\
   ctx_->errfunc = __FUNCTION__;\
-  grn_ctx_impl_err(ctx);\
   grn_ctx_log(ctx, __VA_ARGS__);\
   if (grn_ctx_impl_should_log(ctx)) {\
     grn_ctx_impl_set_current_error_message(ctx);\

  Modified: lib/ctx_impl.h (+0 -4)
===================================================================
--- lib/ctx_impl.h    2014-06-16 15:33:27 +0900 (076d92b)
+++ lib/ctx_impl.h    2014-06-16 15:36:37 +0900 (cb87ea8)
@@ -155,10 +155,6 @@ struct _grn_ctx_impl {
   grn_proc_func *finalizer;
 
   /* ql portion */
-  uint8_t op;
-  int tok;
-  char *cur;
-  char *str_end;
   grn_obj *db;
   uint32_t n_entries;
   grn_array *values;        /* temporary objects */

  Modified: lib/plugin.c (+0 -1)
===================================================================
--- lib/plugin.c    2014-06-16 15:33:27 +0900 (1a2242e)
+++ lib/plugin.c    2014-06-16 15:36:37 +0900 (a0180a8)
@@ -552,7 +552,6 @@ grn_plugin_set_error(grn_ctx *ctx, grn_log_level level, grn_rc error_code,
   ctx->errfile = file;
   ctx->errline = line;
   ctx->errfunc = func;
-  grn_ctx_impl_err(ctx);
 
   {
     va_list ap;
-------------- next part --------------
HTML����������������������������...
다운로드 


Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga at 6486364 [master] Remove unused QL related code