From 79775fa4998e3129d4f822d38ca82da832542448 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 27 May 2022 09:57:31 +0200 Subject: [PATCH] DEV: flags: use "sc" for stream conns instead of "cs" "cs" used to stand for "conn_stream" while these objects are now called "stream connectors", "stconn" or "sc". Let's just use "sc" here. --- dev/flags/README | 2 +- dev/flags/flags.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/flags/README b/dev/flags/README index 7693c74db..f3730c70e 100644 --- a/dev/flags/README +++ b/dev/flags/README @@ -7,6 +7,6 @@ command line, either with values coming from stdin with "-" passed alone instead of the value. It is possible to restrict the decoding to certain fields only by -specifying one of "ana", "chn", "conn", "cs", "si", "sierr", "strm", +specifying one of "ana", "chn", "conn", "sc", "si", "sierr", "strm", "task", or "txn" before the value. diff --git a/dev/flags/flags.c b/dev/flags/flags.c index 5ba10a510..6879ecb2c 100644 --- a/dev/flags/flags.c +++ b/dev/flags/flags.c @@ -12,7 +12,7 @@ #define SHOW_AS_ANA 0x00000001 #define SHOW_AS_CHN 0x00000002 #define SHOW_AS_CONN 0x00000004 -#define SHOW_AS_CS 0x00000008 +#define SHOW_AS_SC 0x00000008 #define SHOW_AS_SET 0x00000010 #define SHOW_AS_STRM 0x00000020 #define SHOW_AS_TASK 0x00000040 @@ -21,7 +21,7 @@ // command line names, must be in exact same order as the SHOW_AS_* flags above // so that show_as_words[i] matches flag 1U<flags = "); + printf("sc->flags = "); if (!f) { printf("0\n"); return; @@ -408,7 +408,7 @@ void show_strm_flags(unsigned int f) void usage_exit(const char *name) { - fprintf(stderr, "Usage: %s [ana|chn|conn|cs|si|sierr|strm|task|txn]* { [+-][0x]value* | - }\n", name); + fprintf(stderr, "Usage: %s [ana|chn|conn|sc|si|sierr|strm|task|txn]* { [+-][0x]value* | - }\n", name); exit(1); } @@ -477,7 +477,7 @@ int main(int argc, char **argv) if (show_as & SHOW_AS_ANA) show_chn_ana(flags); if (show_as & SHOW_AS_CHN) show_chn_flags(flags); if (show_as & SHOW_AS_CONN) show_conn_flags(flags); - if (show_as & SHOW_AS_CS) show_cs_flags(flags); + if (show_as & SHOW_AS_SC) show_sc_flags(flags); if (show_as & SHOW_AS_ENDP) show_endp_flags(flags); if (show_as & SHOW_AS_SET) show_strm_et(flags); if (show_as & SHOW_AS_STRM) show_strm_flags(flags);