upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 20:25:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add and use __attribute__((nonnull)) in dnssec-signzone.c

Browse source 
Clang 20 is complaining about passing NULL to an argument with 'nonnull'
attribute.  Mark these two functions with the same attribute to assure
that these two function also don't accept NULL as an argument.

(cherry picked from commit 9e350c1774)
This commit is contained in:
Ondřej Surý 2025-08-21 23:51:38 +02:00
parent 35dee6eb90
commit a5d7c8f7db
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/dnssec/dnssec-signzone.c
View file

@ -3204,6 +3204,8 @@ writeset(const char *prefix, dns_rdatatype_t type) {
dns_db_detach(&db);
}
static void
print_time(FILE *fp) ISC_ATTR_NONNULL(1);
static void
print_time(FILE *fp) {
time_t currenttime = time(NULL);
@ -3220,6 +3222,8 @@ print_time(FILE *fp) {
fprintf(fp, "; File written on %s\n", timebuf);
}
static void
print_version(FILE *fp) ISC_ATTR_NONNULL(1);
static void
print_version(FILE *fp) {
if (outputformat != dns_masterformat_text) {
@ -4058,6 +4062,7 @@ main(int argc, char *argv[]) {
fatal("failed to open temporary output file: %s",
isc_result_totext(result));
}
INSIST(outfp != NULL);
removefile = true;
setfatalcallback(&removetempfile);
}

6
lib/isc/include/isc/attributes.h
View file

@ -110,3 +110,9 @@
#else
#define ISC_CONSTEXPR static const
#endif
#if __has_attribute(__nonnull__)
#define ISC_ATTR_NONNULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
#else
#define ISC_ATTR_NONNULL(...)
#endif