|
 |
4365f2 |
diff --git a/compat/arc4_lock.c b/compat/arc4_lock.c
|
|
|
4365f2 |
index 0c45ad0..7fb9cdc 100644
|
|
|
4365f2 |
--- a/compat/arc4_lock.c
|
|
|
4365f2 |
+++ b/compat/arc4_lock.c
|
|
|
4365f2 |
@@ -32,7 +32,7 @@
|
|
|
4365f2 |
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
4365f2 |
*/
|
|
|
4365f2 |
#include "config.h"
|
|
|
4365f2 |
-#define LOCKRET(func) func
|
|
|
4365f2 |
+#define LOCKRET(func) (void)func
|
|
|
4365f2 |
#include "util/locks.h"
|
|
|
4365f2 |
|
|
|
4365f2 |
void _ARC4_LOCK(void);
|
|
|
4365f2 |
diff --git a/daemon/remote.c b/daemon/remote.c
|
|
|
4365f2 |
index 243d94c..a377aca 100644
|
|
|
4365f2 |
--- a/daemon/remote.c
|
|
|
4365f2 |
+++ b/daemon/remote.c
|
|
|
4365f2 |
@@ -371,7 +371,9 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err,
|
|
|
4365f2 |
(unsigned)cfg_uid, (unsigned)cfg_gid,
|
|
|
4365f2 |
ip, strerror(errno));
|
|
|
4365f2 |
}
|
|
|
4365f2 |
- chmod(ip, (mode_t)(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP));
|
|
|
4365f2 |
+ if (chmod(ip, (mode_t)(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP)) == -1)
|
|
|
4365f2 |
+ verbose(VERB_QUERY, "cannot chmod %s: %s",
|
|
|
4365f2 |
+ ip, strerror(errno));
|
|
|
4365f2 |
#else
|
|
|
4365f2 |
(void)cfg;
|
|
|
4365f2 |
#endif
|
|
|
4365f2 |
@@ -387,7 +389,7 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err,
|
|
|
4365f2 |
}
|
|
|
4365f2 |
#endif /* USE_WINSOCK */
|
|
|
4365f2 |
log_err("control interface %s:%s getaddrinfo: %s %s",
|
|
|
4365f2 |
- ip?ip:"default", port, gai_strerror(r),
|
|
|
4365f2 |
+ ip, port, gai_strerror(r),
|
|
|
4365f2 |
#ifdef EAI_SYSTEM
|
|
|
4365f2 |
r==EAI_SYSTEM?(char*)strerror(errno):""
|
|
|
4365f2 |
#else
|
|
|
4365f2 |
diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c
|
|
|
4365f2 |
index 1bee85c..6bdfe41 100644
|
|
|
4365f2 |
--- a/iterator/iter_scrub.c
|
|
|
4365f2 |
+++ b/iterator/iter_scrub.c
|
|
|
4365f2 |
@@ -437,7 +437,6 @@ scrub_normalize(sldns_buffer* pkt, struct msg_parse* msg,
|
|
|
4365f2 |
rrset->rrset_all_next =
|
|
|
4365f2 |
nx->rrset_all_next;
|
|
|
4365f2 |
nx->rrset_all_next = rrset;
|
|
|
4365f2 |
- prev = nx;
|
|
|
4365f2 |
}
|
|
|
4365f2 |
}
|
|
|
4365f2 |
|
|
|
4365f2 |
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
|
|
|
4365f2 |
index 3b53676..36c67c6 100644
|
|
|
4365f2 |
--- a/services/listen_dnsport.c
|
|
|
4365f2 |
+++ b/services/listen_dnsport.c
|
|
|
4365f2 |
@@ -1072,11 +1072,11 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
|
|
|
4365f2 |
{
|
|
|
4365f2 |
int s, noip6=0;
|
|
|
4365f2 |
#ifdef USE_DNSCRYPT
|
|
|
4365f2 |
- int is_dnscrypt = ((strchr(ifname, '@') &&
|
|
|
4365f2 |
+ const int is_dnscrypt = ((strchr(ifname, '@') &&
|
|
|
4365f2 |
atoi(strchr(ifname, '@')+1) == dnscrypt_port) ||
|
|
|
4365f2 |
(!strchr(ifname, '@') && atoi(port) == dnscrypt_port));
|
|
|
4365f2 |
#else
|
|
|
4365f2 |
- int is_dnscrypt = 0;
|
|
|
4365f2 |
+ const int is_dnscrypt = 0;
|
|
|
4365f2 |
(void)dnscrypt_port;
|
|
|
4365f2 |
#endif
|
|
|
4365f2 |
|
|
|
4365f2 |
diff --git a/services/localzone.c b/services/localzone.c
|
|
|
4365f2 |
index 6bde432..00d044a 100644
|
|
|
4365f2 |
--- a/services/localzone.c
|
|
|
4365f2 |
+++ b/services/localzone.c
|
|
|
4365f2 |
@@ -1079,7 +1079,7 @@ local_zones_tags_lookup(struct local_zones* zones,
|
|
|
4365f2 |
key.name = name;
|
|
|
4365f2 |
key.namelen = len;
|
|
|
4365f2 |
key.namelabs = labs;
|
|
|
4365f2 |
- rbtree_find_less_equal(&zones->ztree, &key, &res;;
|
|
|
4365f2 |
+ (void)rbtree_find_less_equal(&zones->ztree, &key, &res;;
|
|
|
4365f2 |
result = (struct local_zone*)res;
|
|
|
4365f2 |
/* exact or smaller element (or no element) */
|
|
|
4365f2 |
if(!result || result->dclass != dclass)
|
|
|
4365f2 |
diff --git a/smallapp/unbound-host.c b/smallapp/unbound-host.c
|
|
|
4365f2 |
index d7a36a2..68f789a 100644
|
|
|
4365f2 |
--- a/smallapp/unbound-host.c
|
|
|
4365f2 |
+++ b/smallapp/unbound-host.c
|
|
|
4365f2 |
@@ -330,6 +330,7 @@ pretty_output(char* q, int t, int c, struct ub_result* result, int docname)
|
|
|
4365f2 |
exit(1);
|
|
|
4365f2 |
}
|
|
|
4365f2 |
printf("%s\n", s);
|
|
|
4365f2 |
+ free(s);
|
|
|
4365f2 |
} else printf(" has no %s record", tstr);
|
|
|
4365f2 |
printf(" %s\n", secstatus);
|
|
|
4365f2 |
}
|