undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon.c: refactor hostinfo_init() to HOSTINFO_INIT macro

Browse Source 
Remove the hostinfo_init() function added in 01cec54e13 (daemon:
deglobalize hostname information, 2015-03-07) and instead initialize
the "struct hostinfo" with a macro.

This is the more idiomatic pattern in the codebase, and doesn't leave
us wondering when we see the *_init() function if this struct needs
more complex initialization than a macro can provide.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-09-27 14:58:41 +02:00 committed by Junio C Hamano
parent a30321b9ea
commit 6e54a32468
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
daemon.c
View File

@ -63,6 +63,12 @@ struct hostinfo {
unsigned int hostname_lookup_done:1;
unsigned int saw_extended_args:1;
};
#define HOSTINFO_INIT { \
.hostname = STRBUF_INIT, \
.canon_hostname = STRBUF_INIT, \
.ip_address = STRBUF_INIT, \
.tcp_port = STRBUF_INIT, \
}
static void lookup_hostname(struct hostinfo *hi);
@ -727,15 +733,6 @@ static void lookup_hostname(struct hostinfo *hi)
}
}
static void hostinfo_init(struct hostinfo *hi)
{
memset(hi, 0, sizeof(*hi));
strbuf_init(&hi->hostname, 0);
strbuf_init(&hi->canon_hostname, 0);
strbuf_init(&hi->ip_address, 0);
strbuf_init(&hi->tcp_port, 0);
}
static void hostinfo_clear(struct hostinfo *hi)
{
strbuf_release(&hi->hostname);
@ -760,11 +757,9 @@ static int execute(void)
char *line = packet_buffer;
int pktlen, len, i;
char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
struct hostinfo hi;
struct hostinfo hi = HOSTINFO_INIT;
struct strvec env = STRVEC_INIT;
hostinfo_init(&hi);
if (addr)
loginfo("Connection from %s:%s", addr, port);