diff mbox

mtd-utils: make hashtable_iterator functions static inline

Message ID 1429201976-13558-1-git-send-email-james410@cowgill.org.uk
State Accepted
Commit ce9757872796a8ae31bc641ec37f3d8df4aea2ee
Headers show

Commit Message

James Cowgill April 16, 2015, 4:32 p.m. UTC 
GCC 5 changed the default C standard to gnu11 which changed the behavior of the
inline keyword. This causes mtd-utils to fail to build with duplicate
definition errors involving hashtable_iterator_key and
hashtable_iterator_value.

This patch fixes the build by making the functions static inline and removing
the extra definitions in hashtable_itr.c.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
---
 mkfs.ubifs/hashtable/hashtable_itr.c | 12 ------------
 mkfs.ubifs/hashtable/hashtable_itr.h |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)

Comments

Brian Norris May 28, 2015, 11:36 p.m. UTC | #1 
On Thu, Apr 16, 2015 at 05:32:56PM +0100, James Cowgill wrote:
> GCC 5 changed the default C standard to gnu11 which changed the behavior of the
> inline keyword. This causes mtd-utils to fail to build with duplicate
> definition errors involving hashtable_iterator_key and
> hashtable_iterator_value.
> 
> This patch fixes the build by making the functions static inline and removing
> the extra definitions in hashtable_itr.c.
> 
> Signed-off-by: James Cowgill <james410@cowgill.org.uk>

Applied an identical patch from another contributor. Thanks!

Brian
diff mbox

Patch

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;