From: Evan Hunt Date: Thu, 4 Dec 2025 03:15:12 +0000 (+0000) Subject: fix: dev: Standardize CHECK and RETERR macros X-Git-Tag: v9.21.16~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a45d253882764090643a0436f85b94d2a5d520d6;p=thirdparty%2Fbind9.git fix: dev: Standardize CHECK and RETERR macros Previously, there were over 40 separate definitions of `CHECK` macros, of which most used `goto cleanup`, and the rest `goto failure` or `goto out`. There were another 10 definitions of `RETERR`, of which most were identical to `CHECK`, but some simply returned a result code instead of jumping to a cleanup label. This has now been standardized throughout the code base: `RETERR` is for returning an error code in the case of an error, and `CHECK` is for jumping to a cleanup tag, which is now always called `cleanup`. Both macros are defined in `isc/util.h`. Merge branch 'each-check-and-cleanup' into 'main' See merge request isc-projects/bind9!10472 --- a45d253882764090643a0436f85b94d2a5d520d6