From f148f53794956f491f6527430a93c2c8d884a212 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 22 Jan 2009 05:39:29 +0000 Subject: [PATCH] 2536. [cleanup] Silence some warnings when -Werror=format-security is specified. [RT #19083] --- CHANGES | 3 ++ bin/tests/db/t_db.c | 52 ++++++++++++++++----------------- bin/tests/dst/t_dst.c | 6 ++-- bin/tests/master/t_master.c | 24 +++++++-------- bin/tests/mem/t_mem.c | 4 +-- bin/tests/names/t_names.c | 58 ++++++++++++++++++------------------- bin/tests/rbt/t_rbt.c | 28 +++++++++--------- bin/tests/tasks/t_tasks.c | 22 +++++++------- bin/tests/timers/t_timers.c | 12 ++++---- lib/isc/mem.c | 8 ++--- lib/isc/timer.c | 6 ++-- lib/isc/unix/socket.c | 8 ++--- 12 files changed, 117 insertions(+), 114 deletions(-) diff --git a/CHANGES b/CHANGES index 78d0b7ed92..9a44debdfa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +2536. [cleanup] Silence some warnings when -Werror=format-security is + specified. [RT #19083] + 2535. [bug] dig +showsearh and +trace interacted badly. [RT #19091] 2534. [func] Check NAPTR records regular expressions and diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c index 727c49ecd5..e4d9b3f4e7 100644 --- a/bin/tests/db/t_db.c +++ b/bin/tests/db/t_db.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_db.c,v 1.36 2007/06/19 23:46:59 tbox Exp $ */ +/* $Id: t_db.c,v 1.37 2009/01/22 05:39:28 marka Exp $ */ #include @@ -265,7 +265,7 @@ static void t1(void) { int result; - t_assert("dns_db_load", 1, T_REQUIRED, a1); + t_assert("dns_db_load", 1, T_REQUIRED, "%s", a1); result = t_eval("dns_db_load_data", t_dns_db_load, 9); t_result(result); } @@ -451,7 +451,7 @@ static void t2(void) { int result; - t_assert("dns_db_iscache", 2, T_REQUIRED, a2); + t_assert("dns_db_iscache", 2, T_REQUIRED, "%s", a2); result = test_dns_db_zc_x("dns_db_iscache_1_data", dns_dbtype_cache, dns_db_iscache, ISC_TRUE); t_result(result); @@ -467,7 +467,7 @@ static void t3(void) { int result; - t_assert("dns_db_iscache", 3, T_REQUIRED, a3); + t_assert("dns_db_iscache", 3, T_REQUIRED, "%s", a3); result = test_dns_db_zc_x("dns_db_iscache_2_data", dns_dbtype_zone, dns_db_iscache, ISC_FALSE); t_result(result); @@ -483,7 +483,7 @@ static void t4(void) { int result; - t_assert("dns_db_iszone", 4, T_REQUIRED, a4); + t_assert("dns_db_iszone", 4, T_REQUIRED, "%s", a4); result = test_dns_db_zc_x("dns_db_iszone_1_data", dns_dbtype_zone, dns_db_iszone, ISC_TRUE); t_result(result); @@ -498,7 +498,7 @@ static void t5(void) { int result; - t_assert("dns_db_iszone", 5, T_REQUIRED, a5); + t_assert("dns_db_iszone", 5, T_REQUIRED, "%s", a5); result = test_dns_db_zc_x("dns_db_iszone_2_data", dns_dbtype_cache, dns_db_iszone, ISC_FALSE); t_result(result); @@ -618,7 +618,7 @@ static void t6(void) { int result; - t_assert("dns_db_origin", 6, T_REQUIRED, a6); + t_assert("dns_db_origin", 6, T_REQUIRED, "%s", a6); result = t_eval("dns_db_origin_data", t_dns_db_origin, 2); t_result(result); } @@ -732,7 +732,7 @@ static void t7(void) { int result; - t_assert("dns_db_class", 7, T_REQUIRED, a7); + t_assert("dns_db_class", 7, T_REQUIRED, "%s", a7); result = t_eval("dns_db_class_data", t_dns_db_class, 2); t_result(result); } @@ -1005,7 +1005,7 @@ static void t8(void) { int result; - t_assert("dns_db_currentversion", 8, T_REQUIRED, a8); + t_assert("dns_db_currentversion", 8, T_REQUIRED, "%s", a8); result = t_eval("dns_db_currentversion_data", t_dns_db_currentversion, 7); t_result(result); @@ -1323,7 +1323,7 @@ static void t9(void) { int result; - t_assert("dns_db_newversion", 9, T_REQUIRED, a9); + t_assert("dns_db_newversion", 9, T_REQUIRED, "%s", a9); result = t_eval("dns_db_newversion_data", t_dns_db_newversion, 7); t_result(result); } @@ -1734,7 +1734,7 @@ static void t10(void) { int result; - t_assert("dns_db_closeversion", 10, T_REQUIRED, a10); + t_assert("dns_db_closeversion", 10, T_REQUIRED, "%s", a10); result = t_eval("dns_db_closeversion_1_data", t_dns_db_closeversion_1, 9); t_result(result); @@ -2209,7 +2209,7 @@ static void t11(void) { int result; - t_assert("dns_db_closeversion", 11, T_REQUIRED, a11); + t_assert("dns_db_closeversion", 11, T_REQUIRED, "%s", a11); result = t_eval("dns_db_closeversion_2_data", t_dns_db_closeversion_2, 9); t_result(result); @@ -2414,7 +2414,7 @@ static void t12(void) { int result; - t_assert("dns_db_expirenode", 12, T_REQUIRED, a12); + t_assert("dns_db_expirenode", 12, T_REQUIRED, "%s", a12); result = t_eval("dns_db_expirenode_data", t_dns_db_expirenode, 8); t_result(result); } @@ -2580,7 +2580,7 @@ static void t13(void) { int result; - t_assert("dns_db_findnode", 13, T_REQUIRED, a13); + t_assert("dns_db_findnode", 13, T_REQUIRED, "%s", a13); result = t_eval("dns_db_findnode_1_data", t_dns_db_findnode_1, 8); t_result(result); } @@ -2778,7 +2778,7 @@ static void t14(void) { int result; - t_assert("dns_db_findnode", 14, T_REQUIRED, a14); + t_assert("dns_db_findnode", 14, T_REQUIRED, "%s", a14); result = t_eval("dns_db_findnode_2_data", t_dns_db_findnode_2, 6); t_result(result); } @@ -2977,7 +2977,7 @@ static void t15(void) { int result; - t_assert("dns_db_find", 15, T_REQUIRED, a15); + t_assert("dns_db_find", 15, T_REQUIRED, "%s", a15); result = t_eval("dns_db_find_1_data", t_dns_db_find_x, 10); t_result(result); } @@ -2993,7 +2993,7 @@ static void t16(void) { int result; - t_assert("dns_db_find", 16, T_REQUIRED, a16); + t_assert("dns_db_find", 16, T_REQUIRED, "%s", a16); result = t_eval("dns_db_find_2_data", t_dns_db_find_x, 10); t_result(result); } @@ -3006,7 +3006,7 @@ static void t17(void) { int result; - t_assert("dns_db_find", 17, T_REQUIRED, a17); + t_assert("dns_db_find", 17, T_REQUIRED, "%s", a17); result = t_eval("dns_db_find_3_data", t_dns_db_find_x, 10); t_result(result); } @@ -3019,7 +3019,7 @@ static void t18(void) { int result; - t_assert("dns_db_find", 18, T_REQUIRED, a18); + t_assert("dns_db_find", 18, T_REQUIRED, "%s", a18); result = t_eval("dns_db_find_4_data", t_dns_db_find_x, 10); t_result(result); } @@ -3032,7 +3032,7 @@ static void t19(void) { int result; - t_assert("dns_db_find", 19, T_REQUIRED, a19); + t_assert("dns_db_find", 19, T_REQUIRED, "%s", a19); result = t_eval("dns_db_find_5_data", t_dns_db_find_x, 10); t_result(result); } @@ -3045,7 +3045,7 @@ static void t20(void) { int result; - t_assert("dns_db_find", 20, T_REQUIRED, a20); + t_assert("dns_db_find", 20, T_REQUIRED, "%s", a20); result = t_eval("dns_db_find_6_data", t_dns_db_find_x, 10); t_result(result); } @@ -3058,7 +3058,7 @@ static void t21(void) { int result; - t_assert("dns_db_find", 21, T_REQUIRED, a21); + t_assert("dns_db_find", 21, T_REQUIRED, "%s", a21); result = t_eval("dns_db_find_7_data", t_dns_db_find_x, 10); t_result(result); } @@ -3071,7 +3071,7 @@ static void t22(void) { int result; - t_assert("dns_db_find", 22, T_REQUIRED, a22); + t_assert("dns_db_find", 22, T_REQUIRED, "%s", a22); result = t_eval("dns_db_find_8_data", t_dns_db_find_x, 10); t_result(result); } @@ -3085,7 +3085,7 @@ static void t23(void) { int result; - t_assert("dns_db_find", 23, T_REQUIRED, a23); + t_assert("dns_db_find", 23, T_REQUIRED, "%s", a23); result = t_eval("dns_db_find_9_data", t_dns_db_find_x, 10); t_result(result); } @@ -3098,7 +3098,7 @@ static void t24(void) { int result; - t_assert("dns_db_find", 24, T_REQUIRED, a24); + t_assert("dns_db_find", 24, T_REQUIRED, "%s", a24); result = t_eval("dns_db_find_10_data", t_dns_db_find_x, 10); t_result(result); } @@ -3111,7 +3111,7 @@ static void t25(void) { int result; - t_assert("dns_db_load", 25, T_REQUIRED, a25); + t_assert("dns_db_load", 25, T_REQUIRED, "%s", a25); result = t_eval("dns_db_load_soa_not_top", t_dns_db_load, 9); t_result(result); } diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c index d5e5db7407..0a3a49b55f 100644 --- a/bin/tests/dst/t_dst.c +++ b/bin/tests/dst/t_dst.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_dst.c,v 1.55 2008/01/12 23:47:13 tbox Exp $ */ +/* $Id: t_dst.c,v 1.56 2009/01/22 05:39:28 marka Exp $ */ #include @@ -357,7 +357,7 @@ t1(void) { dns_name_t *name; isc_buffer_t b; - t_assert("dst", 1, T_REQUIRED, a1); + t_assert("dst", 1, T_REQUIRED, "%s", a1); nfails = 0; nprobs = 0; @@ -920,7 +920,7 @@ t2_vfy(char **av) { static void t2(void) { int result; - t_assert("dst", 2, T_REQUIRED, a2); + t_assert("dst", 2, T_REQUIRED, "%s", a2); result = t_eval("dst_2_data", t2_vfy, 6); t_result(result); } diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c index 469311415d..bccf024cf6 100644 --- a/bin/tests/master/t_master.c +++ b/bin/tests/master/t_master.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_master.c,v 1.36 2007/06/19 23:47:00 tbox Exp $ */ +/* $Id: t_master.c,v 1.37 2009/01/22 05:39:29 marka Exp $ */ #include @@ -185,7 +185,7 @@ static const char *a1 = "dns_master_loadfile loads a valid master file and " static void t1(void) { int result; - t_assert("dns_master_loadfile", 1, T_REQUIRED, a1); + t_assert("dns_master_loadfile", 1, T_REQUIRED, "%s", a1); result = test_master_x("dns_master_load_1_data"); t_result(result); } @@ -197,7 +197,7 @@ static const char *a2 = static void t2(void) { int result; - t_assert("dns_master_loadfile", 2, T_REQUIRED, a2); + t_assert("dns_master_loadfile", 2, T_REQUIRED, "%s", a2); result = test_master_x("dns_master_load_2_data"); t_result(result); } @@ -208,7 +208,7 @@ static const char *a3 = "dns_master_loadfile returns DNS_R_NOOWNER when the " static void t3() { int result; - t_assert("dns_master_loadfile", 3, T_REQUIRED, a3); + t_assert("dns_master_loadfile", 3, T_REQUIRED, "%s", a3); result = test_master_x("dns_master_load_3_data"); t_result(result); } @@ -220,7 +220,7 @@ static const char *a4 = "dns_master_loadfile accepts broken zone files " static void t4() { int result; - t_assert("dns_master_loadfile", 4, T_REQUIRED, a4); + t_assert("dns_master_loadfile", 4, T_REQUIRED, "%s", a4); result = test_master_x("dns_master_load_4_data"); t_result(result); } @@ -232,7 +232,7 @@ static void t5() { int result; - t_assert("dns_master_loadfile", 5, T_REQUIRED, a5); + t_assert("dns_master_loadfile", 5, T_REQUIRED, "%s", a5); result = test_master_x("dns_master_load_5_data"); t_result(result); @@ -246,7 +246,7 @@ static void t6() { int result; - t_assert("dns_master_loadfile", 6, T_REQUIRED, a6); + t_assert("dns_master_loadfile", 6, T_REQUIRED, "%s", a6); result = test_master_x("dns_master_load_6_data"); t_result(result); @@ -260,7 +260,7 @@ static void t7() { int result; - t_assert("dns_master_loadfile", 7, T_REQUIRED, a7); + t_assert("dns_master_loadfile", 7, T_REQUIRED, "%s", a7); result = test_master_x("dns_master_load_7_data"); t_result(result); @@ -273,7 +273,7 @@ static void t8() { int result; - t_assert("dns_master_loadfile", 8, T_REQUIRED, a8); + t_assert("dns_master_loadfile", 8, T_REQUIRED, "%s", a8); result = test_master_x("dns_master_load_8_data"); t_result(result); @@ -286,7 +286,7 @@ static void t9() { int result; - t_assert("dns_master_loadfile", 9, T_REQUIRED, a9); + t_assert("dns_master_loadfile", 9, T_REQUIRED, "%s", a9); result = test_master_x("dns_master_load_9_data"); t_result(result); @@ -299,7 +299,7 @@ static void t10() { int result; - t_assert("dns_master_loadfile", 10, T_REQUIRED, a10); + t_assert("dns_master_loadfile", 10, T_REQUIRED, "%s", a10); result = test_master_x("dns_master_load_10_data"); t_result(result); @@ -312,7 +312,7 @@ static void t11() { int result; - t_assert("dns_master_loadfile", 11, T_REQUIRED, a11); + t_assert("dns_master_loadfile", 11, T_REQUIRED, "%s", a11); result = test_master_x("dns_master_load_11_data"); t_result(result); diff --git a/bin/tests/mem/t_mem.c b/bin/tests/mem/t_mem.c index 7313637c0c..f901a37de3 100644 --- a/bin/tests/mem/t_mem.c +++ b/bin/tests/mem/t_mem.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_mem.c,v 1.13 2007/06/19 23:47:00 tbox Exp $ */ +/* $Id: t_mem.c,v 1.14 2009/01/22 05:39:29 marka Exp $ */ #include @@ -190,7 +190,7 @@ t1(void) { int rval; int result; - t_assert("mem", 1, T_REQUIRED, a1); + t_assert("mem", 1, T_REQUIRED, "%s", a1); rval = memtest(); diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c index 68ce53b859..a85c7efca6 100644 --- a/bin/tests/names/t_names.c +++ b/bin/tests/names/t_names.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_names.c,v 1.46 2008/01/18 23:46:57 tbox Exp $ */ +/* $Id: t_names.c,v 1.47 2009/01/22 05:39:29 marka Exp $ */ #include @@ -366,7 +366,7 @@ t_dns_name_init(void) { unsigned char offsets[1]; rval = 0; - t_assert("dns_name_init", 1, T_REQUIRED, a3); + t_assert("dns_name_init", 1, T_REQUIRED, "%s", a3); dns_name_init(&name, offsets); /* magic is hidden in name.c ... @@ -416,7 +416,7 @@ t_dns_name_invalidate(void) { dns_name_t name; unsigned char offsets[1]; - t_assert("dns_name_invalidate", 1, T_REQUIRED, a4); + t_assert("dns_name_invalidate", 1, T_REQUIRED, "%s", a4); rval = 0; dns_name_init(&name, offsets); @@ -470,7 +470,7 @@ t_dns_name_setbuffer(void) { dns_name_t name; isc_buffer_t buffer; - t_assert("dns_name_setbuffer", 1, T_REQUIRED, a5); + t_assert("dns_name_setbuffer", 1, T_REQUIRED, "%s", a5); isc_buffer_init(&buffer, junk, BUFLEN); dns_name_init(&name, NULL); @@ -494,7 +494,7 @@ t_dns_name_hasbuffer(void) { dns_name_t name; isc_buffer_t buffer; - t_assert("dns_name_hasbuffer", 1, T_REQUIRED, a6); + t_assert("dns_name_hasbuffer", 1, T_REQUIRED, "%s", a6); rval = 0; isc_buffer_init(&buffer, junk, BUFLEN); @@ -557,7 +557,7 @@ t_dns_name_isabsolute(void) { char *p; FILE *fp; - t_assert("dns_name_isabsolute", 1, T_REQUIRED, a7); + t_assert("dns_name_isabsolute", 1, T_REQUIRED, "%s", a7); result = T_UNRESOLVED; fp = fopen("dns_name_isabsolute_data", "r"); @@ -670,7 +670,7 @@ t_dns_name_hash(void) { char *p; FILE *fp; - t_assert("dns_name_hash", 1, T_REQUIRED, a8); + t_assert("dns_name_hash", 1, T_REQUIRED, "%s", a8); result = T_UNRESOLVED; fp = fopen("dns_name_hash_data", "r"); @@ -826,7 +826,7 @@ t_dns_name_fullcompare(void) { FILE *fp; dns_namereln_t reln; - t_assert("dns_name_fullcompare", 1, T_REQUIRED, a10); + t_assert("dns_name_fullcompare", 1, T_REQUIRED, "%s", a10); result = T_UNRESOLVED; fp = fopen("dns_name_fullcompare_data", "r"); @@ -946,7 +946,7 @@ t_dns_name_compare(void) { char *p; FILE *fp; - t_assert("dns_name_compare", 1, T_REQUIRED, a23); + t_assert("dns_name_compare", 1, T_REQUIRED, "%s", a23); result = T_UNRESOLVED; fp = fopen("dns_name_compare_data", "r"); @@ -1048,7 +1048,7 @@ t_dns_name_rdatacompare(void) { char *p; FILE *fp; - t_assert("dns_name_rdatacompare", 1, T_REQUIRED, a30); + t_assert("dns_name_rdatacompare", 1, T_REQUIRED, "%s", a30); result = T_UNRESOLVED; fp = fopen("dns_name_rdatacompare_data", "r"); @@ -1146,7 +1146,7 @@ t_dns_name_issubdomain(void) { char *p; FILE *fp; - t_assert("dns_name_issubdomain", 1, T_REQUIRED, a33); + t_assert("dns_name_issubdomain", 1, T_REQUIRED, "%s", a33); result = T_UNRESOLVED; fp = fopen("dns_name_issubdomain_data", "r"); @@ -1229,7 +1229,7 @@ t_dns_name_countlabels(void) { char *p; FILE *fp; - t_assert("dns_name_countlabels", 1, T_REQUIRED, a35); + t_assert("dns_name_countlabels", 1, T_REQUIRED, "%s", a35); result = T_UNRESOLVED; fp = fopen("dns_name_countlabels_data", "r"); @@ -1341,7 +1341,7 @@ t_dns_name_getlabel(void) { char *p; FILE *fp; - t_assert("dns_name_getlabel", 1, T_REQUIRED, a36); + t_assert("dns_name_getlabel", 1, T_REQUIRED, "%s", a36); result = T_UNRESOLVED; fp = fopen("dns_name_getlabel_data", "r"); @@ -1471,7 +1471,7 @@ t_dns_name_getlabelsequence(void) { char *p; FILE *fp; - t_assert("dns_name_getlabelsequence", 1, T_REQUIRED, a37); + t_assert("dns_name_getlabelsequence", 1, T_REQUIRED, "%s", a37); result = T_UNRESOLVED; fp = fopen("dns_name_getlabelsequence_data", "r"); @@ -1561,7 +1561,7 @@ t_dns_name_fromregion(void) { char *p; FILE *fp; - t_assert("dns_name_fromregion", 1, T_REQUIRED, a38); + t_assert("dns_name_fromregion", 1, T_REQUIRED, "%s", a38); result = T_UNRESOLVED; fp = fopen("dns_name_fromregion_data", "r"); @@ -1611,7 +1611,7 @@ t_dns_name_toregion(void) { char *p; FILE *fp; - t_assert("dns_name_toregion", 1, T_REQUIRED, a39); + t_assert("dns_name_toregion", 1, T_REQUIRED, "%s", a39); result = T_UNRESOLVED; fp = fopen("dns_name_toregion_data", "r"); @@ -1748,7 +1748,7 @@ t_dns_name_fromtext(void) { char *p; FILE *fp; - t_assert("dns_name_fromtext", 1, T_REQUIRED, a40); + t_assert("dns_name_fromtext", 1, T_REQUIRED, "%s", a40); result = T_UNRESOLVED; fp = fopen("dns_name_fromtext_data", "r"); @@ -1884,7 +1884,7 @@ t_dns_name_totext(void) { char *p; FILE *fp; - t_assert("dns_name_totext", 1, T_REQUIRED, a41); + t_assert("dns_name_totext", 1, T_REQUIRED, "%s", a41); result = T_UNRESOLVED; fp = fopen("dns_name_totext_data", "r"); @@ -2118,7 +2118,7 @@ t_dns_name_fromwire_x(const char *testfile, size_t buflen) { static void t_dns_name_fromwire(void) { - t_assert("dns_name_fromwire", 1, T_REQUIRED, a42); + t_assert("dns_name_fromwire", 1, T_REQUIRED, "%s", a42); t_dns_name_fromwire_x("dns_name_fromwire_1_data", BUFLEN); #if 0 @@ -2126,26 +2126,26 @@ t_dns_name_fromwire(void) { * XXXRTH these tests appear to be broken, so I have * disabled them. */ - t_assert("dns_name_fromwire", 2, T_REQUIRED, a43); + t_assert("dns_name_fromwire", 2, T_REQUIRED, "%s", a43); t_dns_name_fromwire_x("dns_name_fromwire_2_data", BUFLEN); - t_assert("dns_name_fromwire", 3, T_REQUIRED, a44); + t_assert("dns_name_fromwire", 3, T_REQUIRED, "%s", a44); t_dns_name_fromwire_x("dns_name_fromwire_3_data", BUFLEN); #endif - t_assert("dns_name_fromwire", 4, T_REQUIRED, a45); + t_assert("dns_name_fromwire", 4, T_REQUIRED, "%s", a45); t_dns_name_fromwire_x("dns_name_fromwire_4_data", BUFLEN); - t_assert("dns_name_fromwire", 5, T_REQUIRED, a46); + t_assert("dns_name_fromwire", 5, T_REQUIRED, "%s", a46); t_dns_name_fromwire_x("dns_name_fromwire_5_data", BUFLEN); - t_assert("dns_name_fromwire", 6, T_REQUIRED, a47); + t_assert("dns_name_fromwire", 6, T_REQUIRED, "%s", a47); t_dns_name_fromwire_x("dns_name_fromwire_6_data", BUFLEN); - t_assert("dns_name_fromwire", 7, T_REQUIRED, a48); + t_assert("dns_name_fromwire", 7, T_REQUIRED, "%s", a48); t_dns_name_fromwire_x("dns_name_fromwire_7_data", BUFLEN); - t_assert("dns_name_fromwire", 9, T_REQUIRED, a49); + t_assert("dns_name_fromwire", 9, T_REQUIRED, "%s", a49); t_dns_name_fromwire_x("dns_name_fromwire_8_data", 2); } @@ -2284,13 +2284,13 @@ t_dns_name_towire_x(const char *testfile, size_t buflen) { static void t_dns_name_towire_1(void) { - t_assert("dns_name_towire", 1, T_REQUIRED, a51); + t_assert("dns_name_towire", 1, T_REQUIRED, "%s", a51); t_dns_name_towire_x("dns_name_towire_1_data", BUFLEN); } static void t_dns_name_towire_2(void) { - t_assert("dns_name_towire", 2, T_REQUIRED, a52); + t_assert("dns_name_towire", 2, T_REQUIRED, "%s", a52); t_dns_name_towire_x("dns_name_towire_2_data", 2); } @@ -2311,7 +2311,7 @@ static const char *a53 = static void t_dns_name_concatenate(void) { - t_assert("dns_name_concatenate", 1, T_REQUIRED, a53); + t_assert("dns_name_concatenate", 1, T_REQUIRED, "%s", a53); t_result(T_UNTESTED); } #endif diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c index 171e633f9a..2dd4d275f1 100644 --- a/bin/tests/rbt/t_rbt.c +++ b/bin/tests/rbt/t_rbt.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_rbt.c,v 1.30 2007/06/19 23:47:00 tbox Exp $ */ +/* $Id: t_rbt.c,v 1.31 2009/01/22 05:39:29 marka Exp $ */ #include @@ -517,7 +517,7 @@ static void t1() { int result; - t_assert("dns_rbt_create", 1, T_REQUIRED, a1); + t_assert("dns_rbt_create", 1, T_REQUIRED, "%s", a1); result = test_dns_rbt_x("dns_rbt_create_1_data"); t_result(result); } @@ -529,7 +529,7 @@ static void t2() { int result; - t_assert("dns_rbt_addname", 2, T_REQUIRED, a2); + t_assert("dns_rbt_addname", 2, T_REQUIRED, "%s", a2); result = test_dns_rbt_x("dns_rbt_addname_1_data"); t_result(result); } @@ -541,7 +541,7 @@ static void t3() { int result; - t_assert("dns_rbt_addname", 3, T_REQUIRED, a3); + t_assert("dns_rbt_addname", 3, T_REQUIRED, "%s", a3); result = test_dns_rbt_x("dns_rbt_addname_2_data"); t_result(result); } @@ -553,7 +553,7 @@ static void t4() { int result; - t_assert("dns_rbt_deletename", 4, T_REQUIRED, a4); + t_assert("dns_rbt_deletename", 4, T_REQUIRED, "%s", a4); result = test_dns_rbt_x("dns_rbt_deletename_1_data"); t_result(result); } @@ -564,7 +564,7 @@ static void t5() { int result; - t_assert("dns_rbt_deletename", 5, T_REQUIRED, a5); + t_assert("dns_rbt_deletename", 5, T_REQUIRED, "%s", a5); result = test_dns_rbt_x("dns_rbt_deletename_2_data"); t_result(result); } @@ -576,7 +576,7 @@ static void t6() { int result; - t_assert("dns_rbt_findname", 6, T_REQUIRED, a6); + t_assert("dns_rbt_findname", 6, T_REQUIRED, "%s", a6); result = test_dns_rbt_x("dns_rbt_findname_1_data"); t_result(result); } @@ -588,7 +588,7 @@ static void t7() { int result; - t_assert("dns_rbt_findname", 7, T_REQUIRED, a7); + t_assert("dns_rbt_findname", 7, T_REQUIRED, "%s", a7); result = test_dns_rbt_x("dns_rbt_findname_2_data"); t_result(result); } @@ -600,7 +600,7 @@ static void t8() { int result; - t_assert("dns_rbt_findname", 8, T_REQUIRED, a8); + t_assert("dns_rbt_findname", 8, T_REQUIRED, "%s", a8); result = test_dns_rbt_x("dns_rbt_findname_3_data"); t_result(result); } @@ -1034,7 +1034,7 @@ static void t9() { int result; - t_assert("dns_rbtnodechain_init", 9, T_REQUIRED, a9); + t_assert("dns_rbtnodechain_init", 9, T_REQUIRED, "%s", a9); result = test_dns_rbtnodechain_init("dns_rbtnodechain_init_data"); t_result(result); } @@ -1224,7 +1224,7 @@ static void t10() { int result; - t_assert("dns_rbtnodechain_first", 10, T_REQUIRED, a10); + t_assert("dns_rbtnodechain_first", 10, T_REQUIRED, "%s", a10); result = test_dns_rbtnodechain_first("dns_rbtnodechain_first_data"); t_result(result); } @@ -1417,7 +1417,7 @@ static void t11() { int result; - t_assert("dns_rbtnodechain_last", 11, T_REQUIRED, a11); + t_assert("dns_rbtnodechain_last", 11, T_REQUIRED, "%s", a11); result = test_dns_rbtnodechain_last("dns_rbtnodechain_last_data"); t_result(result); } @@ -1625,7 +1625,7 @@ static void t12() { int result; - t_assert("dns_rbtnodechain_next", 12, T_REQUIRED, a12); + t_assert("dns_rbtnodechain_next", 12, T_REQUIRED, "%s", a12); result = test_dns_rbtnodechain_next("dns_rbtnodechain_next_data"); t_result(result); } @@ -1831,7 +1831,7 @@ static void t13() { int result; - t_assert("dns_rbtnodechain_prev", 13, T_REQUIRED, a13); + t_assert("dns_rbtnodechain_prev", 13, T_REQUIRED, "%s", a13); result = test_dns_rbtnodechain_prev("dns_rbtnodechain_prev_data"); t_result(result); } diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c index b8a4d243ae..75b0ea7f29 100644 --- a/bin/tests/tasks/t_tasks.c +++ b/bin/tests/tasks/t_tasks.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_tasks.c,v 1.40 2007/06/19 23:47:07 tbox Exp $ */ +/* $Id: t_tasks.c,v 1.41 2009/01/22 05:39:29 marka Exp $ */ #include @@ -378,7 +378,7 @@ static void t1(void) { int result; - t_assert("tasks", 1, T_REQUIRED, a1); + t_assert("tasks", 1, T_REQUIRED, "%s", a1); result = t_tasks1(); t_result(result); } @@ -574,7 +574,7 @@ static const char *a2 = "The task subsystem can create ISC_TASKS_MIN tasks"; static void t2(void) { - t_assert("tasks", 2, T_REQUIRED, a2); + t_assert("tasks", 2, T_REQUIRED, "%s", a2); if (threaded) t_result(t_tasks2()); @@ -831,7 +831,7 @@ static const char *a3 = "When isc_task_shutdown() is called, any shutdown " "LIFO order."; static void t3(void) { - t_assert("tasks", 3, T_REQUIRED, a3); + t_assert("tasks", 3, T_REQUIRED, "%s", a3); if (threaded) t_result(t_tasks3()); @@ -1021,7 +1021,7 @@ static const char *a4 = static void t4(void) { - t_assert("tasks", 4, T_REQUIRED, a4); + t_assert("tasks", 4, T_REQUIRED, "%s", a4); if (threaded) t_result(t_tasks4()); @@ -1242,7 +1242,7 @@ static const char *a7 = "A call to isc_task_create() creates a task that can " static void t7(void) { - t_assert("tasks", 7, T_REQUIRED, a7); + t_assert("tasks", 7, T_REQUIRED, "%s", a7); if (threaded) t_result(t_tasks7()); @@ -1712,7 +1712,7 @@ static const char *a10 = static void t10(void) { - t_assert("tasks", 10, T_REQUIRED, a10); + t_assert("tasks", 10, T_REQUIRED, "%s", a10); if (threaded) t_result(t_tasks10()); @@ -1989,7 +1989,7 @@ static const char *a11 = static void t11(void) { - t_assert("tasks", 11, T_REQUIRED, a11); + t_assert("tasks", 11, T_REQUIRED, "%s", a11); if (threaded) t_result(t_tasks11(1)); @@ -2010,7 +2010,7 @@ t_tasks12(void) { static void t12(void) { - t_assert("tasks", 12, T_REQUIRED, a12); + t_assert("tasks", 12, T_REQUIRED, "%s", a12); if (threaded) t_result(t_tasks12()); @@ -2120,7 +2120,7 @@ t_tasks13(void) { static void t13(void) { - t_assert("tasks", 13, T_REQUIRED, a13); + t_assert("tasks", 13, T_REQUIRED, "%s", a13); if (threaded) t_result(t_tasks13()); @@ -2272,7 +2272,7 @@ static void t14(void) { int result; - t_assert("tasks", 14, T_REQUIRED, + t_assert("tasks", 14, T_REQUIRED, "%s", "isc_task_beginexclusive() gets exclusive access"); result = t_tasks14(); t_result(result); diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c index 7705364bcb..47d69b5829 100644 --- a/bin/tests/timers/t_timers.c +++ b/bin/tests/timers/t_timers.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_timers.c,v 1.28 2008/01/12 23:47:13 tbox Exp $ */ +/* $Id: t_timers.c,v 1.29 2009/01/22 05:39:29 marka Exp $ */ #include @@ -367,7 +367,7 @@ t1(void) { isc_time_t expires; isc_interval_t interval; - t_assert("isc_timer_create", 1, T_REQUIRED, a1); + t_assert("isc_timer_create", 1, T_REQUIRED, "%s", a1); if (threaded) { Tx_nfails = 0; @@ -408,7 +408,7 @@ t2(void) { isc_time_t expires; isc_interval_t interval; - t_assert("isc_timer_create", 2, T_REQUIRED, a2); + t_assert("isc_timer_create", 2, T_REQUIRED, "%s", a2); if (threaded) { Tx_nfails = 0; @@ -534,7 +534,7 @@ t3(void) { isc_time_t expires; isc_interval_t interval; - t_assert("isc_timer_create", 3, T_REQUIRED, a3); + t_assert("isc_timer_create", 3, T_REQUIRED, "%s", a3); if (threaded) { Tx_nfails = 0; @@ -697,7 +697,7 @@ t4(void) { isc_time_t expires; isc_interval_t interval; - t_assert("isc_timer_reset", 4, T_REQUIRED, a4); + t_assert("isc_timer_reset", 4, T_REQUIRED, "%s", a4); if (threaded) { Tx_nfails = 0; @@ -1110,7 +1110,7 @@ static const char *a5 = static void t5(void) { - t_assert("isc_timer_reset", 5, T_REQUIRED, a5); + t_assert("isc_timer_reset", 5, T_REQUIRED, "%s", a5); if (threaded) t_result(t_timers5()); diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 8f030a336c..443b93ff23 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mem.c,v 1.145 2008/04/02 02:37:42 marka Exp $ */ +/* $Id: mem.c,v 1.146 2009/01/22 05:39:29 marka Exp $ */ /*! \file */ @@ -1191,7 +1191,7 @@ print_active(isc_mem_t *mctx, FILE *out) { const char *format; isc_boolean_t found; - fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, + fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, ISC_MSG_DUMPALLOC, "Dump of all outstanding " "memory allocations:\n")); @@ -1217,7 +1217,7 @@ print_active(isc_mem_t *mctx, FILE *out) { } } if (!found) - fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, + fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, ISC_MSG_NONE, "\tNone.\n")); } } @@ -1259,7 +1259,7 @@ isc_mem_stats(isc_mem_t *ctx, FILE *out) { */ pool = ISC_LIST_HEAD(ctx->pools); if (pool != NULL) { - fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, + fprintf(out, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, ISC_MSG_POOLSTATS, "[Pool statistics]\n")); fprintf(out, "%15s %10s %10s %10s %10s %10s %10s %10s %1s\n", diff --git a/lib/isc/timer.c b/lib/isc/timer.c index ca487cde35..f0adc0f4e2 100644 --- a/lib/isc/timer.c +++ b/lib/isc/timer.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: timer.c,v 1.84 2008/08/22 05:57:53 marka Exp $ */ +/* $Id: timer.c,v 1.85 2009/01/22 05:39:29 marka Exp $ */ /*! \file */ @@ -662,7 +662,7 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) { isc_task_send(timer->task, ISC_EVENT_PTR(&event)); } else - UNEXPECTED_ERROR(__FILE__, __LINE__, + UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_TIMER, ISC_MSG_EVENTNOTALLOC, @@ -677,7 +677,7 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) { if (need_schedule) { result = schedule(timer, now, ISC_FALSE); if (result != ISC_R_SUCCESS) - UNEXPECTED_ERROR(__FILE__, __LINE__, + UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_TIMER, ISC_MSG_SCHEDFAIL, diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index c3979d9958..b5bf39d6eb 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.313 2009/01/18 23:48:14 tbox Exp $ */ +/* $Id: socket.c,v 1.314 2009/01/22 05:39:29 marka Exp $ */ /*! \file */ @@ -3394,7 +3394,7 @@ watcher(void *uap) { #endif } - manager_log(manager, TRACE, + manager_log(manager, TRACE, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL, ISC_MSG_EXITING, "watcher exiting")); @@ -3841,7 +3841,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) { * Wait for all sockets to be destroyed. */ while (!ISC_LIST_EMPTY(manager->socklist)) { - manager_log(manager, CREATION, + manager_log(manager, CREATION, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKET, ISC_MSG_SOCKETSREMAIN, "sockets exist")); @@ -3852,7 +3852,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) { * Hope all sockets have been destroyed. */ if (!ISC_LIST_EMPTY(manager->socklist)) { - manager_log(manager, CREATION, + manager_log(manager, CREATION, "%s", isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKET, ISC_MSG_SOCKETSREMAIN, "sockets exist"));