diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-01-27 12:54:38 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2020-01-27 12:54:38 +0200 |
commit | f5905497cb06d788776fe4685d0c4d61e475d834 (patch) | |
tree | 12742128dccf03383be1a282bd233e6493984984 | |
parent | 7aefde132304ec11edbacad76a3acd69db9e2fc4 (diff) | |
download | gdbm-f5905497cb06d788776fe4685d0c4d61e475d834.tar.gz |
Minor changes
* src/cachetree.c (_gdbm_node_set_elem): Remove function.
* src/findkey.c: Finalize efaefe4c.
-rw-r--r-- | src/cachetree.c | 6 | ||||
-rw-r--r-- | src/findkey.c | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/cachetree.c b/src/cachetree.c index d6d7f1e..4534f47 100644 --- a/src/cachetree.c +++ b/src/cachetree.c @@ -465,9 +465,3 @@ _gdbm_cache_tree_destroy (cache_tree *tree) } free (tree); } - -void -_gdbm_node_set_elem (cache_node *node, cache_elem *elem) -{ - node->elem = elem; -} diff --git a/src/findkey.c b/src/findkey.c index bff1f45..d9bbcc5 100644 --- a/src/findkey.c +++ b/src/findkey.c @@ -102,10 +102,10 @@ _gdbm_read_entry (GDBM_FILE dbf, int elem_loc) return NULL; } } -#if 1 + /* Read into the cache. */ file_pos = gdbm_file_seek (dbf, dbf->bucket->h_table[elem_loc].data_pointer, - SEEK_SET); + SEEK_SET); if (file_pos != dbf->bucket->h_table[elem_loc].data_pointer) { GDBM_SET_ERRNO2 (dbf, GDBM_FILE_SEEK_ERROR, TRUE, GDBM_DEBUG_LOOKUP); @@ -123,11 +123,7 @@ _gdbm_read_entry (GDBM_FILE dbf, int elem_loc) _gdbm_fatal (dbf, gdbm_db_strerror (dbf)); return NULL; } -#else - if (_gdbm_fetch_data (dbf, dbf->bucket->h_table[elem_loc].data_pointer, - key_size + data_size, data_ca->dptr)) - return NULL; -#endif + return data_ca->dptr; } |