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>
René Scharfe committed
Nov 23, 2008 at 00:19 UTC
d433ed0bb49b947e3bb05d6474cf328c75ffa57d
1 file changed
+2
-8
daemon.c
+2
-8
@@ -414,6 +414,7 @@ static void parse_extra_args(char *extra_args, int buflen)
414
char *val;
415
int vallen;
416
char *end = extra_args + buflen;
417
+ char *hp;
418
419
while (extra_args < end && *extra_args) {
420
saw_extended_args = 1;
@@ -438,11 +439,6 @@ static void parse_extra_args(char *extra_args, int buflen)
439
extra_args = val + vallen;
440
}
441
}
441
-}
442
-
443
-static void fill_in_extra_table_entries(void)
444
-{
445
- char *hp;
442
443
/*
444
* Replace literal host with lowercase-ized hostname.
@@ -562,10 +558,8 @@ static int execute(struct sockaddr *addr)
558
free(directory);
559
hostname = canon_hostname = ip_address = tcp_port = directory = NULL;
560
565
- if (len != pktlen) {
561
+ if (len != pktlen)
562
parse_extra_args(line + len + 1, pktlen - len - 1);
567
- fill_in_extra_table_entries();
568
- }
563
564
for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
565
struct daemon_service *s = &(daemon_service[i]);