diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-28 04:58:55 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-28 04:58:55 +0000 |
| commit | 9579d87be4ab9b02195749c15a2112e2a4466ab4 (patch) | |
| tree | 4b7a5e36c0d6f4c4269892054dbe35d415e904c4 | |
| parent | dbcf3275ec36343f8bb2fb3faa8a4f18fb66419b (diff) | |
| download | busybox-9579d87be4ab9b02195749c15a2112e2a4466ab4.tar.gz | |
fix FAST_FUNC fallout
| -rw-r--r-- | coreutils/md5_sha1_sum.c | 12 | ||||
| -rw-r--r-- | libbb/makedev.c | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index c81619493..8690f4017 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c @@ -33,8 +33,8 @@ static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo) } context; uint8_t *hash_value = NULL; RESERVE_CONFIG_UBUFFER(in_buf, 4096); - void (*update)(const void*, size_t, void*); - void (*final)(void*, void*); + void FAST_FUNC (*update)(const void*, size_t, void*); + void FAST_FUNC (*final)(void*, void*); src_fd = open_or_warn_stdin(filename); if (src_fd < 0) { @@ -44,13 +44,13 @@ static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo) /* figure specific hash algorithims */ if (ENABLE_MD5SUM && hash_algo==HASH_MD5) { md5_begin(&context.md5); - update = (void (*)(const void*, size_t, void*))md5_hash; - final = (void (*)(void*, void*))md5_end; + update = (void*)md5_hash; + final = (void*)md5_end; hash_len = 16; } else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { sha1_begin(&context.sha1); - update = (void (*)(const void*, size_t, void*))sha1_hash; - final = (void (*)(void*, void*))sha1_end; + update = (void*)sha1_hash; + final = (void*)sha1_end; hash_len = 20; } else { bb_error_msg_and_die("algorithm not supported"); diff --git a/libbb/makedev.c b/libbb/makedev.c index efd51224f..ca71fdba6 100644 --- a/libbb/makedev.c +++ b/libbb/makedev.c @@ -7,6 +7,7 @@ */ /* We do not include libbb.h - #define makedev() is there! */ +#include "platform.h" #include <features.h> #include <sys/sysmacros.h> @@ -15,8 +16,8 @@ /* uclibc people please check - do we need "&& !__UCLIBC__" above? */ /* suppress gcc "no previous prototype" warning */ -unsigned long long bb_makedev(unsigned int major, unsigned int minor); -unsigned long long bb_makedev(unsigned int major, unsigned int minor) +unsigned long long FAST_FUNC bb_makedev(unsigned int major, unsigned int minor); +unsigned long long FAST_FUNC bb_makedev(unsigned int major, unsigned int minor) { return makedev(major, minor); } |