diff options
author | Bruce Chen <chenbruce@google.com> | 2020-09-10 01:58:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 01:58:05 +0000 |
commit | 9d315db9911e1843d0ed640ceb1d45b240a31982 (patch) | |
tree | 2c3d666c7098729d5b04b44511ff671f61f185c4 | |
parent | ee072b6de29acaeb7e06a901ba36908cb9957090 (diff) | |
parent | d974302860e3046364a55e9353f5b910fef70a3a (diff) | |
download | dnsmasq-9d315db9911e1843d0ed640ceb1d45b240a31982.tar.gz |
Merge "Update language to comply with Android’s inclusive language guidance" am: c8402de362 am: b6ff4a2999 am: e0a397967e am: d974302860
Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1418829
Change-Id: I32d19d6426ad1f96686aa34b3a491e65888f3b88
-rw-r--r-- | src/dnsmasq.c | 6 | ||||
-rw-r--r-- | src/helper.c | 4 | ||||
-rw-r--r-- | src/log.c | 2 | ||||
-rw-r--r-- | src/network.c | 2 | ||||
-rw-r--r-- | src/util.c | 4 |
5 files changed, 9 insertions, 9 deletions
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 @@ int main(int argc, char** argv) { 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 @@ static void sig_handler(int sig) { /* 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; 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 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) { 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 { @@ -104,7 +104,7 @@ int log_reopen(char* log_file) { return log_fd != -1; } else #if defined(__ANDROID__) -#define _PATH_LOG "" /* dummy */ +#define _PATH_LOG "" /* unused */ log_fd = -1; #else { 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 @@ static int iface_allowed(struct irec** irecp, int if_index, union mysockaddr* ad #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; @@ -266,12 +266,12 @@ int hostname_isequal(char* a, char* b) { 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 |