|
|
@@ -0,0 +1,41 @@
|
|
|
+--- a/mkfs.ubifs/hashtable/hashtable_itr.c
|
|
|
++++ b/mkfs.ubifs/hashtable/hashtable_itr.c
|
|
|
+@@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h)
|
|
|
+ }
|
|
|
+
|
|
|
+ /*****************************************************************************/
|
|
|
+-/* key - return the key of the (key,value) pair at the current position */
|
|
|
+-/* value - return the value of the (key,value) pair at the current position */
|
|
|
+-
|
|
|
+-void *
|
|
|
+-hashtable_iterator_key(struct hashtable_itr *i)
|
|
|
+-{ return i->e->k; }
|
|
|
+-
|
|
|
+-void *
|
|
|
+-hashtable_iterator_value(struct hashtable_itr *i)
|
|
|
+-{ return i->e->v; }
|
|
|
+-
|
|
|
+-/*****************************************************************************/
|
|
|
+ /* advance - advance the iterator to the next element
|
|
|
+ * returns zero if advanced to end of table */
|
|
|
+
|
|
|
+--- a/mkfs.ubifs/hashtable/hashtable_itr.h
|
|
|
++++ b/mkfs.ubifs/hashtable/hashtable_itr.h
|
|
|
+@@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h);
|
|
|
+ /* hashtable_iterator_key
|
|
|
+ * - return the value of the (key,value) pair at the current position */
|
|
|
+
|
|
|
+-extern inline void *
|
|
|
++static inline void *
|
|
|
+ hashtable_iterator_key(struct hashtable_itr *i)
|
|
|
+ {
|
|
|
+ return i->e->k;
|
|
|
+@@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_
|
|
|
+ /*****************************************************************************/
|
|
|
+ /* value - return the value of the (key,value) pair at the current position */
|
|
|
+
|
|
|
+-extern inline void *
|
|
|
++static inline void *
|
|
|
+ hashtable_iterator_value(struct hashtable_itr *i)
|
|
|
+ {
|
|
|
+ return i->e->v;
|