From 530db8b7585fd540c3af97467401f4862eecffb0 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 10 Feb 2015 17:01:35 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 87e2b05c..4db3f257 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: 44456868a79fac11bcd69dd62d43322c4e4705af -Head: 5148ba157e5bb4d73599f8db76236d1f7fcdf9e0 +Previous: 98adec8eb602c54b50432875a1a656115ee77efd +Head: da458c9750cc6557e9f63707cb665de2b3224851 Applied: rs-idm: 5148ba157e5bb4d73599f8db76236d1f7fcdf9e0 + refresh-temp: da458c9750cc6557e9f63707cb665de2b3224851 Unapplied: raccept-invalid: 8d5251952074622e8be0c9828d5eb573b4a1c6d2 old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..ad4c35eb --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,43 @@ +Bottom: cc9fe9e0f61b120af8e519dd3c5c3802a7170a6e +Top: b0f3da43a489fa6fea3ae6c142ec4473174ef081 +Author: Sean Hefty +Date: 2015-02-10 17:01:33 -0800 + +Refresh of rs-idm + +--- + +diff --git a/src/indexer.c b/src/indexer.c +index f9042f5..be2e69c 100644 +--- a/src/indexer.c ++++ b/src/indexer.c +@@ -151,7 +151,6 @@ int idm_set(struct index_map *idm, int index, void *item) + + entry = idm->array[idx_array_index(index)]; + entry[idx_entry_index(index)] = item; +- idm->count[idx_array_index(index)]++; + return index; + } + +@@ -163,9 +162,5 @@ void *idm_clear(struct index_map *idm, int index) + entry = idm->array[idx_array_index(index)]; + item = entry[idx_entry_index(index)]; + entry[idx_entry_index(index)] = NULL; +- if (--idm->count[idx_array_index(index)] == 0) { +- free(idm->array[idx_array_index(index)]); +- idm->array[idx_array_index(index)] = NULL; +- } + return item; + } +diff --git a/src/indexer.h b/src/indexer.h +index fc8eae2..0c5f388 100644 +--- a/src/indexer.h ++++ b/src/indexer.h +@@ -85,7 +85,6 @@ static inline void *idx_at(struct indexer *idx, int index) + struct index_map + { + void **array[IDX_ARRAY_SIZE]; +- int count[IDX_ARRAY_SIZE]; + }; + + int idm_set(struct index_map *idm, int index, void *item); -- 2.46.0