summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2008-11-23 00:19:09 +0100
committerJunio C Hamano <gitster@pobox.com>2008-11-23 19:56:26 -0800
commitd433ed0bb49b947e3bb05d6474cf328c75ffa57d (patch)
tree4a22b841c565d27ef336049b2adc996941edee5b /daemon.c
parent9d7ca667466b9e1a8160d20cce7c06d09213ab6b (diff)
downloadgit-d433ed0bb49b947e3bb05d6474cf328c75ffa57d.tar.gz
daemon: inline fill_in_extra_table_entries()
Having fill_in_extra_table_entries() as a separate function has no advantage -- a function with no parameters and return values might as well be an anonymous block of code. Its name still refers to the table of interpolate() which has been removed earlier, so it's better to inline it at its only call site. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/daemon.c b/daemon.c
index 64f60c431b..fbf61ca4d5 100644
--- a/daemon.c
+++ b/daemon.c
@@ -414,6 +414,7 @@ static void parse_extra_args(char *extra_args, int buflen)
char *val;
int vallen;
char *end = extra_args + buflen;
+ char *hp;
while (extra_args < end && *extra_args) {
saw_extended_args = 1;
@@ -438,11 +439,6 @@ static void parse_extra_args(char *extra_args, int buflen)
extra_args = val + vallen;
}
}
-}
-
-static void fill_in_extra_table_entries(void)
-{
- char *hp;
/*
* Replace literal host with lowercase-ized hostname.
@@ -562,10 +558,8 @@ static int execute(struct sockaddr *addr)
free(directory);
hostname = canon_hostname = ip_address = tcp_port = directory = NULL;
- if (len != pktlen) {
+ if (len != pktlen)
parse_extra_args(line + len + 1, pktlen - len - 1);
- fill_in_extra_table_entries();
- }
for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
struct daemon_service *s = &(daemon_service[i]);