ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

3152. [cleanup] Some versions of gcc and clang failed due to

Browse Source 
incorrect use of __builtin_expect. [RT #25183]
This commit is contained in:
Evan Hunt
2011-09-05 18:01:47 +00:00
parent 1484402c39
commit 3d7092d9bd
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/tests/cfg_test.c
+2 -2
View File
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cfg_test.c,v 1.19.332.4 2010/01/11 23:47:22 tbox Exp $ */
/* $Id: cfg_test.c,v 1.19.332.5 2011/09/05 18:01:47 each Exp $ */
/*! \file */
@@ -49,7 +49,7 @@ check_result(isc_result_t result, const char *format, ...) {
static void
output(void *closure, const char *text, int textlen) {
UNUSED(closure);
(void) isc_util_fwrite(text, 1, textlen, stdout);
(void) fwrite(text, 1, textlen, stdout);
}
static void
lib/dns/dst_api.c
+3 -3
View File
@@ -31,7 +31,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.16.12.16 2011/08/18 23:45:12 tbox Exp $
* $Id: dst_api.c,v 1.16.12.17 2011/09/05 18:01:47 each Exp $
*/
/*! \file */
@@ -1193,7 +1193,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
fprintf(fp, " ");
isc_buffer_usedregion(&classb, &r);
if ((unsigned)isc_util_fwrite(r.base, 1, r.length, fp) != r.length)
if ((unsigned) fwrite(r.base, 1, r.length, fp) != r.length)
ret = DST_R_WRITEERROR;
if ((type & DST_TYPE_KEY) != 0)
@@ -1202,7 +1202,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
fprintf(fp, " DNSKEY ");
isc_buffer_usedregion(&textb, &r);
if ((unsigned)isc_util_fwrite(r.base, 1, r.length, fp) != r.length)
if ((unsigned) fwrite(r.base, 1, r.length, fp) != r.length)
ret = DST_R_WRITEERROR;
fputc('\n', fp);
lib/isc/include/isc/util.h
+1 -11
View File
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: util.h,v 1.30.332.4 2011/03/12 04:57:32 tbox Exp $ */
/* $Id: util.h,v 1.30.332.5 2011/09/05 18:01:47 each Exp $ */
#ifndef ISC_UTIL_H
#define ISC_UTIL_H 1
@@ -235,14 +235,4 @@
*/
#define TIME_NOW(tp) RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS)
/*%
* Prevent Linux spurious warnings
*/
#if defined(__GNUC__) && (__GNUC__ > 3)
#define isc_util_fwrite(a, b, c, d) \
__builtin_expect(fwrite((a), (b), (c), (d)), (c))
#else
#define isc_util_fwrite(a, b, c, d) fwrite((a), (b), (c), (d))
#endif
#endif /* ISC_UTIL_H */