summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-24 19:20:58 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-24 19:20:59 -0700
commit0c544a22f9297b305949bd77f15183aa8fffd8fc (patch)
treee27dd3a877d391d79031596138d513c0eb6674a1 /daemon.c
parent1762224ddb599ab14ca26cedafec39dee9b92fe5 (diff)
parentd3c9cf32ca3b088fda54e7be311860f1f06fb11e (diff)
downloadgit-0c544a22f9297b305949bd77f15183aa8fffd8fc.tar.gz
Merge branch 'sb/misc-fixes'
Assorted code cleanups and a minor fix. * sb/misc-fixes: diff.c: Do not initialize a variable, which gets reassigned anyway. commit: Fix a memory leak in determine_author_info daemon.c:handle: Remove unneeded check for null pointer.
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon.c b/daemon.c
index 973ec38faf..34916c5e10 100644
--- a/daemon.c
+++ b/daemon.c
@@ -760,7 +760,7 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
snprintf(portbuf, sizeof(portbuf), "REMOTE_PORT=%d",
ntohs(sin_addr->sin_port));
#ifndef NO_IPV6
- } else if (addr && addr->sa_family == AF_INET6) {
+ } else if (addr->sa_family == AF_INET6) {
struct sockaddr_in6 *sin6_addr = (void *) addr;
char *buf = addrbuf + 12;