[Groonga-commit] groonga/groonga at 4605b79 [master] Use GRN_CALLOC to clear all members

Back to archive index

Kouhei Sutou null+****@clear*****
Sun Jun 26 17:56:29 JST 2016


Kouhei Sutou	2016-06-26 17:56:29 +0900 (Sun, 26 Jun 2016)

  New Revision: 4605b7912b4bdf6245386828cb14ffbe77b7d849
  https://github.com/groonga/groonga/commit/4605b7912b4bdf6245386828cb14ffbe77b7d849

  Message:
    Use GRN_CALLOC to clear all members

  Modified files:
    lib/dat.cpp
    lib/hash.c
    lib/pat.c
    lib/store.c

  Modified: lib/dat.cpp (+1 -1)
===================================================================
--- lib/dat.cpp    2016-06-26 16:50:45 +0900 (ac3489e)
+++ lib/dat.cpp    2016-06-26 17:56:29 +0900 (afc00e4)
@@ -284,7 +284,7 @@ grn_dat_create(grn_ctx *ctx, const char *path, uint32_t,
     }
   }
 
-  grn_dat * const dat = static_cast<grn_dat *>(GRN_MALLOC(sizeof(grn_dat)));
+  grn_dat * const dat = static_cast<grn_dat *>(GRN_CALLOC(sizeof(grn_dat)));
   if (!dat) {
     return NULL;
   }

  Modified: lib/hash.c (+2 -2)
===================================================================
--- lib/hash.c    2016-06-26 16:50:45 +0900 (f80c2ea)
+++ lib/hash.c    2016-06-26 17:56:29 +0900 (0ce6858)
@@ -561,7 +561,7 @@ grn_array *
 grn_array_create(grn_ctx *ctx, const char *path, uint32_t value_size, uint32_t flags)
 {
   if (ctx) {
-    grn_array * const array = (grn_array *)GRN_MALLOC(sizeof(grn_array));
+    grn_array * const array = (grn_array *)GRN_CALLOC(sizeof(grn_array));
     if (array) {
       GRN_DB_OBJ_SET_TYPE(array, GRN_TABLE_NO_KEY);
       if (!grn_array_init(ctx, array, path, value_size, flags)) {
@@ -1978,7 +1978,7 @@ grn_hash_create(grn_ctx *ctx, const char *path, uint32_t key_size, uint32_t valu
   if (key_size > GRN_HASH_MAX_KEY_SIZE_LARGE) {
     return NULL;
   }
-  hash = (grn_hash *)GRN_MALLOC(sizeof(grn_hash));
+  hash = (grn_hash *)GRN_CALLOC(sizeof(grn_hash));
   if (!hash) {
     return NULL;
   }

  Modified: lib/pat.c (+1 -1)
===================================================================
--- lib/pat.c    2016-06-26 16:50:45 +0900 (8d1c105)
+++ lib/pat.c    2016-06-26 17:56:29 +0900 (20db00e)
@@ -531,7 +531,7 @@ grn_pat_create(grn_ctx *ctx, const char *path, uint32_t key_size,
                uint32_t value_size, uint32_t flags)
 {
   grn_pat *pat;
-  if (!(pat = GRN_MALLOC(sizeof(grn_pat)))) {
+  if (!(pat = GRN_CALLOC(sizeof(grn_pat)))) {
     return NULL;
   }
   GRN_DB_OBJ_SET_TYPE(pat, GRN_TABLE_PAT_KEY);

  Modified: lib/store.c (+2 -2)
===================================================================
--- lib/store.c    2016-06-26 16:50:45 +0900 (00aedd7)
+++ lib/store.c    2016-06-26 17:56:29 +0900 (c7c8b19)
@@ -58,7 +58,7 @@ _grn_ra_create(grn_ctx *ctx, grn_ra *ra, const char *path, unsigned int element_
 grn_ra *
 grn_ra_create(grn_ctx *ctx, const char *path, unsigned int element_size)
 {
-  grn_ra *ra = GRN_MALLOCN(grn_ra, 1);
+  grn_ra *ra = (grn_ra *)GRN_CALLOC(sizeof(grn_ra));
   if (!ra) {
     return NULL;
   }
@@ -395,7 +395,7 @@ grn_ja *
 grn_ja_create(grn_ctx *ctx, const char *path, unsigned int max_element_size, uint32_t flags)
 {
   grn_ja *ja = NULL;
-  ja = GRN_MALLOCN(grn_ja, 1);
+  ja = (grn_ja *)GRN_CALLOC(sizeof(grn_ja));
   if (!ja) {
     return NULL;
   }
-------------- next part --------------
HTML����������������������������...
Download 



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