svn commit: trunk/busybox: coreutils libbb

vda at busybox.net vda at busybox.net
Sat Jun 28 04:58:57 UTC 2008


Author: vda
Date: 2008-06-27 21:58:55 -0700 (Fri, 27 Jun 2008)
New Revision: 22547

Log:
fix FAST_FUNC fallout



Modified:
   trunk/busybox/coreutils/md5_sha1_sum.c
   trunk/busybox/libbb/makedev.c


Changeset:
Modified: trunk/busybox/coreutils/md5_sha1_sum.c
===================================================================
--- trunk/busybox/coreutils/md5_sha1_sum.c	2008-06-28 04:00:01 UTC (rev 22546)
+++ trunk/busybox/coreutils/md5_sha1_sum.c	2008-06-28 04:58:55 UTC (rev 22547)
@@ -33,8 +33,8 @@
 	} 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 @@
 	/* 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");

Modified: trunk/busybox/libbb/makedev.c
===================================================================
--- trunk/busybox/libbb/makedev.c	2008-06-28 04:00:01 UTC (rev 22546)
+++ trunk/busybox/libbb/makedev.c	2008-06-28 04:58:55 UTC (rev 22547)
@@ -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);
 }




More information about the busybox-cvs mailing list