From 836374b49abac7e35857b53bbf6f04e46e96c428 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 28 Jun 2025 23:38:03 +0200 Subject: [PATCH] Adhere to GNU Coding Style. * gettext-runtime/src/envsubst.c (main): Use common 'switch' indentation. * gettext-tools/src/hostname.c (main): Likewise. * gettext-tools/src/recode-sr-latin.c (main): Likewise. * gettext-tools/src/urlget.c (main): Likewise. * gettext-tools/tests/tstgettext.c (main): Likewise. * gettext-tools/tests/tstngettext.c (main): Likewise. --- gettext-runtime/src/envsubst.c | 30 +++++------ gettext-tools/src/hostname.c | 44 ++++++++-------- gettext-tools/src/recode-sr-latin.c | 24 ++++----- gettext-tools/src/urlget.c | 32 +++++------ gettext-tools/tests/tstgettext.c | 82 ++++++++++++++--------------- gettext-tools/tests/tstngettext.c | 58 ++++++++++---------- 6 files changed, 135 insertions(+), 135 deletions(-) diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c index e3db102f5..596c22131 100644 --- a/gettext-runtime/src/envsubst.c +++ b/gettext-runtime/src/envsubst.c @@ -88,21 +88,21 @@ main (int argc, char *argv[]) /* Parse command line options. */ while ((opt = getopt_long (argc, argv, "hvV", long_options, NULL)) != EOF) switch (opt) - { - case '\0': /* Long option. */ - break; - case 'h': - do_help = true; - break; - case 'v': - show_variables = true; - break; - case 'V': - do_version = true; - break; - default: - usage (EXIT_FAILURE); - } + { + case '\0': /* Long option. */ + break; + case 'h': + do_help = true; + break; + case 'v': + show_variables = true; + break; + case 'V': + do_version = true; + break; + default: + usage (EXIT_FAILURE); + } /* Version information is requested. */ if (do_version) diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c index ebd2ba4e8..bb3e59dac 100644 --- a/gettext-tools/src/hostname.c +++ b/gettext-tools/src/hostname.c @@ -160,28 +160,28 @@ main (int argc, char *argv[]) while ((optchar = getopt_long (argc, argv, "fhisV", long_options, NULL)) != EOF) switch (optchar) - { - case '\0': /* Long option. */ - break; - case 'f': - format = long_format; - break; - case 's': - format = short_format; - break; - case 'i': - format = ip_format; - break; - case 'h': - do_help = true; - break; - case 'V': - do_version = true; - break; - default: - usage (EXIT_FAILURE); - /* NOTREACHED */ - } + { + case '\0': /* Long option. */ + break; + case 'f': + format = long_format; + break; + case 's': + format = short_format; + break; + case 'i': + format = ip_format; + break; + case 'h': + do_help = true; + break; + case 'V': + do_version = true; + break; + default: + usage (EXIT_FAILURE); + /* NOTREACHED */ + } /* Version information requested. */ if (do_version) diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c index de636b632..50292ce97 100644 --- a/gettext-tools/src/recode-sr-latin.c +++ b/gettext-tools/src/recode-sr-latin.c @@ -85,18 +85,18 @@ main (int argc, char *argv[]) /* Parse command line options. */ while ((opt = getopt_long (argc, argv, "hV", long_options, NULL)) != EOF) switch (opt) - { - case '\0': /* Long option. */ - break; - case 'h': - do_help = true; - break; - case 'V': - do_version = true; - break; - default: - usage (EXIT_FAILURE); - } + { + case '\0': /* Long option. */ + break; + case 'h': + do_help = true; + break; + case 'V': + do_version = true; + break; + default: + usage (EXIT_FAILURE); + } /* Version information is requested. */ if (do_version) diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index 6cfd71059..c1ade19eb 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -114,22 +114,22 @@ main (int argc, char *argv[]) /* Parse command line options. */ while ((optchar = getopt_long (argc, argv, "hqV", long_options, NULL)) != EOF) switch (optchar) - { - case '\0': /* Long option. */ - break; - case 'h': /* --help */ - do_help = true; - break; - case 'q': /* --quiet / --silent */ - verbose = false; - break; - case 'V': /* --version */ - do_version = true; - break; - default: - usage (EXIT_FAILURE); - /* NOTREACHED */ - } + { + case '\0': /* Long option. */ + break; + case 'h': /* --help */ + do_help = true; + break; + case 'q': /* --quiet / --silent */ + verbose = false; + break; + case 'V': /* --version */ + do_version = true; + break; + default: + usage (EXIT_FAILURE); + /* NOTREACHED */ + } /* Version information requested. */ if (do_version) diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c index a90980eff..a0989dd2a 100644 --- a/gettext-tools/tests/tstgettext.c +++ b/gettext-tools/tests/tstgettext.c @@ -119,49 +119,49 @@ main (int argc, char *argv[]) while ((optchar = getopt_long (argc, argv, "+d:eEhnstV", long_options, NULL)) != EOF) switch (optchar) - { - case '\0': /* Long option. */ - break; - case 'd': - context.domain = optarg; - break; - case 'e': - context.do_expand = true; - break; - case 'E': - /* Ignore. Just for compatibility. */ - break; - case 'h': - do_help = true; - break; - case 'n': - context.inhibit_added_newline = true; - break; - case 's': - context.do_shell = true; - break; - case 't': - do_thread = true; - break; - case 'V': - do_version = true; - break; - case '=': { - /* Undocumented option --env sets an environment variable. */ - char *separator = strchr (optarg, '='); - if (separator != NULL) - { - *separator = '\0'; - xsetenv (optarg, separator + 1, 1); - environ_changed = true; - break; - } + case '\0': /* Long option. */ + break; + case 'd': + context.domain = optarg; + break; + case 'e': + context.do_expand = true; + break; + case 'E': + /* Ignore. Just for compatibility. */ + break; + case 'h': + do_help = true; + break; + case 'n': + context.inhibit_added_newline = true; + break; + case 's': + context.do_shell = true; + break; + case 't': + do_thread = true; + break; + case 'V': + do_version = true; + break; + case '=': + { + /* Undocumented option --env sets an environment variable. */ + char *separator = strchr (optarg, '='); + if (separator != NULL) + { + *separator = '\0'; + xsetenv (optarg, separator + 1, 1); + environ_changed = true; + break; + } + } + FALLTHROUGH; + default: + usage (EXIT_FAILURE); } - FALLTHROUGH; - default: - usage (EXIT_FAILURE); - } if (environ_changed) /* Set locale again via LC_ALL. */ diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c index 34c3d04d8..7af6c38cd 100644 --- a/gettext-tools/tests/tstngettext.c +++ b/gettext-tools/tests/tstngettext.c @@ -107,37 +107,37 @@ main (int argc, char *argv[]) while ((optchar = getopt_long (argc, argv, "+d:htV", long_options, NULL)) != EOF) switch (optchar) - { - case '\0': /* Long option. */ - break; - case 'd': - context.domain = optarg; - break; - case 'h': - do_help = true; - break; - case 't': - do_thread = true; - break; - case 'V': - do_version = true; - break; - case '=': { - /* Undocumented option --env sets an environment variable. */ - char *separator = strchr (optarg, '='); - if (separator != NULL) - { - *separator = '\0'; - xsetenv (optarg, separator + 1, 1); - environ_changed = true; - break; - } + case '\0': /* Long option. */ + break; + case 'd': + context.domain = optarg; + break; + case 'h': + do_help = true; + break; + case 't': + do_thread = true; + break; + case 'V': + do_version = true; + break; + case '=': + { + /* Undocumented option --env sets an environment variable. */ + char *separator = strchr (optarg, '='); + if (separator != NULL) + { + *separator = '\0'; + xsetenv (optarg, separator + 1, 1); + environ_changed = true; + break; + } + } + FALLTHROUGH; + default: + usage (EXIT_FAILURE); } - FALLTHROUGH; - default: - usage (EXIT_FAILURE); - } if (environ_changed) /* Set locale again via LC_ALL. */ -- 2.47.3