From 841524153fbdcd377065e221e91ef163d83b9cc9 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 27 Dec 2022 15:02:44 +0100 Subject: [PATCH] Replace custom min macro and use more C99 style in man_remote_entry_get Signed-off-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <20221227140249.3524943-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25830.html Signed-off-by: Gert Doering --- src/openvpn/manage.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index be9a38952..7e326702f 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -865,8 +865,6 @@ man_remote_entry_count(struct management *man) } } -#define min(a, b) ((a) < (b) ? (a) : (b)) - static void man_remote_entry_get(struct management *man, const char *p1, const char *p2) { @@ -875,12 +873,10 @@ man_remote_entry_get(struct management *man, const char *p1, const char *p2) if (man->persist.callback.remote_entry_get && man->persist.callback.remote_entry_count) { - bool res; - unsigned int from, to; unsigned int count = (*man->persist.callback.remote_entry_count)(man->persist.callback.arg); - from = (unsigned int) atoi(p1); - to = p2 ? (unsigned int) atoi(p2) : from + 1; + unsigned int from = (unsigned int) atoi(p1); + unsigned int to = p2 ? (unsigned int) atoi(p2) : from + 1; if (!strcmp(p1, "all")) { @@ -888,10 +884,10 @@ man_remote_entry_get(struct management *man, const char *p1, const char *p2) to = count; } - for (unsigned int i = from; i < min(to, count); i++) + for (unsigned int i = from; i < min_uint(to, count); i++) { char *remote = NULL; - res = (*man->persist.callback.remote_entry_get)(man->persist.callback.arg, i, &remote); + bool res = (*man->persist.callback.remote_entry_get)(man->persist.callback.arg, i, &remote); if (res && remote) { msg(M_CLIENT, "%u,%s", i, remote); -- 2.47.2