[Groonga-commit] groonga/groonga at a5b557d [master] Use ctx->rc directly

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Aug 23 17:20:13 JST 2016


Kouhei Sutou	2016-08-23 17:20:13 +0900 (Tue, 23 Aug 2016)

  New Revision: a5b557df6667b2ca301e7889414c6a3cf555d0d9
  https://github.com/groonga/groonga/commit/a5b557df6667b2ca301e7889414c6a3cf555d0d9

  Message:
    Use ctx->rc directly

  Modified files:
    lib/db.c

  Modified: lib/db.c (+7 -8)
===================================================================
--- lib/db.c    2016-08-22 10:18:49 +0900 (72bb9c9)
+++ lib/db.c    2016-08-23 17:20:13 +0900 (c29864e)
@@ -8332,7 +8332,7 @@ grn_obj_spec_save(grn_ctx *ctx, grn_db_obj *obj)
   grn_obj_close(ctx, &v);
 }
 
-inline static grn_rc
+inline static void
 grn_obj_set_info_source_validate_report_error(grn_ctx *ctx,
                                               grn_obj *column,
                                               grn_obj *table_domain,
@@ -8385,7 +8385,6 @@ grn_obj_set_info_source_validate_report_error(grn_ctx *ctx,
       source_type_name_size, source_type_name,
       column_name_size, column_name,
       table_domain_name_size, table_domain_name);
-  return ctx->rc;
 }
 
 inline static grn_rc
@@ -8444,14 +8443,14 @@ grn_obj_set_info_source_validate(grn_ctx *ctx, grn_obj *obj, grn_obj *value)
       source_type_id = DB_OBJ(source)->range;
     }
     if (table_domain_id != source_type_id) {
-      rc = grn_obj_set_info_source_validate_report_error(ctx,
-                                                         obj,
-                                                         table_domain,
-                                                         source,
-                                                         source_type_id);
+      grn_obj_set_info_source_validate_report_error(ctx,
+                                                    obj,
+                                                    table_domain,
+                                                    source,
+                                                    source_type_id);
     }
     grn_obj_unlink(ctx, source);
-    if (rc != GRN_SUCCESS) {
+    if (ctx->rc != GRN_SUCCESS) {
       goto exit;
     }
   }
-------------- next part --------------
HTML����������������������������...
下載 



More information about the Groonga-commit mailing list
Back to archive index