null+****@clear*****
null+****@clear*****
2012年 3月 29日 (木) 13:28:32 JST
Susumu Yata 2012-03-29 13:28:32 +0900 (Thu, 29 Mar 2012)
New Revision: cc9d554e510ae554c312b3e488dcc2ff7abcfd08
Log:
Update grn_array_copy_sort_key().
Fix a bug of returning an error code (not GRN_SUCCESS) if ctx->rc is
not GRN_SUCCESS when it is called.
Modified files:
lib/hash.c
Modified: lib/hash.c (+4 -2)
===================================================================
--- lib/hash.c 2012-03-29 13:25:28 +0900 (4ef2fb5)
+++ lib/hash.c 2012-03-29 13:28:32 +0900 (5b6de5b)
@@ -568,9 +568,11 @@ grn_array_at(grn_ctx *ctx, grn_array *array, grn_id id)
}
grn_rc
-grn_array_copy_sort_key(grn_ctx *ctx, grn_array *array, grn_table_sort_key *keys, int n_keys)
+grn_array_copy_sort_key(grn_ctx *ctx, grn_array *array,
+ grn_table_sort_key *keys, int n_keys)
{
- if ((array->keys = GRN_MALLOCN(grn_table_sort_key, n_keys))) {
+ array->keys = GRN_MALLOCN(grn_table_sort_key, n_keys);
+ if (array->keys) {
memcpy(array->keys, keys, sizeof(grn_table_sort_key) * n_keys);
array->n_keys = n_keys;
}