null+****@clear*****
null+****@clear*****
2012年 3月 15日 (木) 16:37:50 JST
Susumu Yata 2012-03-15 16:37:50 +0900 (Thu, 15 Mar 2012)
New Revision: eb6eb7dfaeb66e12f120c656be2c2aff919221b6
Log:
Update grn_pat_cache_enable() to return GRN_SUCCESS on success.
Modified files:
lib/pat.c
Modified: lib/pat.c (+6 -6)
===================================================================
--- lib/pat.c 2012-03-15 14:28:23 +0900 (525eba0)
+++ lib/pat.c 2012-03-15 16:37:50 +0900 (6dc7214)
@@ -467,17 +467,17 @@ grn_pat_cache_enable(grn_ctx *ctx, grn_pat *pat, uint32_t cache_size)
{
if (pat->cache || pat->cache_size) {
ERR(GRN_INVALID_ARGUMENT, "cache is already enabled");
- goto exit;
+ return ctx->rc;
}
if (cache_size & (cache_size - 1)) {
ERR(GRN_INVALID_ARGUMENT, "cache_size(%u) must be a power of two", cache_size);
- goto exit;
+ return ctx->rc;
}
- if ((pat->cache = GRN_CALLOC(cache_size * sizeof(grn_id)))) {
- pat->cache_size = cache_size;
+ if (!(pat->cache = GRN_CALLOC(cache_size * sizeof(grn_id)))) {
+ return ctx->rc;
}
-exit :
- return ctx->rc;
+ pat->cache_size = cache_size;
+ return GRN_SUCCESS;
}
grn_rc