Navigation Menu

Skip to content

Commit

Permalink
Remove unused QL related code
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jun 16, 2014
1 parent c668c97 commit 6486364
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 22 deletions.
12 changes: 0 additions & 12 deletions lib/ctx.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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)
{
Expand Down
5 changes: 0 additions & 5 deletions lib/ctx.h
Expand Up @@ -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
Expand All @@ -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);

Expand All @@ -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);\
Expand Down
4 changes: 0 additions & 4 deletions lib/ctx_impl.h
Expand Up @@ -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 */
Expand Down
1 change: 0 additions & 1 deletion lib/plugin.c
Expand Up @@ -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;
Expand Down

0 comments on commit 6486364

Please sign in to comment.