Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga at 837172b [master] grn_ts: remove unused variables

susumu.yata null+****@clear*****
Tue Sep 8 09:59:41 JST 2015

• Previous message: [Groonga-commit] groonga/groonga at 70d7526 [master] grn_ts: add stubs for nodes associated with operators
• Next message: [Groonga-commit] groonga/groonga at 54d99df [master] grn_ts: use a macro to remove redundant codes
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

susumu.yata	2015-09-08 09:59:41 +0900 (Tue, 08 Sep 2015)

  New Revision: 837172b6dc20e669595b6dd2e890bc220efd49f5
  https://github.com/groonga/groonga/commit/837172b6dc20e669595b6dd2e890bc220efd49f5

  Message:
    grn_ts: remove unused variables

  Modified files:
    lib/ts.c

  Modified: lib/ts.c (+14 -28)
===================================================================
--- lib/ts.c    2015-09-08 09:49:14 +0900 (5f5f129)
+++ lib/ts.c    2015-09-08 09:59:41 +0900 (c8115f3)
@@ -2130,17 +2130,15 @@ grn_ts_expr_reserve_nodes(grn_ctx *ctx, grn_ts_expr *expr) {
 static grn_rc
 grn_ts_expr_open_id_node(grn_ctx *ctx, grn_ts_expr *expr,
                          grn_ts_expr_node **node) {
-  grn_ts_expr_node *new_node;
   grn_rc rc = grn_ts_expr_reserve_nodes(ctx, expr);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  rc = grn_ts_expr_id_node_open(ctx, &new_node);
+  rc = grn_ts_expr_id_node_open(ctx, node);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  expr->nodes[expr->n_nodes++] = new_node;
-  *node = new_node;
+  expr->nodes[expr->n_nodes++] = *node;
   return GRN_SUCCESS;
 }
 
@@ -2151,17 +2149,15 @@ grn_ts_expr_open_id_node(grn_ctx *ctx, grn_ts_expr *expr,
 static grn_rc
 grn_ts_expr_open_score_node(grn_ctx *ctx, grn_ts_expr *expr,
                             grn_ts_expr_node **node) {
-  grn_ts_expr_node *new_node;
   grn_rc rc = grn_ts_expr_reserve_nodes(ctx, expr);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  rc = grn_ts_expr_score_node_open(ctx, &new_node);
+  rc = grn_ts_expr_score_node_open(ctx, node);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  expr->nodes[expr->n_nodes++] = new_node;
-  *node = new_node;
+  expr->nodes[expr->n_nodes++] = *node;
   return GRN_SUCCESS;
 }
 
@@ -2172,17 +2168,15 @@ grn_ts_expr_open_score_node(grn_ctx *ctx, grn_ts_expr *expr,
 static grn_rc
 grn_ts_expr_open_key_node(grn_ctx *ctx, grn_ts_expr *expr,
                           grn_ts_expr_node **node) {
-  grn_ts_expr_node *new_node;
   grn_rc rc = grn_ts_expr_reserve_nodes(ctx, expr);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  rc = grn_ts_expr_key_node_open(ctx, expr->curr_table, &new_node);
+  rc = grn_ts_expr_key_node_open(ctx, expr->curr_table, node);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  expr->nodes[expr->n_nodes++] = new_node;
-  *node = new_node;
+  expr->nodes[expr->n_nodes++] = *node;
   return GRN_SUCCESS;
 }
 
@@ -2193,17 +2187,15 @@ grn_ts_expr_open_key_node(grn_ctx *ctx, grn_ts_expr *expr,
 static grn_rc
 grn_ts_expr_open_value_node(grn_ctx *ctx, grn_ts_expr *expr,
                             grn_ts_expr_node **node) {
-  grn_ts_expr_node *new_node;
   grn_rc rc = grn_ts_expr_reserve_nodes(ctx, expr);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  rc = grn_ts_expr_value_node_open(ctx, expr->curr_table, &new_node);
+  rc = grn_ts_expr_value_node_open(ctx, expr->curr_table, node);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  expr->nodes[expr->n_nodes++] = new_node;
-  *node = new_node;
+  expr->nodes[expr->n_nodes++] = *node;
   return GRN_SUCCESS;
 }
 
@@ -2215,17 +2207,15 @@ static grn_rc
 grn_ts_expr_open_const_node(grn_ctx *ctx, grn_ts_expr *expr,
                             grn_ts_data_kind kind, const void *value,
                             grn_ts_expr_node **node) {
-  grn_ts_expr_node *new_node;
   grn_rc rc = grn_ts_expr_reserve_nodes(ctx, expr);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  rc = grn_ts_expr_const_node_open(ctx, kind, value, &new_node);
+  rc = grn_ts_expr_const_node_open(ctx, kind, value, node);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  expr->nodes[expr->n_nodes++] = new_node;
-  *node = new_node;
+  expr->nodes[expr->n_nodes++] = *node;
   return GRN_SUCCESS;
 }
 
@@ -2236,17 +2226,15 @@ grn_ts_expr_open_const_node(grn_ctx *ctx, grn_ts_expr *expr,
 static grn_rc
 grn_ts_expr_open_column_node(grn_ctx *ctx, grn_ts_expr *expr,
                              grn_obj *column, grn_ts_expr_node **node) {
-  grn_ts_expr_node *new_node;
   grn_rc rc = grn_ts_expr_reserve_nodes(ctx, expr);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  rc = grn_ts_expr_column_node_open(ctx, column, &new_node);
+  rc = grn_ts_expr_column_node_open(ctx, column, node);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  expr->nodes[expr->n_nodes++] = new_node;
-  *node = new_node;
+  expr->nodes[expr->n_nodes++] = *node;
   return GRN_SUCCESS;
 }
 
@@ -2258,17 +2246,15 @@ static grn_rc
 grn_ts_expr_open_op_node(grn_ctx *ctx, grn_ts_expr *expr,
                          grn_ts_op_type op_type, grn_ts_expr_node **args,
                          size_t n_args, grn_ts_expr_node **node) {
-  grn_ts_expr_node *new_node;
   grn_rc rc = grn_ts_expr_reserve_nodes(ctx, expr);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  rc = grn_ts_expr_op_node_open(ctx, op_type, args, n_args, &new_node);
+  rc = grn_ts_expr_op_node_open(ctx, op_type, args, n_args, node);
   if (rc != GRN_SUCCESS) {
     return rc;
   }
-  expr->nodes[expr->n_nodes++] = new_node;
-  *node = new_node;
+  expr->nodes[expr->n_nodes++] = *node;
   return GRN_SUCCESS;
 }
 
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/groonga at 70d7526 [master] grn_ts: add stubs for nodes associated with operators
• Next message: [Groonga-commit] groonga/groonga at 54d99df [master] grn_ts: use a macro to remove redundant codes
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]