From e7f4caf3424b1a2f523f0092c12b4e48f65b963a Mon Sep 17 00:00:00 2001 From: lohhiiccc <96543753+lohhiiccc@users.noreply.github.com> Date: Mon, 16 Mar 2026 08:24:51 -0500 Subject: [PATCH] refactor: simplify FLAGS condition --- src/cli/parse.c | 7 ++++--- src/ping/output/packet.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cli/parse.c b/src/cli/parse.c index a314aa6..033ab6b 100644 --- a/src/cli/parse.c +++ b/src/cli/parse.c @@ -3,6 +3,7 @@ #include "cli.h" #include "internal/cli/messages.h" +#include "ping/ft_ping_flags.h" /* Map -? to -h to support help shortcut */ #define HANDLE_QUESTION_MARK(opt) \ @@ -77,15 +78,15 @@ handle_one_option(int opt, char **argv, void *config, if ('?' == opt) return error_unknown_opt(current_opt); - if (':' == opt) + else if (':' == opt) return error_invalid_opt(current_opt); desc = find_option_handler(opt, opts, nb_opts); bitmask_index = (size_t)(desc - opts); - if (*opt_tracker & (1ULL << bitmask_index)) + if (HAS_FLAG(*opt_tracker, (1ULL << bitmask_index))) return error_duplicate_opt(current_opt); - *opt_tracker |= (1ULL << bitmask_index); + SET_FLAG(*opt_tracker, (1ULL << bitmask_index)); res = desc->handler(optarg, config); if (CLI_SUCCESS != res) return error_invalid_opt(current_opt); diff --git a/src/ping/output/packet.c b/src/ping/output/packet.c index ad2a130..36568a1 100644 --- a/src/ping/output/packet.c +++ b/src/ping/output/packet.c @@ -10,7 +10,7 @@ ping_output_packet(const icmp_reply_t *reply, uint16_t seq, { char from_str[INET_ADDRSTRLEN]; - if (HAS_FLAG(config->flags, FLAG_QUIET) || HAS_FLAG(config->flags, FLAG_FLOOD)) + if (HAS_FLAG(config->flags, FLAG_QUIET | FLAG_FLOOD)) return; inet_ntop(AF_INET, &reply->from, from_str, sizeof(from_str)); printf("%zu bytes from %s: icmp_seq=%u ttl=%u time=%.3f ms\n",