diff --git a/ChangeLog b/ChangeLog index 0bec55059..de80a793b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-11-07 Vladimir Serbinenko + + * grub-core/net/net.c (grub_net_route_unregister): Remove unused + function. + * grub-core/loader/i386/xnu.c (hextoval): Likewise. + * grub-core/disk/geli.c (ascii2hex): Likewise. + 2013-11-07 Vladimir Serbinenko * configure.ac: Run linker tests without -Werror. diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c index 305072778..7e3e09e72 100644 --- a/grub-core/disk/geli.c +++ b/grub-core/disk/geli.c @@ -159,18 +159,6 @@ geli_rekey (struct grub_cryptodisk *dev, grub_uint64_t zoneno) dev->rekey_derived_size); } -static inline int -ascii2hex (char c) -{ - if (c >= '0' && c <= '9') - return c - '0'; - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - if (c >= 'A' && c <= 'F') - return c - 'A' + 10; - return 0; -} - static inline gcry_err_code_t make_uuid (const struct grub_geli_phdr *header, char *uuid) diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c index 3b0f890db..1b22bed9e 100644 --- a/grub-core/loader/i386/xnu.c +++ b/grub-core/loader/i386/xnu.c @@ -354,18 +354,6 @@ grub_xnu_devprop_add_property_utf16 (struct grub_xnu_devprop_device_descriptor * return GRUB_ERR_NONE; } -static inline int -hextoval (char c) -{ - if (c >= '0' && c <= '9') - return c - '0'; - if (c >= 'a' && c <= 'z') - return c - 'a' + 10; - if (c >= 'A' && c <= 'Z') - return c - 'A' + 10; - return 0; -} - void grub_cpu_xnu_unload (void) { diff --git a/grub-core/net/net.c b/grub-core/net/net.c index 5f60b0722..0e57e93e8 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -415,12 +415,6 @@ grub_net_route_register (struct grub_net_route *route) GRUB_AS_LIST (route)); } -static inline void -grub_net_route_unregister (struct grub_net_route *route) -{ - grub_list_remove (GRUB_AS_LIST (route)); -} - #define FOR_NET_ROUTES(var) for (var = grub_net_routes; var; var = var->next) static int