De-duplicate __FILE__, __LINE__

Mostly generated automatically with the following semantic patch,
except where coccinelle was confused by #ifdef in lib/isc/net.c

@@ expression list args; @@
- UNEXPECTED_ERROR(__FILE__, __LINE__, args)
+ UNEXPECTED_ERROR(args)
@@ expression list args; @@
- FATAL_ERROR(__FILE__, __LINE__, args)
+ FATAL_ERROR(args)

diff --git a/bin/named/dlz_dlopen_driver.c b/bin/named/dlz_dlopen_driver.c
index 794deb38a1ee30ef837fa154a7f4bbd77021970f..0d5bcced6492f9699342dc11f9c17f4bb6af7787 100644 (file)
--- a/bin/named/dlz_dlopen_driver.c
+++ b/bin/named/dlz_dlopen_driver.c
@@ -531,8 +531,7 @@ dlz_dlopen_init(isc_mem_t *mctx) {
                                  mctx, &dlz_dlopen);
 
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "dns_sdlzregister() failed: %s",
+               UNEXPECTED_ERROR("dns_sdlzregister() failed: %s",
                                 isc_result_totext(result));
                result = ISC_R_UNEXPECTED;
        }

diff --git a/bin/named/main.c b/bin/named/main.c
index 0f3896e00b0fcee0f6caf2653d7823542bf28392..c928069d9133c6d7bacedc0a0550ad4a5d87d583 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1406,8 +1406,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) {
 
        if ((h = scf_handle_create(SCF_VERSION)) == NULL) {
                if (debug) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "scf_handle_create() failed: %s",
+                       UNEXPECTED_ERROR("scf_handle_create() failed: %s",
                                         scf_strerror(scf_error()));
                }
                return (ISC_R_FAILURE);
@@ -1415,8 +1414,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) {
 
        if (scf_handle_bind(h) == -1) {
                if (debug) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "scf_handle_bind() failed: %s",
+                       UNEXPECTED_ERROR("scf_handle_bind() failed: %s",
                                         scf_strerror(scf_error()));
                }
                scf_handle_destroy(h);
@@ -1425,8 +1423,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) {
 
        if ((namelen = scf_myname(h, NULL, 0)) == -1) {
                if (debug) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "scf_myname() failed: %s",
+                       UNEXPECTED_ERROR("scf_myname() failed: %s",
                                         scf_strerror(scf_error()));
                }
                scf_handle_destroy(h);
@@ -1434,8 +1431,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) {
        }
 
        if ((instance = isc_mem_allocate(mctx, namelen + 1)) == NULL) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "named_smf_get_instance memory "
+               UNEXPECTED_ERROR("named_smf_get_instance memory "
                                 "allocation failed: %s",
                                 isc_result_totext(ISC_R_NOMEMORY));
                scf_handle_destroy(h);
@@ -1444,8 +1440,7 @@ named_smf_get_instance(char **ins_name, int debug, isc_mem_t *mctx) {
 
        if (scf_myname(h, instance, namelen + 1) == -1) {
                if (debug) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "scf_myname() failed: %s",
+                       UNEXPECTED_ERROR("scf_myname() failed: %s",
                                         scf_strerror(scf_error()));
                }
                scf_handle_destroy(h);
@@ -1552,8 +1547,7 @@ main(int argc, char *argv[]) {
                result = named_smf_get_instance(&instance, 1, named_g_mctx);
                if (result == ISC_R_SUCCESS && instance != NULL) {
                        if (smf_disable_instance(instance, 0) != 0) {
-                               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                                "smf_disable_instance() "
+                               UNEXPECTED_ERROR("smf_disable_instance() "
                                                 "failed for %s : %s",
                                                 instance,
                                                 scf_strerror(scf_error()));

diff --git a/bin/named/server.c b/bin/named/server.c
index 8c948ef6f4dafc2b8995a816be33595d24f14364..7f4bb94e67d99c49714e60161eeb527bbb24d637 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -4765,8 +4765,7 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
                maps, AF_INET6, &dispatch6, &dscp6,
                (ISC_LIST_PREV(view, link) == NULL)));
        if (dispatch4 == NULL && dispatch6 == NULL) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "unable to obtain either an IPv4 or"
+               UNEXPECTED_ERROR("unable to obtain either an IPv4 or"
                                 " an IPv6 dispatch");
                result = ISC_R_UNEXPECTED;
                goto cleanup;

diff --git a/doc/dev/unexpected b/doc/dev/unexpected
index ffa4b2a9b938ca9d73fa2f9cd4655e1fa65ada9f..bb9f00a8b50384fa8eaa79772f216321c4a4bc5a 100644 (file)
--- a/doc/dev/unexpected
+++ b/doc/dev/unexpected
@@ -37,8 +37,7 @@ not, we call UNEXPECTED_ERROR().  E.g.
 
 void foo() {
        if (some_unix_thang() < 0) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "some_unix_thang() failed: %s",
+               UNEXPECTED_ERROR("some_unix_thang() failed: %s",
                                 strerror(errno));
                return (ISC_R_UNEXPECTED);
        }

diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index 51b9cfecdfd0c4500e87c3a002a087eb755bc591..eedf3afc641527f41adeecbf62b0329d5ab91dd6 100644 (file)
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -471,8 +471,7 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
        if (taskmgr != NULL) {
                result = isc_task_create(taskmgr, &cleaner->task, 0);
                if (result != ISC_R_SUCCESS) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "isc_task_create() failed: %s",
+                       UNEXPECTED_ERROR("isc_task_create() failed: %s",
                                         isc_result_totext(result));
                        result = ISC_R_UNEXPECTED;
                        goto cleanup_iterator;
@@ -534,8 +533,7 @@ begin_cleaning(cache_cleaner_t *cleaner) {
                 * so there is nothing to be cleaned.
                 */
                if (result != ISC_R_NOMORE && cleaner->iterator != NULL) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "cache cleaner: "
+                       UNEXPECTED_ERROR("cache cleaner: "
                                         "dns_dbiterator_first() failed: %s",
                                         isc_result_totext(result));
                        dns_dbiterator_destroy(&cleaner->iterator);
@@ -674,10 +672,8 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
 
                result = dns_dbiterator_current(cleaner->iterator, &node, NULL);
                if (result != ISC_R_SUCCESS) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "cache cleaner: "
-                                        "dns_dbiterator_current() "
-                                        "failed: %s",
+                       UNEXPECTED_ERROR("cache cleaner: "
+                                        "dns_dbiterator_current() failed: %s",
                                         isc_result_totext(result));
 
                        end_cleaning(cleaner, event);
@@ -703,8 +699,7 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
                         * keep trying to clean it, otherwise stop cleaning.
                         */
                        if (result != ISC_R_NOMORE) {
-                               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                                "cache cleaner: "
+                               UNEXPECTED_ERROR("cache cleaner: "
                                                 "dns_dbiterator_next() "
                                                 "failed: %s",
                                                 isc_result_totext(result));
@@ -779,8 +774,7 @@ dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) {
                 */
                result = dns_db_expirenode(cache->db, node, now);
                if (result != ISC_R_SUCCESS) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "cache cleaner: dns_db_expirenode() "
+                       UNEXPECTED_ERROR("cache cleaner: dns_db_expirenode() "
                                         "failed: %s",
                                         isc_result_totext(result));
                        /*

diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 74d4689fee0614d3125ed89d68ded7d075880e69..1ec38b85e7e465125c2eadc172ccf018955c9455 100644 (file)
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -176,8 +176,7 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep) {
                {
                        ISC_LIST_UNLINK(diff->tuples, ot, link);
                        if ((*tuplep)->op == ot->op) {
-                               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                                "unexpected non-minimal diff");
+                               UNEXPECTED_ERROR("unexpected non-minimal diff");
                        } else {
                                dns_difftuple_free(tuplep);
                        }

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index ff8e37d69b271290bfec79688cf31742a4848290..54467dd18f74bb1f2f8b6300a1251f635a33c9b2 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -168,7 +168,7 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx,
 freenode:
        dns_db_detachnode(db, &node);
 nonode:
-       UNEXPECTED_ERROR(__FILE__, __LINE__, "missing SOA");
+       UNEXPECTED_ERROR("missing SOA");
        return (result);
 }
 

diff --git a/lib/dns/master.c b/lib/dns/master.c
index da2c1ee7358b8bcf24f47475122228a67ce27b3a..b433f146c86f5ae4b87f228b0a813145b14df450 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -445,8 +445,7 @@ loadctx_destroy(dns_loadctx_t *lctx) {
        if (lctx->f != NULL) {
                isc_result_t result = isc_stdio_close(lctx->f);
                if (result != ISC_R_SUCCESS) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "isc_stdio_close() failed: %s",
+                       UNEXPECTED_ERROR("isc_stdio_close() failed: %s",
                                         isc_result_totext(result));
                }
        }
@@ -1281,8 +1280,7 @@ load_text(dns_loadctx_t *lctx) {
                                }
                                dump_time = (isc_stdtime_t)dump_time64;
                                if (dump_time != dump_time64) {
-                                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                                        "%s: %s:%lu: $DATE "
+                                       UNEXPECTED_ERROR("%s: %s:%lu: $DATE "
                                                         "outside epoch",
                                                         "dns_master_load",
                                                         source, line);
@@ -1290,8 +1288,7 @@ load_text(dns_loadctx_t *lctx) {
                                        goto insist_and_cleanup;
                                }
                                if (dump_time > current_time) {
-                                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                                        "%s: %s:%lu: "
+                                       UNEXPECTED_ERROR("%s: %s:%lu: "
                                                         "$DATE in future, "
                                                         "using current date",
                                                         "dns_master_load",
@@ -1570,8 +1567,7 @@ load_text(dns_loadctx_t *lctx) {
                                ictx->drop = false;
                        }
                } else {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "%s:%lu: isc_lex_gettoken() returned "
+                       UNEXPECTED_ERROR("%s:%lu: isc_lex_gettoken() returned "
                                         "unexpected token type (%d)",
                                         source, line, token.type);
                        result = ISC_R_UNEXPECTED;
@@ -1663,8 +1659,7 @@ load_text(dns_loadctx_t *lctx) {
                }
 
                if (token.type != isc_tokentype_string) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "isc_lex_gettoken() returned "
+                       UNEXPECTED_ERROR("isc_lex_gettoken() returned "
                                         "unexpected token type");
                        result = ISC_R_UNEXPECTED;
                        if (MANYERRS(lctx, result)) {
@@ -1685,8 +1680,7 @@ load_text(dns_loadctx_t *lctx) {
                }
 
                if (token.type != isc_tokentype_string) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "isc_lex_gettoken() returned "
+                       UNEXPECTED_ERROR("isc_lex_gettoken() returned "
                                         "unexpected token type");
                        result = ISC_R_UNEXPECTED;
                        if (MANYERRS(lctx, result)) {
@@ -2273,8 +2267,7 @@ load_header(dns_loadctx_t *lctx) {
 
        result = isc_stdio_read(data, 1, commonlen, lctx->f, NULL);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "isc_stdio_read failed: %s",
+               UNEXPECTED_ERROR("isc_stdio_read failed: %s",
                                 isc_result_totext(result));
                return (result);
        }
@@ -2306,8 +2299,7 @@ load_header(dns_loadctx_t *lctx) {
 
        result = isc_stdio_read(data + commonlen, 1, remainder, lctx->f, NULL);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "isc_stdio_read failed: %s",
+               UNEXPECTED_ERROR("isc_stdio_read failed: %s",
                                 isc_result_totext(result));
                return (result);
        }
@@ -2332,8 +2324,7 @@ openfile_raw(dns_loadctx_t *lctx, const char *master_file) {
 
        result = isc_stdio_open(master_file, "rb", &lctx->f);
        if (result != ISC_R_SUCCESS && result != ISC_R_FILENOTFOUND) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "isc_stdio_open() failed: %s",
+               UNEXPECTED_ERROR("isc_stdio_open() failed: %s",
                                 isc_result_totext(result));
        }
 

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 72ef134f276c5982c5214a5a39b688d64dc8a773..7ab6021acaf2044dcfcf7c77311d8b0fe51eee46 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -857,8 +857,7 @@ dns_rdataset_totext(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
        isc_result_t result;
        result = totext_ctx_init(&dns_master_style_debug, NULL, &ctx);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "could not set master file style");
+               UNEXPECTED_ERROR("could not set master file style");
                return (ISC_R_UNEXPECTED);
        }
 
@@ -890,8 +889,7 @@ dns_master_rdatasettotext(const dns_name_t *owner_name,
        isc_result_t result;
        result = totext_ctx_init(style, indent, &ctx);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "could not set master file style");
+               UNEXPECTED_ERROR("could not set master file style");
                return (ISC_R_UNEXPECTED);
        }
 
@@ -907,8 +905,7 @@ dns_master_questiontotext(const dns_name_t *owner_name,
        isc_result_t result;
        result = totext_ctx_init(style, NULL, &ctx);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "could not set master file style");
+               UNEXPECTED_ERROR("could not set master file style");
                return (ISC_R_UNEXPECTED);
        }
 
@@ -983,8 +980,7 @@ dump_rdataset(isc_mem_t *mctx, const dns_name_t *name, dns_rdataset_t *rdataset,
        result = isc_stdio_write(r.base, 1, (size_t)r.length, f, NULL);
 
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "master file write failed: %s",
+               UNEXPECTED_ERROR("master file write failed: %s",
                                 isc_result_totext(result));
                return (result);
        }
@@ -1266,8 +1262,7 @@ restart:
        result = isc_stdio_write(r.base, 1, (size_t)r.length, f, NULL);
 
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "raw master file write failed: %s",
+               UNEXPECTED_ERROR("raw master file write failed: %s",
                                 isc_result_totext(result));
                return (result);
        }
@@ -1582,8 +1577,7 @@ dumpctx_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *version,
 
        result = totext_ctx_init(style, NULL, &dctx->tctx);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "could not set master file style");
+               UNEXPECTED_ERROR("could not set master file style");
                goto cleanup;
        }
 
@@ -1973,8 +1967,7 @@ dns_master_dumpnodetostream(isc_mem_t *mctx, dns_db_t *db,
 
        result = totext_ctx_init(style, NULL, &ctx);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "could not set master file style");
+               UNEXPECTED_ERROR("could not set master file style");
                return (ISC_R_UNEXPECTED);
        }
 

diff --git a/lib/dns/name.c b/lib/dns/name.c
index d6158483211d0b11e2e82ce6461e14aa83d5b4fe..b8a9ec46f0a8a2dd9468ae8b7fe14c9636f907f1 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1058,8 +1058,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
                        }
                        break;
                default:
-                       FATAL_ERROR(__FILE__, __LINE__, "Unexpected state %d",
-                                   state);
+                       FATAL_ERROR("Unexpected state %d", state);
                        /* Does not return. */
                }
        }
@@ -1279,8 +1278,7 @@ dns_name_totext2(const dns_name_t *name, unsigned int options,
                                count--;
                        }
                } else {
-                       FATAL_ERROR(__FILE__, __LINE__,
-                                   "Unexpected label type %02x", count);
+                       FATAL_ERROR("Unexpected label type %02x", count);
                        UNREACHABLE();
                }
 
@@ -1402,8 +1400,7 @@ dns_name_tofilenametext(const dns_name_t *name, bool omit_final_dot,
                                count--;
                        }
                } else {
-                       FATAL_ERROR(__FILE__, __LINE__,
-                                   "Unexpected label type %02x", count);
+                       FATAL_ERROR("Unexpected label type %02x", count);
                        UNREACHABLE();
                }
 
@@ -1659,8 +1656,7 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t dctx,
                        state = fw_start;
                        break;
                default:
-                       FATAL_ERROR(__FILE__, __LINE__, "Unknown state %d",
-                                   state);
+                       FATAL_ERROR("Unknown state %d", state);
                        /* Does not return. */
                }
        }

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index e9a0566464e8719d7602af62497bbd012628505d..b35ad05cc376fcbc146f3209fb9af3639f762ac0 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -4426,7 +4426,7 @@ zone_findzonecut(dns_db_t *db, const dns_name_t *name, unsigned int options,
        UNUSED(rdataset);
        UNUSED(sigrdataset);
 
-       FATAL_ERROR(__FILE__, __LINE__, "zone_findzonecut() called!");
+       FATAL_ERROR("zone_findzonecut() called!");
 
        UNREACHABLE();
        return (ISC_R_NOTIMPLEMENTED);

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 756878729df814e6ea11c4b341b8df3c966cf2e7..5d1e7291edcad5a0986fa9d05d650c3e3816317e 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4880,8 +4880,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
 
        if (!dns_name_issubdomain(fctx->name, fctx->domain)) {
                dns_name_format(fctx->domain, buf, sizeof(buf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "'%s' is not subdomain of '%s'", fctx->info,
+               UNEXPECTED_ERROR("'%s' is not subdomain of '%s'", fctx->info,
                                 buf);
                result = ISC_R_UNEXPECTED;
                goto cleanup_fcount;
@@ -4897,8 +4896,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
                         res->query_timeout % 1000 * 1000000);
        iresult = isc_time_nowplusinterval(&fctx->expires, &interval);
        if (iresult != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "isc_time_nowplusinterval: %s",
+               UNEXPECTED_ERROR("isc_time_nowplusinterval: %s",
                                 isc_result_totext(iresult));
                result = ISC_R_UNEXPECTED;
                goto cleanup_qmessage;
@@ -4925,8 +4923,7 @@ fctx_create(dns_resolver_t *res, const dns_name_t *name, dns_rdatatype_t type,
                iresult = isc_time_nowplusinterval(&fctx->expires_try_stale,
                                                   &interval);
                if (iresult != ISC_R_SUCCESS) {
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "isc_time_nowplusinterval: %s",
+                       UNEXPECTED_ERROR("isc_time_nowplusinterval: %s",
                                         isc_result_totext(iresult));
                        result = ISC_R_UNEXPECTED;
                        goto cleanup_timer;

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 535e9e0872a89c1f81a4902bc1b46ddb0f6ddb12..8992c99cdcf353db2b51c958b676dfcf4eec7294 100644 (file)
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -207,7 +207,7 @@ dns_rpz_type2str(dns_rpz_type_t type) {
        case DNS_RPZ_TYPE_BAD:
                break;
        }
-       FATAL_ERROR(__FILE__, __LINE__, "impossible rpz type %d", type);
+       FATAL_ERROR("impossible rpz type %d", type);
        return ("impossible");
 }
 

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 5a8d1c8072efa496f8e07fcec8f5e8410e82d50d..22f43f757a1ed6a5d6bafe3d5fa83b0e6fbb1f7c 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -138,8 +138,7 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, const char *name,
        view->zonetable = NULL;
        result = dns_zt_create(mctx, rdclass, &view->zonetable);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "dns_zt_create() failed: %s",
+               UNEXPECTED_ERROR("dns_zt_create() failed: %s",
                                 isc_result_totext(result));
                result = ISC_R_UNEXPECTED;
                goto cleanup_mutex;
@@ -147,8 +146,7 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass, const char *name,
 
        result = dns_fwdtable_create(mctx, &view->fwdtable);
        if (result != ISC_R_SUCCESS) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "dns_fwdtable_create() failed: %s",
+               UNEXPECTED_ERROR("dns_fwdtable_create() failed: %s",
                                 isc_result_totext(result));
                result = ISC_R_UNEXPECTED;
                goto cleanup_zt;

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 7e7355598c9a83f7bfc648684f65c0336e6d1c50..35b345526628994274f1603aa7a431dd711845c0 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -5240,8 +5240,7 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
                break;
 
        default:
-               UNEXPECTED_ERROR(__FILE__, __LINE__, "unexpected zone type %d",
-                                zone->type);
+               UNEXPECTED_ERROR("unexpected zone type %d", zone->type);
                result = ISC_R_UNEXPECTED;
                goto cleanup;
        }

diff --git a/lib/isc/condition.c b/lib/isc/condition.c
index 0573c37e2f4cd8b3ba6eac15dbb4269fe580fc9c..c81f3213b50548e8aab53bbded0aeda888eff681 100644 (file)
--- a/lib/isc/condition.c
+++ b/lib/isc/condition.c
@@ -62,7 +62,6 @@ isc__condition_waituntil(pthread_cond_t *c, pthread_mutex_t *m, isc_time_t *t) {
        } while (presult == EINTR);
 
        strerror_r(presult, strbuf, sizeof(strbuf));
-       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                        "pthread_cond_timedwait() returned %s", strbuf);
+       UNEXPECTED_ERROR("pthread_cond_timedwait() returned %s", strbuf);
        return (ISC_R_UNEXPECTED);
 }

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 9f7098c8c9303d1f4ed4c5076e1bee580dd71cf5..b93ddec2a448021ae21fe31e26d3b2e75625d96f 100644 (file)
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -315,10 +315,10 @@ mock_assert(const int result, const char *const expression,
 #include <isc/error.h> /* Contractual promise. */
 #include <isc/strerr.h> /* for ISC_STRERRORSIZE */
 
-/*% Unexpected Error */
-#define UNEXPECTED_ERROR isc_error_unexpected
-/*% Fatal Error */
-#define FATAL_ERROR isc_error_fatal
+#define UNEXPECTED_ERROR(...) \
+       isc_error_unexpected(__FILE__, __LINE__, __VA_ARGS__)
+
+#define FATAL_ERROR(...) isc_error_fatal(__FILE__, __LINE__, __VA_ARGS__)
 
 #ifdef UNIT_TESTING
 
@@ -329,7 +329,6 @@ mock_assert(const int result, const char *const expression,
 
 #else /* UNIT_TESTING */
 
-/*% Runtime Check */
 #define RUNTIME_CHECK(cond) ISC_ERROR_RUNTIMECHECK(cond)
 
 #endif /* UNIT_TESTING */

diff --git a/lib/isc/interfaceiter.c b/lib/isc/interfaceiter.c
index abb16f4b6da0683dc1300ae059fed76e12ebe080..566c5bd4651b8bf15f06db73825a2a33933b89fd 100644 (file)
--- a/lib/isc/interfaceiter.c
+++ b/lib/isc/interfaceiter.c
@@ -202,8 +202,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 
        if (getifaddrs(&iter->ifaddrs) < 0) {
                strerror_r(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "getting interface addresses: getifaddrs: %s",
+               UNEXPECTED_ERROR("getting interface addresses: getifaddrs: %s",
                                 strbuf);
                result = ISC_R_UNEXPECTED;
                goto failure;

diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index 50218b78b398779cb5e79a9a2ee2be52a4df3200..63b9b79d343d174c77297dd0bb41c364272ca753 100644 (file)
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -902,8 +902,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
                        remaining--;
                        break;
                default:
-                       FATAL_ERROR(__FILE__, __LINE__, "Unexpected state %d",
-                                   state);
+                       FATAL_ERROR("Unexpected state %d", state);
                }
        } while (!done);
 

diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 39ce4cec1775ce1a15df937947a645f81e06597d..17040c7c9be7b464affe667381f25e15c5ed3fdc 100644 (file)
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1249,10 +1249,9 @@ isc__mempool_destroy(isc_mempool_t **restrict mpctxp FLARG) {
 #endif
 
        if (mpctx->allocated > 0) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "isc_mempool_destroy(): mempool %s "
-                                "leaked memory",
-                                mpctx->name);
+               UNEXPECTED_ERROR(
+                       "isc_mempool_destroy(): mempool %s leaked memory",
+                       mpctx->name);
        }
        REQUIRE(mpctx->allocated == 0);
 

diff --git a/lib/isc/net.c b/lib/isc/net.c
index be75fb480bd8aed585b2862b0434d30e4783e863..4b84f2c07288ced08e758109aaa66c96c8496a81 100644 (file)
--- a/lib/isc/net.c
+++ b/lib/isc/net.c
@@ -142,8 +142,7 @@ try_proto(int domain) {
                        return (ISC_R_NOTFOUND);
                default:
                        strerror_r(errno, strbuf, sizeof(strbuf));
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "socket() failed: %s", strbuf);
+                       UNEXPECTED_ERROR("socket() failed: %s", strbuf);
                        return (ISC_R_UNEXPECTED);
                }
        }
@@ -241,8 +240,7 @@ try_ipv6only(void) {
        s = socket(PF_INET6, SOCK_STREAM, 0);
        if (s == -1) {
                strerror_r(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__, "socket() failed: %s",
-                                strbuf);
+               UNEXPECTED_ERROR("socket() failed: %s", strbuf);
                ipv6only_result = ISC_R_UNEXPECTED;
                return;
        }
@@ -259,8 +257,7 @@ try_ipv6only(void) {
        s = socket(PF_INET6, SOCK_DGRAM, 0);
        if (s == -1) {
                strerror_r(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__, "socket() failed: %s",
-                                strbuf);
+               UNEXPECTED_ERROR("socket() failed: %s", strbuf);
                ipv6only_result = ISC_R_UNEXPECTED;
                return;
        }
@@ -302,8 +299,7 @@ try_ipv6pktinfo(void) {
        s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
        if (s == -1) {
                strerror_r(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__, "socket() failed: %s",
-                                strbuf);
+               UNEXPECTED_ERROR("socket() failed: %s", strbuf);
                ipv6pktinfo_result = ISC_R_UNEXPECTED;
                return;
        }
@@ -422,13 +418,12 @@ make_nonblock(int fd) {
 
        if (ret == -1) {
                strerror_r(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
 #ifdef USE_FIONBIO_IOCTL
-                                "ioctl(%d, FIONBIO, &on): %s", fd,
+               UNEXPECTED_ERROR("ioctl(%d, FIONBIO, &on): %s", fd, strbuf);
 #else  /* ifdef USE_FIONBIO_IOCTL */
-                                "fcntl(%d, F_SETFL, %d): %s", fd, flags,
-#endif /* ifdef USE_FIONBIO_IOCTL */
+               UNEXPECTED_ERROR("fcntl(%d, F_SETFL, %d): %s", fd, flags,
                                 strbuf);
+#endif /* ifdef USE_FIONBIO_IOCTL */
 
                return (ISC_R_UNEXPECTED);
        }
@@ -509,7 +504,6 @@ cmsgsend(int s, int level, int type, struct addrinfo *res) {
 
        if (sendmsg(s, &msg, 0) < 0) {
                int debug = ISC_LOG_DEBUG(10);
-               const char *typestr;
                switch (errno) {
 #ifdef ENOPROTOOPT
                case ENOPROTOOPT:
@@ -529,11 +523,10 @@ cmsgsend(int s, int level, int type, struct addrinfo *res) {
                                      ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(10),
                                      "sendmsg: %s", strbuf);
                } else {
-                       typestr = (type == IP_TOS) ? "IP_TOS" : "IPV6_TCLASS";
-                       UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                        "probing "
-                                        "sendmsg() with %s=%02x failed: %s",
-                                        typestr, dscp, strbuf);
+                       UNEXPECTED_ERROR(
+                               "probing sendmsg() with %s=%02x failed: %s",
+                               (type == IP_TOS) ? "IP_TOS" : "IPV6_TCLASS",
+                               dscp, strbuf);
                }
                return (false);
        }

diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index ec3afa74d0e033d7012ee79d741ffe7feecf8b2b..8f1956e5c4e36c9ea27a36a01b1b095411a28aaf 100644 (file)
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -224,8 +224,7 @@ isc___rwlock_init(isc__rwlock_t *rwl, unsigned int read_quota,
        rwl->readers_waiting = 0;
        atomic_init(&rwl->write_granted, 0);
        if (read_quota != 0) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "read quota is not supported");
+               UNEXPECTED_ERROR("read quota is not supported");
        }
        if (write_quota == 0) {
                write_quota = RWLOCK_DEFAULT_WRITE_QUOTA;

diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index 85b3d284394ce7a9f18a7e3651e9afd7d3a58df5..038e3ec7c42273e8a5f4148017d698ce5903b6a5 100644 (file)
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -234,8 +234,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, bool address_only) {
                p = ntohs(sockaddr->type.sin6.sin6_port);
                break;
        default:
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "unknown address family: %d",
+               UNEXPECTED_ERROR("unknown address family: %d",
                                 (int)sockaddr->type.sa.sa_family);
                s = (const unsigned char *)&sockaddr->type;
                length = sockaddr->length;
@@ -341,7 +340,7 @@ isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) {
        case AF_INET6:
                return (PF_INET6);
        default:
-               FATAL_ERROR(__FILE__, __LINE__, "unknown address family: %d",
+               FATAL_ERROR("unknown address family: %d",
                            (int)sockaddr->type.sa.sa_family);
        }
 #endif /* if (AF_INET == PF_INET && AF_INET6 == PF_INET6) */
@@ -380,7 +379,7 @@ isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port) {
                sockaddr->type.sin6.sin6_port = htons(port);
                break;
        default:
-               FATAL_ERROR(__FILE__, __LINE__, "unknown address family: %d",
+               FATAL_ERROR("unknown address family: %d",
                            (int)sockaddr->type.sa.sa_family);
        }
 }
@@ -397,7 +396,7 @@ isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) {
                port = ntohs(sockaddr->type.sin6.sin6_port);
                break;
        default:
-               FATAL_ERROR(__FILE__, __LINE__, "unknown address family: %d",
+               FATAL_ERROR("unknown address family: %d",
                            (int)sockaddr->type.sa.sa_family);
        }
 

diff --git a/lib/isc/time.c b/lib/isc/time.c
index 26077befe87ae7b902cb662597aecda3701d424d..4c01132adb8e9025cc45bda9858dd2befdc18d79 100644 (file)
--- a/lib/isc/time.c
+++ b/lib/isc/time.c
@@ -94,7 +94,7 @@ time_now(isc_time_t *t, clockid_t clock) {
        if (clock_gettime(clock, &ts) == -1) {
                char strbuf[ISC_STRERRORSIZE];
                strerror_r(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
+               UNEXPECTED_ERROR("%s", strbuf);
                return (ISC_R_UNEXPECTED);
        }
 
@@ -138,7 +138,7 @@ isc_time_nowplusinterval(isc_time_t *t, const isc_interval_t *i) {
        if (clock_gettime(CLOCKSOURCE, &ts) == -1) {
                char strbuf[ISC_STRERRORSIZE];
                strerror_r(errno, strbuf, sizeof(strbuf));
-               UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", strbuf);
+               UNEXPECTED_ERROR("%s", strbuf);
                return (ISC_R_UNEXPECTED);
        }
 

diff --git a/lib/isc/tls.c b/lib/isc/tls.c
index d7302c214343fe2ae68994635fce4ef0f699a316..f38182a0dbfd8b92f828e64b3fff637f3586ea79 100644 (file)
--- a/lib/isc/tls.c
+++ b/lib/isc/tls.c
@@ -209,8 +209,7 @@ isc__tls_initialize(void) {
 
        /* Protect ourselves against unseeded PRNG */
        if (RAND_status() != 1) {
-               FATAL_ERROR(__FILE__, __LINE__,
-                           "OpenSSL pseudorandom number generator "
+               FATAL_ERROR("OpenSSL pseudorandom number generator "
                            "cannot be initialized (see the `PRNG not "
                            "seeded' message in the OpenSSL FAQ)");
        }

diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c
index a17f1f35f71d151bf300004cc637aabda971bcc5..dce611b92d9888d09ed09192dfdbede37aa3f344 100644 (file)
--- a/lib/ns/interfacemgr.c
+++ b/lib/ns/interfacemgr.c
@@ -1319,8 +1319,7 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) {
                continue;
        }
        if (result != ISC_R_NOMORE) {
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "interface iteration failed: %s",
+               UNEXPECTED_ERROR("interface iteration failed: %s",
                                 isc_result_totext(result));
        } else {
                result = ((tried_listening && all_addresses_in_use)

diff --git a/lib/ns/sortlist.c b/lib/ns/sortlist.c
index 3e6a3517e9001688123ce681a95910a3acc39802..2aada90b196edb996ad7a712f514afca0d2f3fa6 100644 (file)
--- a/lib/ns/sortlist.c
+++ b/lib/ns/sortlist.c
@@ -173,10 +173,9 @@ ns_sortlist_byaddrsetup(dns_acl_t *sortlist_acl, dns_aclenv_t *env,
                *orderp = NULL;
                break;
        default:
-               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                "unexpected return from ns_sortlist_setup(): "
-                                "%d",
-                                sortlisttype);
+               UNEXPECTED_ERROR(
+                       "unexpected return from ns_sortlist_setup(): %d",
+                       sortlisttype);
                break;
        }
 }

diff --git a/lib/ns/update.c b/lib/ns/update.c
index ad7c561c9d00a81778ff37776d30b39b6803188f..51cedf60e3284f915cea1c966b66d4377840fca9 100644 (file)
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -2745,10 +2745,9 @@ update_action(isc_task_t *task, isc_event_t *event) {
                        /* "temp<rr.name, rr.type> += rr;" */
                        result = temp_append(&temp, name, &rdata);
                        if (result != ISC_R_SUCCESS) {
-                               UNEXPECTED_ERROR(__FILE__, __LINE__,
-                                                "temp entry creation failed: "
-                                                "%s",
-                                                isc_result_totext(result));
+                               UNEXPECTED_ERROR(
+                                       "temp entry creation failed: %s",
+                                       isc_result_totext(result));
                                FAIL(ISC_R_UNEXPECTED);
                        }
                } else {