@matheusbsbs / matheus-bagliano / commits / 7d200af27f

daemon: fix type of `max_connections`

The `max_connections` type tracks how many children git-daemon(1) would spawn at the same time. This value can be controlled via a command line switch: if given a positive value we'll set that up as the limit. But when given either zero or a negative value we don't enforce any limit at all. But even when being passed a negative value we won't actually store it, but normalize it to 0. Still, the variable used to store the config is using a signed integer, which causes warnings when comparing the number of accepted connections (`max_connections`) with the number of current connections being handled (`live_children`). Adapt the type of `max_connections` such that the types of both variables match. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Dec 6, 2024 at 11:27 UTC 7d200af27f41b8732dcb1a6c01ff73b7b7b0ecc1

1 file changed +5 -6

daemon.c

+5 -6

@@ -1,5 +1,4 @@

1 #define USE_THE_REPOSITORY_VARIABLE

2 -#define DISABLE_SIGN_COMPARE_WARNINGS

3 #include "git-compat-util.h"

4 #include "abspath.h"

@@ -801,8 +800,7 @@ static int addrcmp(const struct sockaddr_storage *s1,

800 return 0;

801 }

802

804 -static int max_connections = 32;

805 -

803 +static unsigned int max_connections = 32;

804 static unsigned int live_children;

805

806 static struct child {

@@ -1315,10 +1313,11 @@ int cmd_main(int argc, const char **argv)

1313 continue;

1314 }

1315 if (skip_prefix(arg, "--max-connections=", &v)) {

1318 - if (strtol_i(v, 10, &max_connections))

1316 + int parsed_value;

1317 + if (strtol_i(v, 10, &parsed_value))

1318 die(_("invalid max-connections '%s', expecting an integer"), v);

1320 - if (max_connections < 0)

1321 - max_connections = 0; /* unlimited */

1319 + /* A negative value indicates unlimited children. */

1320 + max_connections = parsed_value < 0 ? 0 : parsed_value;

1321 continue;

1322 }

1323 if (!strcmp(arg, "--strict-paths")) {