upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 20:10:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[v9_9] silence clang warnings

Browse source 
4422.	[port]		Silence clang warnings in dig.c and dighost.c.
			[RT #42451]
This commit is contained in:
Evan Hunt 2016-07-21 15:57:55 -07:00
parent 846c2d8235
commit d8eaff0417
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4422. [port] Silence clang warnings in dig.c and dighost.c.
[RT #42451]
4418. [bug] Fix a compiler warning in GSSAPI code. [RT #42879]
4414. [bug] Corrected a bug in the MIPS implementation of

9
bin/dig/dig.c
View file

@ -681,7 +681,7 @@ cleanup:
static void
printgreeting(int argc, char **argv, dig_lookup_t *lookup) {
int i;
int remaining;
size_t remaining;
static isc_boolean_t first = ISC_TRUE;
char append[MXNAME];
@ -1352,7 +1352,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
}
*open_type_class = ISC_FALSE;
tr.base = value;
tr.length = strlen(value);
tr.length = (unsigned int) strlen(value);
result = dns_rdataclass_fromtext(&rdclass,
(isc_textregion_t *)&tr);
if (result == ISC_R_SUCCESS) {
@ -1403,7 +1403,7 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
result = ISC_R_SUCCESS;
} else {
tr.base = value;
tr.length = strlen(value);
tr.length = (unsigned int) strlen(value);
result = dns_rdatatype_fromtext(&rdtype,
(isc_textregion_t *)&tr);
if (result == ISC_R_SUCCESS &&
@ -1682,7 +1682,8 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
result = ISC_R_SUCCESS;
} else {
tr.base = rv[0];
tr.length = strlen(rv[0]);
tr.length =
(unsigned int) strlen(rv[0]);
result = dns_rdatatype_fromtext(&rdtype,
(isc_textregion_t *)&tr);
if (result == ISC_R_SUCCESS &&

28
bin/dig/dighost.c
View file

@ -466,9 +466,9 @@ reverse_octets(const char *in, char **p, char *end) {
result = append(".", 1, p, end);
if (result != ISC_R_SUCCESS)
return (result);
len = (int)(dot - in);
len = (int) (dot - in);
} else {
len = strlen(in);
len = (int) strlen(in);
}
return (append(in, len, p, end));
}
@ -933,7 +933,7 @@ setup_text_key(void) {
isc_result_t result;
dns_name_t keyname;
isc_buffer_t secretbuf;
int secretsize;
unsigned int secretsize;
unsigned char *secretstore;
debug("setup_text_key()");
@ -942,7 +942,7 @@ setup_text_key(void) {
dns_name_init(&keyname, NULL);
check_result(result, "dns_name_init");
isc_buffer_putstr(namebuf, keynametext);
secretsize = strlen(keysecret) * 3 / 4;
secretsize = (unsigned int) strlen(keysecret) * 3 / 4;
secretstore = isc_mem_allocate(mctx, secretsize);
if (secretstore == NULL)
fatal("memory allocation failure in %s:%d",
@ -964,8 +964,8 @@ setup_text_key(void) {
goto failure;
result = dns_tsigkey_create(&keyname, hmacname, secretstore,
secretsize, ISC_FALSE, NULL, 0, 0, mctx,
NULL, &key);
(int)secretsize, ISC_FALSE, NULL, 0, 0,
mctx, NULL, &key);
failure:
if (result != ISC_R_SUCCESS)
printf(";; Couldn't create key %s: %s\n",
@ -1012,13 +1012,13 @@ parse_bits(char *arg, const char *desc, isc_uint32_t max) {
void
parse_hmac(const char *hmac) {
char buf[20];
int len;
size_t len;
REQUIRE(hmac != NULL);
len = strlen(hmac);
if (len >= (int) sizeof(buf))
fatal("unknown key type '%.*s'", len, hmac);
if (len >= sizeof(buf))
fatal("unknown key type '%.*s'", (int)len, hmac);
strlcpy(buf, hmac, sizeof(buf));
digestbits = 0;
@ -2028,7 +2028,7 @@ isc_boolean_t
setup_lookup(dig_lookup_t *lookup) {
isc_result_t result;
isc_uint32_t id;
int len;
unsigned int len;
dig_server_t *serv;
dig_query_t *query;
isc_buffer_t b;
@ -2133,7 +2133,7 @@ setup_lookup(dig_lookup_t *lookup) {
check_result(result, "dns_message_gettempname");
dns_name_init(lookup->oname, NULL);
/* XXX Helper funct to conv char* to name? */
len = strlen(lookup->origin->origin);
len = (unsigned int) strlen(lookup->origin->origin);
isc_buffer_init(&b, lookup->origin->origin, len);
isc_buffer_add(&b, len);
result = dns_name_fromtext(lookup->oname, &b, dns_rootname,
@ -2155,7 +2155,7 @@ setup_lookup(dig_lookup_t *lookup) {
dns_fixedname_init(&fixed);
name = dns_fixedname_name(&fixed);
len = strlen(lookup->textname);
len = (unsigned int) strlen(lookup->textname);
isc_buffer_init(&b, lookup->textname, len);
isc_buffer_add(&b, len);
result = dns_name_fromtext(name, &b, NULL, 0, NULL);
@ -2189,14 +2189,14 @@ setup_lookup(dig_lookup_t *lookup) {
dns_name_clone(dns_rootname, lookup->name);
else {
#ifdef WITH_IDN
len = strlen(idn_textname);
len = (unsigned int) strlen(idn_textname);
isc_buffer_init(&b, idn_textname, len);
isc_buffer_add(&b, len);
result = dns_name_fromtext(lookup->name, &b,
dns_rootname, 0,
&lookup->namebuf);
#else
len = strlen(lookup->textname);
len = (unsigned int) strlen(lookup->textname);
isc_buffer_init(&b, lookup->textname, len);
isc_buffer_add(&b, len);
result = dns_name_fromtext(lookup->name, &b,