upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[9.18] fix: dev: Use const pointer with strchr of const pointer

Browse source 
Closes #5694

Backport of MR !11394

Merge branch 'backport-5694-fedora-builds-with-werror-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!11464
This commit is contained in:
Mark Andrews 2026-01-20 17:39:55 +11:00
commit 2b10ee4f13
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/delv/delv.c
View file

@ -1651,7 +1651,7 @@ append_str(const char *text, int len, char **p, char *end) {
static isc_result_t
reverse_octets(const char *in, char **p, char *end) {
char *dot = strchr(in, '.');
const char *dot = strchr(in, '.');
int len;
if (dot != NULL) {
isc_result_t result;

17
bin/tools/mdig.c
View file

@ -1658,7 +1658,7 @@ static bool
dash_option(const char *option, char *next, struct query *query, bool global,
bool *setname) {
char opt;
const char *value;
const char *value, *oldvalue;
isc_result_t result;
bool value_from_next;
isc_consttextregion_t tr;
@ -1668,7 +1668,7 @@ dash_option(const char *option, char *next, struct query *query, bool global,
struct in_addr in4;
struct in6_addr in6;
in_port_t srcport;
char *hash;
const char *hash;
uint32_t num;
while (strpbrk(option, single_dash_opts) == &option[0]) {
@ -1739,12 +1739,15 @@ dash_option(const char *option, char *next, struct query *query, bool global,
case 'b':
GLOBAL();
hash = strchr(value, '#');
oldvalue = value;
if (hash != NULL) {
result = parse_uint(&num, hash + 1, MAXPORT,
"port number");
CHECKM("parse_uint(srcport)", result);
srcport = num;
*hash = '\0';
snprintf(textname, sizeof(textname), "%.*s",
(int)(hash - value), value);
value = textname;
} else {
srcport = 0;
}
@ -1755,13 +1758,7 @@ dash_option(const char *option, char *next, struct query *query, bool global,
isc_sockaddr_fromin(&srcaddr, &in4, srcport);
isc_net_disableipv6();
} else {
if (hash != NULL) {
*hash = '#';
}
fatal("invalid address %s", value);
}
if (hash != NULL) {
*hash = '#';
fatal("invalid address %s", oldvalue);
}
have_src = true;
return value_from_next;

2
lib/isc/file.c
View file

@ -354,7 +354,7 @@ isc_file_openuniquemode(char *templet, int mode, FILE **fp) {
return isc__errno2result(errno);
}
for (cp = x;;) {
char *t;
const char *t;
if (*cp == '\0') {
return ISC_R_FAILURE;
}