mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Prevent Linux spurious warnings about fwrite(). [RT #20812]

Browse Source
This commit is contained in:
Francis Dupont
2010-01-11 10:49:14 +00:00
parent 36399b2e4a
commit a91029a00e
6 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
2837. [port] Prevent Linux spurious warnings about fwrite().
[RT #20812]
2836. [bug] Keys that were scheduled to become active could 2836. [bug] Keys that were scheduled to become active could
be delayed. [RT #20874] be delayed. [RT #20874]

8
bin/dnssec/dnssec-dsfromkey.c
View File

@@ -14,7 +14,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dnssec-dsfromkey.c,v 1.16 2009/10/12 20:48:10 each Exp $ */ /* $Id: dnssec-dsfromkey.c,v 1.17 2010/01/11 10:49:14 fdupont Exp $ */
/*! \file */ /*! \file */
@@ -265,12 +265,12 @@ emit(unsigned int dtype, isc_boolean_t showall, char *lookaside,
fatal("can't print class"); fatal("can't print class");
isc_buffer_usedregion(&nameb, &r); isc_buffer_usedregion(&nameb, &r);
fwrite(r.base, 1, r.length, stdout); isc_util_fwrite(r.base, 1, r.length, stdout);
putchar(' '); putchar(' ');
isc_buffer_usedregion(&classb, &r); isc_buffer_usedregion(&classb, &r);
fwrite(r.base, 1, r.length, stdout); isc_util_fwrite(r.base, 1, r.length, stdout);
if (lookaside == NULL) if (lookaside == NULL)
printf(" DS "); printf(" DS ");
@@ -278,7 +278,7 @@ emit(unsigned int dtype, isc_boolean_t showall, char *lookaside,
printf(" DLV "); printf(" DLV ");
isc_buffer_usedregion(&textb, &r); isc_buffer_usedregion(&textb, &r);
fwrite(r.base, 1, r.length, stdout); isc_util_fwrite(r.base, 1, r.length, stdout);
putchar('\n'); putchar('\n');
} }

4
bin/tests/cfg_test.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: cfg_test.c,v 1.21 2009/03/02 23:47:43 tbox Exp $ */ /* $Id: cfg_test.c,v 1.22 2010/01/11 10:49:14 fdupont Exp $ */
/*! \file */ /*! \file */
@@ -49,7 +49,7 @@ check_result(isc_result_t result, const char *format, ...) {
static void static void
output(void *closure, const char *text, int textlen) { output(void *closure, const char *text, int textlen) {
UNUSED(closure); UNUSED(closure);
(void) fwrite(text, 1, textlen, stdout); (void) isc_util_fwrite(text, 1, textlen, stdout);
} }
static void static void

6
lib/dns/dst_api.c
View File

@@ -31,7 +31,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_api.c,v 1.47 2009/11/07 03:36:58 each Exp $ * $Id: dst_api.c,v 1.48 2010/01/11 10:49:14 fdupont Exp $
*/ */
/*! \file */ /*! \file */
@@ -1450,7 +1450,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
fprintf(fp, " "); fprintf(fp, " ");
isc_buffer_usedregion(&classb, &r); isc_buffer_usedregion(&classb, &r);
fwrite(r.base, 1, r.length, fp); isc_util_fwrite(r.base, 1, r.length, fp);
if ((type & DST_TYPE_KEY) != 0) if ((type & DST_TYPE_KEY) != 0)
fprintf(fp, " KEY "); fprintf(fp, " KEY ");
@@ -1458,7 +1458,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
fprintf(fp, " DNSKEY "); fprintf(fp, " DNSKEY ");
isc_buffer_usedregion(&textb, &r); isc_buffer_usedregion(&textb, &r);
fwrite(r.base, 1, r.length, fp); isc_util_fwrite(r.base, 1, r.length, fp);
fputc('\n', fp); fputc('\n', fp);
fflush(fp); fflush(fp);

6
lib/dns/dst_parse.c
View File

@@ -31,7 +31,7 @@
/*% /*%
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_parse.c,v 1.25 2010/01/08 23:51:44 tbox Exp $ * $Id: dst_parse.c,v 1.26 2010/01/11 10:49:14 fdupont Exp $
*/ */
#include <config.h> #include <config.h>
@@ -626,7 +626,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv,
isc_buffer_usedregion(&b, &r); isc_buffer_usedregion(&b, &r);
fprintf(fp, "%s ", s); fprintf(fp, "%s ", s);
fwrite(r.base, 1, r.length, fp); isc_util_fwrite(r.base, 1, r.length, fp);
fprintf(fp, "\n"); fprintf(fp, "\n");
} }
@@ -651,7 +651,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv,
isc_buffer_usedregion(&b, &r); isc_buffer_usedregion(&b, &r);
fprintf(fp, "%s ", timetags[i]); fprintf(fp, "%s ", timetags[i]);
fwrite(r.base, 1, r.length, fp); isc_util_fwrite(r.base, 1, r.length, fp);
fprintf(fp, "\n"); fprintf(fp, "\n");
} }
} }

12
lib/isc/include/isc/util.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: util.h,v 1.30 2007/06/19 23:47:18 tbox Exp $ */ /* $Id: util.h,v 1.31 2010/01/11 10:49:14 fdupont Exp $ */
#ifndef ISC_UTIL_H #ifndef ISC_UTIL_H
#define ISC_UTIL_H 1 #define ISC_UTIL_H 1
@@ -230,4 +230,14 @@
*/ */
#define TIME_NOW(tp) RUNTIME_CHECK(isc_time_now((tp)) == ISC_R_SUCCESS) #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 */ #endif /* ISC_UTIL_H */