Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 01:32:08 +00:00
Code Issues Projects Releases Wiki Activity

fix FAST_FUNC fallout

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-28 04:58:55 +00:00
parent dbcf3275ec
commit 9579d87be4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
coreutils/md5_sha1_sum.c
View File

@ -33,8 +33,8 @@ static uint8_t *hash_file(const char *filename, hash_algo_t hash_algo)
} context; } context;
uint8_t *hash_value = NULL; uint8_t *hash_value = NULL;
RESERVE_CONFIG_UBUFFER(in_buf, 4096); RESERVE_CONFIG_UBUFFER(in_buf, 4096);
void (*update)(const void*, size_t, void*); void FAST_FUNC (*update)(const void*, size_t, void*);
void (*final)(void*, void*); void FAST_FUNC (*final)(void*, void*);
src_fd = open_or_warn_stdin(filename); src_fd = open_or_warn_stdin(filename);
if (src_fd < 0) { 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 */ /* figure specific hash algorithims */
if (ENABLE_MD5SUM && hash_algo==HASH_MD5) { if (ENABLE_MD5SUM && hash_algo==HASH_MD5) {
md5_begin(&context.md5); md5_begin(&context.md5);
update = (void (*)(const void*, size_t, void*))md5_hash; update = (void*)md5_hash;
final = (void (*)(void*, void*))md5_end; final = (void*)md5_end;
hash_len = 16; hash_len = 16;
} else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) { } else if (ENABLE_SHA1SUM && hash_algo==HASH_SHA1) {
sha1_begin(&context.sha1); sha1_begin(&context.sha1);
update = (void (*)(const void*, size_t, void*))sha1_hash; update = (void*)sha1_hash;
final = (void (*)(void*, void*))sha1_end; final = (void*)sha1_end;
hash_len = 20; hash_len = 20;
} else { } else {
bb_error_msg_and_die("algorithm not supported"); bb_error_msg_and_die("algorithm not supported");

5
libbb/makedev.c
View File

@ -7,6 +7,7 @@
*/ */
/* We do not include libbb.h - #define makedev() is there! */ /* We do not include libbb.h - #define makedev() is there! */
#include "platform.h"
#include <features.h> #include <features.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
@ -15,8 +16,8 @@
/* uclibc people please check - do we need "&& !__UCLIBC__" above? */ /* uclibc people please check - do we need "&& !__UCLIBC__" above? */
/* suppress gcc "no previous prototype" warning */ /* suppress gcc "no previous prototype" warning */
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 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); return makedev(major, minor);
} }