diff options
author | Richard Dale <richard.dale@codethink.co.uk> | 2015-05-05 09:06:06 +0000 |
---|---|---|
committer | Richard Dale <richard.dale@codethink.co.uk> | 2015-05-05 19:15:48 +0000 |
commit | dcb5ebe69c663375f13aefa303c8bbbabf414ac8 (patch) | |
tree | 241bce75e1ff6dcd40814de393c65a341b55b4f5 | |
parent | 9f107132a6a073cce37434ca9cda6917dd8d866b (diff) | |
download | mtd-utils-baserock/1.5.1.tar.gz |
Remove duplicate definitions of functions inlined in hashtable_itr.hbaserock/1.5.1
Change 'extern inline' to 'static inline'
-rw-r--r-- | mkfs.ubifs/hashtable/hashtable_itr.c | 12 | ||||
-rw-r--r-- | mkfs.ubifs/hashtable/hashtable_itr.h | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/mkfs.ubifs/hashtable/hashtable_itr.c b/mkfs.ubifs/hashtable/hashtable_itr.c index 24f4dde..d102453 100644 --- 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 */ diff --git a/mkfs.ubifs/hashtable/hashtable_itr.h b/mkfs.ubifs/hashtable/hashtable_itr.h index 87a97eb..5c94a04 100644 --- 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_itr *i) /*****************************************************************************/ /* 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; |