Commit 76a7d4e1 authored by Evan Hunt's avatar Evan Hunt
Browse files

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

			incorrect use of __builtin_expect. [RT #25183]
parent 6010c10f
3152. [cleanup] Some versions of gcc and clang failed due to
incorrect use of __builtin_expect. [RT #25183]
3151. [bug] Queries for type RRSIG or SIG could be handled
incorrectly. [RT #21050]
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: cfg_test.c,v 1.23 2010/01/11 23:48:37 tbox Exp $ */
/* $Id: cfg_test.c,v 1.24 2011/09/05 18:00:22 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
......
......@@ -31,7 +31,7 @@
/*
* Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.63 2011/08/18 23:46:34 tbox Exp $
* $Id: dst_api.c,v 1.64 2011/09/05 18:00:22 each Exp $
*/
/*! \file */
......@@ -1579,7 +1579,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
fprintf(fp, "%d ", key->key_ttl);
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)
......@@ -1588,7 +1588,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);
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: util.h,v 1.34 2011/03/12 04:59:49 tbox Exp $ */
/* $Id: util.h,v 1.35 2011/09/05 18:00:22 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 */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment