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

Eliminate the dead code in dst_api.c

Browse Source 
In write_public_key() and write_key_state(), there were left-over checks
for result, that were effectively dead code after the last refactoring.
Remove those.
This commit is contained in:
Ondřej Surý
2023-04-03 14:09:13 +02:00
parent c74f389100
commit 766366e934
1 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/dns/dst_api.c
View File

@@ -2133,10 +2133,6 @@ write_key_state(const dst_key_t *key, int type, const char *directory) {
printstate(key, DST_KEY_GOAL, "GoalState", fp); printstate(key, DST_KEY_GOAL, "GoalState", fp);
} }
if (result != ISC_R_SUCCESS) {
return (dst_key_cleanup(tmpname, fp));
}
return (dst_key_close(tmpname, fp, filename)); return (dst_key_close(tmpname, fp, filename));
} }
@@ -2153,7 +2149,7 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
unsigned char key_array[DST_KEY_MAXSIZE]; unsigned char key_array[DST_KEY_MAXSIZE];
char text_array[DST_KEY_MAXTEXTSIZE]; char text_array[DST_KEY_MAXTEXTSIZE];
char class_array[10]; char class_array[10];
isc_result_t ret; isc_result_t result;
dns_rdata_t rdata = DNS_RDATA_INIT; dns_rdata_t rdata = DNS_RDATA_INIT;
REQUIRE(VALID_KEY(key)); REQUIRE(VALID_KEY(key));
@@ -2162,21 +2158,21 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
isc_buffer_init(&textb, text_array, sizeof(text_array)); isc_buffer_init(&textb, text_array, sizeof(text_array));
isc_buffer_init(&classb, class_array, sizeof(class_array)); isc_buffer_init(&classb, class_array, sizeof(class_array));
ret = dst_key_todns(key, &keyb); result = dst_key_todns(key, &keyb);
if (ret != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
return (ret); return (result);
} }
isc_buffer_usedregion(&keyb, &r); isc_buffer_usedregion(&keyb, &r);
dns_rdata_fromregion(&rdata, key->key_class, dns_rdatatype_dnskey, &r); dns_rdata_fromregion(&rdata, key->key_class, dns_rdatatype_dnskey, &r);
ret = dns_rdata_totext(&rdata, (dns_name_t *)NULL, &textb); result = dns_rdata_totext(&rdata, (dns_name_t *)NULL, &textb);
if (ret != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
return (DST_R_INVALIDPUBLICKEY); return (DST_R_INVALIDPUBLICKEY);
} }
ret = dns_rdataclass_totext(key->key_class, &classb); result = dns_rdataclass_totext(key->key_class, &classb);
if (ret != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
return (DST_R_INVALIDPUBLICKEY); return (DST_R_INVALIDPUBLICKEY);
} }
@@ -2184,15 +2180,16 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
* Make the filename. * Make the filename.
*/ */
isc_buffer_init(&fileb, filename, sizeof(filename)); isc_buffer_init(&fileb, filename, sizeof(filename));
ret = dst_key_buildfilename(key, DST_TYPE_PUBLIC, directory, &fileb); result = dst_key_buildfilename(key, DST_TYPE_PUBLIC, directory, &fileb);
if (ret != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
return (ret); return (result);
} }
isc_buffer_init(&tmpb, tmpname, sizeof(tmpname)); isc_buffer_init(&tmpb, tmpname, sizeof(tmpname));
ret = dst_key_buildfilename(key, DST_TYPE_TEMPLATE, directory, &tmpb); result = dst_key_buildfilename(key, DST_TYPE_TEMPLATE, directory,
if (ret != ISC_R_SUCCESS) { &tmpb);
return (ret); if (result != ISC_R_SUCCESS) {
return (result);
} }
/* Create temporary public key file. */ /* Create temporary public key file. */
@@ -2212,10 +2209,9 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
(key->key_flags & DNS_KEYFLAG_KSK) != 0 ? "key" (key->key_flags & DNS_KEYFLAG_KSK) != 0 ? "key"
: "zone", : "zone",
key->key_id); key->key_id);
ret = dns_name_print(key->key_name, fp); result = dns_name_print(key->key_name, fp);
if (ret != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
fclose(fp); return (dst_key_cleanup(tmpname, fp));
return (ret);
} }
fputc('\n', fp); fputc('\n', fp);
@@ -2230,8 +2226,8 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
} }
/* Now print the actual key */ /* Now print the actual key */
ret = dns_name_print(key->key_name, fp); result = dns_name_print(key->key_name, fp);
if (ret != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
return (dst_key_cleanup(tmpname, fp)); return (dst_key_cleanup(tmpname, fp));
} }
fprintf(fp, " "); fprintf(fp, " ");
@@ -2258,10 +2254,6 @@ write_public_key(const dst_key_t *key, int type, const char *directory) {
fputc('\n', fp); fputc('\n', fp);
if (ret != ISC_R_SUCCESS) {
return (dst_key_cleanup(tmpname, fp));
}
return (dst_key_close(tmpname, fp, filename)); return (dst_key_close(tmpname, fp, filename));
} }