commit e0a397967eefc5d2c9470d73878281d4ca7e6dfd
author Bruce Chen <chenbruce@google.com> Thu Sep 10 01:14:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 10 01:14:23 2020 +0000
tree 2c3d666c7098729d5b04b44511ff671f61f185c4
parent c783822b83f30268901cdd28446a661c9b3b1c50
parent b6ff4a2999e52fdc65988d244505cf428ff7e657

Merge "Update language to comply with Android’s inclusive language guidance" am: c8402de362 am: b6ff4a2999

Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829

Change-Id: I2f91025270d8c4fb6143bc7dd8b2a4975a541035

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 27ad864..46d15ee 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -350,10 +350,10 @@
 
     if (!(daemon->options & OPT_DEBUG) && getuid() == 0) {
         int bad_capabilities = 0;
-        gid_t dummy;
+        gid_t unused;
 
         /* remove all supplimentary groups */
-        if (gp && (setgroups(0, &dummy) == -1 || setgid(gp->gr_gid) == -1)) {
+        if (gp && (setgroups(0, &unused) == -1 || setgid(gp->gr_gid) == -1)) {
             send_event(err_pipe[1], EVENT_GROUP_ERR, errno);
             _exit(0);
         }
@@ -571,7 +571,7 @@
         /* alarm is used to kill TCP children after a fixed time. */
         if (sig == SIGALRM) _exit(0);
     } else {
-        /* master process */
+        /* main process */
         const int errsave = errno;
         int event;
 

src/helper.c

diff --git a/src/helper.c b/src/helper.c
index eb6614a..3e414b2 100644
--- a/src/helper.c
+++ b/src/helper.c
@@ -75,8 +75,8 @@
     sigaction(SIGALRM, &sigact, NULL);
 
     if (!(daemon->options & OPT_DEBUG) && uid != 0) {
-        gid_t dummy;
-        if (setgroups(0, &dummy) == -1 || setgid(gid) == -1 || setuid(uid) == -1) {
+        gid_t unused;
+        if (setgroups(0, &unused) == -1 || setgid(gid) == -1 || setuid(uid) == -1) {
             if (daemon->options & OPT_NO_FORK) /* send error to daemon process if no-fork */
                 send_event(event_fd, EVENT_HUSER_ERR, errno);
             else {

src/log.c

diff --git a/src/log.c b/src/log.c
index d1fcfb9..1cc4745 100644
--- a/src/log.c
+++ b/src/log.c
@@ -104,7 +104,7 @@
         return log_fd != -1;
     } else
 #if defined(__ANDROID__)
-#define _PATH_LOG "" /* dummy */
+#define _PATH_LOG "" /* unused */
         log_fd = -1;
 #else
     {

src/network.c

diff --git a/src/network.c b/src/network.c
index 98b4f68..d542c94 100644
--- a/src/network.c
+++ b/src/network.c
@@ -180,7 +180,7 @@
 #ifdef HAVE_IPV6
 static int iface_allowed_v6(struct in6_addr* local, int scope, int if_index, void* vparam) {
     union mysockaddr addr;
-    struct in_addr netmask; /* dummy */
+    struct in_addr netmask; /* unused */
 
     netmask.s_addr = 0;
 

src/util.c

diff --git a/src/util.c b/src/util.c
index 53e3137..b188bce 100644
--- a/src/util.c
+++ b/src/util.c
@@ -266,12 +266,12 @@
 
 time_t dnsmasq_time(void) {
 #ifdef HAVE_BROKEN_RTC
-    struct tms dummy;
+    struct tms unused;
     static long tps = 0;
 
     if (tps == 0) tps = sysconf(_SC_CLK_TCK);
 
-    return (time_t)(times(&dummy) / tps);
+    return (time_t)(times(&unused) / tps);
 #else
     return time(NULL);
 #endif