null+****@clear*****
null+****@clear*****
2012年 3月 30日 (金) 17:36:23 JST
Susumu Yata 2012-03-30 17:36:23 +0900 (Fri, 30 Mar 2012)
New Revision: 92a01b185daee4ec370e298d7009a23f03945fd1
Log:
Rename elements to blocks.
Modified files:
lib/hash.c
lib/hash.h
Modified: lib/hash.c (+4 -4)
===================================================================
--- lib/hash.c 2012-03-30 15:11:48 +0900 (9bf44d3)
+++ lib/hash.c 2012-03-30 17:36:23 +0900 (ba9aaef)
@@ -42,7 +42,7 @@ grn_tiny_array_at_inline(grn_tiny_array *array, grn_id id)
return NULL;
}
block_id = grn_tiny_array_get_block_id(array, id);
- block = &array->elements[block_id];
+ block = &array->blocks[block_id];
offset = GRN_TINY_ARRAY_R(block_id);
if (!*block) {
grn_ctx * const ctx = array->ctx;
@@ -137,7 +137,7 @@ grn_tiny_array_init(grn_ctx *ctx, grn_tiny_array *array,
if (flags & GRN_TINY_ARRAY_THREADSAFE) {
CRITICAL_SECTION_INIT(array->lock);
}
- memset(array->elements, 0, sizeof(array->elements));
+ memset(array->blocks, 0, sizeof(array->blocks));
}
void
@@ -146,7 +146,7 @@ grn_tiny_array_fin(grn_tiny_array *array)
int block_id;
grn_ctx * const ctx = array->ctx;
for (block_id = 0; block_id < GRN_TINY_ARRAY_N; block_id++) {
- void ** const block = &array->elements[block_id];
+ void ** const block = &array->blocks[block_id];
if (*block) {
if (array->flags & GRN_TINY_ARRAY_USE_MALLOC) {
GRN_FREE(*block);
@@ -171,7 +171,7 @@ grn_tiny_array_id(grn_tiny_array *array, const void *element_address)
uint32_t block_id, offset = 1;
for (block_id = 0; block_id < GRN_TINY_ARRAY_N; block_id++) {
const uint32_t block_size = GRN_TINY_ARRAY_S * GRN_TINY_ARRAY_R(block_id);
- const byte * const block = (const byte *)array->elements[block_id];
+ const byte * const block = (const byte *)array->blocks[block_id];
if (block && block <= ptr &&
ptr < (block + block_size * array->element_size)) {
return offset + ((ptr - block) / array->element_size);
Modified: lib/hash.h (+3 -3)
===================================================================
--- lib/hash.h 2012-03-30 15:11:48 +0900 (edb450e)
+++ lib/hash.h 2012-03-30 17:36:23 +0900 (9c7eae0)
@@ -58,7 +58,7 @@ extern "C" {
/*
* grn_tiny_array uses several blocks to represent an array.
- * The k-th block (elements[k]) consists of 2^k elements.
+ * The k-th block (block[k]) consists of 2^k elements.
*/
typedef struct _grn_tiny_array grn_tiny_array;
@@ -68,7 +68,7 @@ struct _grn_tiny_array {
uint16_t element_size;
uint16_t flags;
grn_critical_section lock;
- void *elements[GRN_TINY_ARRAY_N];
+ void *blocks[GRN_TINY_ARRAY_N];
};
#define GRN_TINY_ARRAY_EACH(array, head, tail, key, value, block) do {\
@@ -78,7 +78,7 @@ struct _grn_tiny_array {
for (_block_id = 0, (key) = (_head);\
_block_id < GRN_TINY_ARRAY_N && (key) <= (_tail); _block_id++) {\
int _id = GRN_TINY_ARRAY_S * GRN_TINY_ARRAY_R(_block_id);\
- if (((value) = (array)->elements[_block_id])) {\
+ if (((value) = (array)->blocks[_block_id])) {\
for (; _id-- && (key) <= (_tail);\
(key)++, (value) = (void *)((byte *)(value) + (array)->element_size)) {\
block\