null+****@clear*****
null+****@clear*****
2011年 11月 7日 (月) 10:46:06 JST
Daijiro MORI 2011-11-07 01:46:06 +0000 (Mon, 07 Nov 2011)
New Revision: 4f52fac9a1d25936761e0f80a9e5109310785417
Log:
fixed clearing flag values
Modified files:
lib/hash.c
lib/ii.c
lib/pat.c
lib/store.c
Modified: lib/hash.c (+2 -2)
===================================================================
--- lib/hash.c 2011-11-06 11:59:49 +0000 (40f6912)
+++ lib/hash.c 2011-11-07 01:46:06 +0000 (3c2da36)
@@ -201,12 +201,12 @@ grn_array_create(grn_ctx *ctx, const char *path, uint32_t value_size, uint32_t f
{
grn_array *array;
if (ctx && (array = GRN_MALLOC(sizeof(grn_array)))) {
+ GRN_DB_OBJ_SET_TYPE(array, GRN_TABLE_NO_KEY);
if (_grn_array_create(ctx, array, path, value_size, flags)) {
return array;
}
GRN_FREE(array);
}
- GRN_DB_OBJ_SET_TYPE(array, GRN_TABLE_NO_KEY);
return NULL;
}
@@ -946,11 +946,11 @@ grn_hash_create(grn_ctx *ctx, const char *path, uint32_t key_size, uint32_t valu
if (!(hash = GRN_MALLOC(sizeof(grn_hash)))) {
return NULL;
}
+ GRN_DB_OBJ_SET_TYPE(hash, GRN_TABLE_HASH_KEY);
if (!_grn_hash_create(ctx, hash, path, key_size, value_size, flags)) {
GRN_FREE(hash);
return NULL;
}
- GRN_DB_OBJ_SET_TYPE(hash, GRN_TABLE_HASH_KEY);
return hash;
}
Modified: lib/ii.c (+1 -1)
===================================================================
--- lib/ii.c 2011-11-06 11:59:49 +0000 (3af3eef)
+++ lib/ii.c 2011-11-07 01:46:06 +0000 (b9255e1)
@@ -3453,11 +3453,11 @@ grn_ii_create(grn_ctx *ctx, const char *path, grn_obj *lexicon, uint32_t flags)
if (!(ii = GRN_GMALLOC(sizeof(grn_ii)))) {
return NULL;
}
+ GRN_DB_OBJ_SET_TYPE(ii, GRN_COLUMN_INDEX);
if (!_grn_ii_create(ctx, ii, path, lexicon, flags)) {
GRN_FREE(ii);
return NULL;
}
- GRN_DB_OBJ_SET_TYPE(ii, GRN_COLUMN_INDEX);
return ii;
}
Modified: lib/pat.c (+1 -1)
===================================================================
--- lib/pat.c 2011-11-06 11:59:49 +0000 (dc7ac63)
+++ lib/pat.c 2011-11-07 01:46:06 +0000 (84ffbbb)
@@ -447,11 +447,11 @@ grn_pat_create(grn_ctx *ctx, const char *path, uint32_t key_size,
if (!(pat = GRN_MALLOC(sizeof(grn_pat)))) {
return NULL;
}
+ GRN_DB_OBJ_SET_TYPE(pat, GRN_TABLE_PAT_KEY);
if (!_grn_pat_create(ctx, pat, path, key_size, value_size, flags)) {
GRN_FREE(pat);
return NULL;
}
- GRN_DB_OBJ_SET_TYPE(pat, GRN_TABLE_PAT_KEY);
return pat;
}
Modified: lib/store.c (+2 -2)
===================================================================
--- lib/store.c 2011-11-06 11:59:49 +0000 (572fb0a)
+++ lib/store.c 2011-11-07 01:46:06 +0000 (09aa87a)
@@ -61,11 +61,11 @@ grn_ra_create(grn_ctx *ctx, const char *path, unsigned int element_size)
if (!(ra = GRN_GMALLOC(sizeof(grn_ra)))) {
return NULL;
}
+ GRN_DB_OBJ_SET_TYPE(ra, GRN_COLUMN_FIX_SIZE);
if (!_grn_ra_create(ctx, ra, path, element_size)) {
GRN_FREE(ra);
return NULL;
}
- GRN_DB_OBJ_SET_TYPE(ra, GRN_COLUMN_FIX_SIZE);
return ra;
}
@@ -338,11 +338,11 @@ grn_ja_create(grn_ctx *ctx, const char *path, unsigned int max_element_size, uin
if (!(ja = GRN_GMALLOC(sizeof(grn_ja)))) {
return NULL;
}
+ GRN_DB_OBJ_SET_TYPE(ja, GRN_COLUMN_VAR_SIZE);
if (!_grn_ja_create(ctx, ja, path, max_element_size, flags)) {
GRN_FREE(ja);
return NULL;
}
- GRN_DB_OBJ_SET_TYPE(ja, GRN_COLUMN_VAR_SIZE);
return ja;
}