137-no_extern_inline.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- a/mkfs.ubifs/hashtable/hashtable_itr.c
  2. +++ b/mkfs.ubifs/hashtable/hashtable_itr.c
  3. @@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h)
  4. }
  5. /*****************************************************************************/
  6. -/* key - return the key of the (key,value) pair at the current position */
  7. -/* value - return the value of the (key,value) pair at the current position */
  8. -
  9. -void *
  10. -hashtable_iterator_key(struct hashtable_itr *i)
  11. -{ return i->e->k; }
  12. -
  13. -void *
  14. -hashtable_iterator_value(struct hashtable_itr *i)
  15. -{ return i->e->v; }
  16. -
  17. -/*****************************************************************************/
  18. /* advance - advance the iterator to the next element
  19. * returns zero if advanced to end of table */
  20. --- a/mkfs.ubifs/hashtable/hashtable_itr.h
  21. +++ b/mkfs.ubifs/hashtable/hashtable_itr.h
  22. @@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h);
  23. /* hashtable_iterator_key
  24. * - return the value of the (key,value) pair at the current position */
  25. -extern inline void *
  26. +static inline void *
  27. hashtable_iterator_key(struct hashtable_itr *i)
  28. {
  29. return i->e->k;
  30. @@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_
  31. /*****************************************************************************/
  32. /* value - return the value of the (key,value) pair at the current position */
  33. -extern inline void *
  34. +static inline void *
  35. hashtable_iterator_value(struct hashtable_itr *i)
  36. {
  37. return i->e->v;