From: Willy Tarreau Date: Wed, 21 May 2025 12:55:24 +0000 (+0200) Subject: CLEANUP: cfgparse: alphabetically sort the global keywords X-Git-Tag: v3.2-dev17~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eee57b4d3f34bc304727f77df750b467305dd2f3;p=thirdparty%2Fhaproxy.git CLEANUP: cfgparse: alphabetically sort the global keywords The global keywords table was no longer sorted at all, let's fix it to ease spotting the searched ones. --- diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c index 2221ea2b9..08d9cc3f0 100644 --- a/src/cfgparse-global.c +++ b/src/cfgparse-global.c @@ -1742,55 +1742,55 @@ static int cfg_parse_global_stress_level(char **args, int section_type, struct p } static struct cfg_kw_list cfg_kws = {ILH, { - { CFG_GLOBAL, "prealloc-fd", cfg_parse_prealloc_fd }, + { CFG_GLOBAL, "chroot", cfg_parse_global_chroot }, + { CFG_GLOBAL, "daemon", cfg_parse_global_mode, KWF_DISCOVERY } , + { CFG_GLOBAL, "expose-deprecated-directives", cfg_parse_global_non_std_directives, KWF_DISCOVERY }, + { CFG_GLOBAL, "expose-experimental-directives", cfg_parse_global_non_std_directives }, { CFG_GLOBAL, "force-cfg-parser-pause", cfg_parse_global_parser_pause, KWF_EXPERIMENTAL }, - { CFG_GLOBAL, "harden.reject-privileged-ports.tcp", cfg_parse_reject_privileged_ports }, { CFG_GLOBAL, "harden.reject-privileged-ports.quic", cfg_parse_reject_privileged_ports }, + { CFG_GLOBAL, "harden.reject-privileged-ports.tcp", cfg_parse_reject_privileged_ports }, + { CFG_GLOBAL, "localpeer", cfg_parse_global_localpeer, KWF_DISCOVERY }, { CFG_GLOBAL, "master-worker", cfg_parse_global_master_worker, KWF_DISCOVERY }, - { CFG_GLOBAL, "daemon", cfg_parse_global_mode, KWF_DISCOVERY } , - { CFG_GLOBAL, "quiet", cfg_parse_global_mode, KWF_DISCOVERY }, - { CFG_GLOBAL, "zero-warning", cfg_parse_global_mode, KWF_DISCOVERY }, + { CFG_GLOBAL, "nbproc", cfg_parse_global_unsupported_opts }, { CFG_GLOBAL, "noepoll", cfg_parse_global_disable_poller, KWF_DISCOVERY }, - { CFG_GLOBAL, "nokqueue", cfg_parse_global_disable_poller, KWF_DISCOVERY }, { CFG_GLOBAL, "noevports", cfg_parse_global_disable_poller, KWF_DISCOVERY }, + { CFG_GLOBAL, "nokqueue", cfg_parse_global_disable_poller, KWF_DISCOVERY }, { CFG_GLOBAL, "nopoll", cfg_parse_global_disable_poller, KWF_DISCOVERY }, { CFG_GLOBAL, "pidfile", cfg_parse_global_pidfile, KWF_DISCOVERY }, - { CFG_GLOBAL, "expose-deprecated-directives", cfg_parse_global_non_std_directives, KWF_DISCOVERY }, - { CFG_GLOBAL, "expose-experimental-directives", cfg_parse_global_non_std_directives }, - { CFG_GLOBAL, "tune.runqueue-depth", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.maxpollevents", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "prealloc-fd", cfg_parse_prealloc_fd }, + { CFG_GLOBAL, "presetenv", cfg_parse_global_env_opts, KWF_DISCOVERY }, + { CFG_GLOBAL, "quiet", cfg_parse_global_mode, KWF_DISCOVERY }, + { CFG_GLOBAL, "resetenv", cfg_parse_global_env_opts, KWF_DISCOVERY }, + { CFG_GLOBAL, "setenv", cfg_parse_global_env_opts, KWF_DISCOVERY }, + { CFG_GLOBAL, "stress-level", cfg_parse_global_stress_level }, + { CFG_GLOBAL, "tune.bufsize", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.chksize", cfg_parse_global_unsupported_opts }, + { CFG_GLOBAL, "tune.comp.maxlevel", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.disable-fast-forward", cfg_parse_global_tune_forward_opts }, + { CFG_GLOBAL, "tune.disable-zero-copy-forwarding", cfg_parse_global_tune_forward_opts }, + { CFG_GLOBAL, "tune.http.cookielen", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.http.logurilen", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.http.maxhdr", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.idletimer", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.max-rules-at-once", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.maxaccept", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.recv_enough", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.bufsize", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.maxpollevents", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.maxrewrite", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.idletimer", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.renice.startup", cfg_parse_tune_renice }, - { CFG_GLOBAL, "tune.renice.runtime", cfg_parse_tune_renice }, + { CFG_GLOBAL, "tune.notsent-lowat.client", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.notsent-lowat.server", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.pattern.cache-size", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.pipesize", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.rcvbuf.client", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.rcvbuf.server", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.recv_enough", cfg_parse_global_tune_opts }, + { CFG_GLOBAL, "tune.renice.runtime", cfg_parse_tune_renice }, + { CFG_GLOBAL, "tune.renice.startup", cfg_parse_tune_renice }, + { CFG_GLOBAL, "tune.runqueue-depth", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.sndbuf.client", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.sndbuf.server", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.notsent-lowat.client", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.notsent-lowat.server", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.pipesize", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.http.cookielen", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.http.logurilen", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.http.maxhdr", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.comp.maxlevel", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.pattern.cache-size", cfg_parse_global_tune_opts }, { CFG_GLOBAL, "tune.takeover-other-tg-connections", cfg_parse_global_tune_opts }, - { CFG_GLOBAL, "tune.disable-fast-forward", cfg_parse_global_tune_forward_opts }, - { CFG_GLOBAL, "tune.disable-zero-copy-forwarding", cfg_parse_global_tune_forward_opts }, - { CFG_GLOBAL, "tune.chksize", cfg_parse_global_unsupported_opts }, - { CFG_GLOBAL, "nbproc", cfg_parse_global_unsupported_opts }, - { CFG_GLOBAL, "setenv", cfg_parse_global_env_opts, KWF_DISCOVERY }, { CFG_GLOBAL, "unsetenv", cfg_parse_global_env_opts, KWF_DISCOVERY }, - { CFG_GLOBAL, "resetenv", cfg_parse_global_env_opts, KWF_DISCOVERY }, - { CFG_GLOBAL, "presetenv", cfg_parse_global_env_opts, KWF_DISCOVERY }, - { CFG_GLOBAL, "chroot", cfg_parse_global_chroot }, - { CFG_GLOBAL, "localpeer", cfg_parse_global_localpeer, KWF_DISCOVERY }, - { CFG_GLOBAL, "stress-level", cfg_parse_global_stress_level }, + { CFG_GLOBAL, "zero-warning", cfg_parse_global_mode, KWF_DISCOVERY }, { 0, NULL, NULL }, }};