[Groonga-commit] groonga/groonga at 19d6bf5 [master] ii: use GRN_MALLOC/FREE for grn_ii

Back to archive index

Susumu Yata null+****@clear*****
Tue Apr 5 12:06:47 JST 2016


Susumu Yata	2016-04-05 12:06:47 +0900 (Tue, 05 Apr 2016)

  New Revision: 19d6bf50646ce2d1e5645019aa27c8672879f833
  https://github.com/groonga/groonga/commit/19d6bf50646ce2d1e5645019aa27c8672879f833

  Message:
    ii: use GRN_MALLOC/FREE for grn_ii
    
    GitHub: #513

  Modified files:
    lib/ii.c

  Modified: lib/ii.c (+3 -3)
===================================================================
--- lib/ii.c    2016-04-05 12:01:51 +0900 (ef4b516)
+++ lib/ii.c    2016-04-05 12:06:47 +0900 (8d49847)
@@ -3741,7 +3741,7 @@ grn_ii *
 grn_ii_create(grn_ctx *ctx, const char *path, grn_obj *lexicon, uint32_t flags)
 {
   grn_ii *ii = NULL;
-  if (!(ii = GRN_GMALLOC(sizeof(grn_ii)))) {
+  if (!(ii = GRN_MALLOCN(grn_ii, 1))) {
     return NULL;
   }
   GRN_DB_OBJ_SET_TYPE(ii, GRN_COLUMN_INDEX);
@@ -3842,7 +3842,7 @@ grn_ii_open(grn_ctx *ctx, const char *path, grn_obj *lexicon)
     grn_io_close(ctx, chunk);
     return NULL;
   }
-  if (!(ii = GRN_GMALLOC(sizeof(grn_ii)))) {
+  if (!(ii = GRN_MALLOCN(grn_ii, 1))) {
     grn_io_close(ctx, seg);
     grn_io_close(ctx, chunk);
     return NULL;
@@ -3868,7 +3868,7 @@ grn_ii_close(grn_ctx *ctx, grn_ii *ii)
   if (!ii) { return GRN_INVALID_ARGUMENT; }
   if ((rc = grn_io_close(ctx, ii->seg))) { return rc; }
   if ((rc = grn_io_close(ctx, ii->chunk))) { return rc; }
-  GRN_GFREE(ii);
+  GRN_FREE(ii);
   /*
   {
     int i;
-------------- next part --------------
HTML����������������������������...
Download 



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