1
0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00

Fix options listing of pg_test_timing --cutoff

The new pg_test_timing --cutoff option (commit 0b096e379e) appeared
out of order in the documentation and the code.  Fix that.
This commit is contained in:
Peter Eisentraut
2026-06-25 07:39:59 +02:00
parent 4abf411e23
commit 3277e69b8e
2 changed files with 36 additions and 36 deletions

View File

@@ -62,19 +62,6 @@ PostgreSQL documentation
<variablelist>
<varlistentry>
<term><option>-d <replaceable class="parameter">duration</replaceable></option></term>
<term><option>--duration=<replaceable class="parameter">duration</replaceable></option></term>
<listitem>
<para>
Specifies the test duration, in seconds. Longer durations
give slightly better accuracy, and are more likely to discover
problems with the system clock moving backwards. The default
test duration is 3 seconds.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-c <replaceable class="parameter">cutoff</replaceable></option></term>
<term><option>--cutoff=<replaceable class="parameter">cutoff</replaceable></option></term>
@@ -90,6 +77,19 @@ PostgreSQL documentation
</listitem>
</varlistentry>
<varlistentry>
<term><option>-d <replaceable class="parameter">duration</replaceable></option></term>
<term><option>--duration=<replaceable class="parameter">duration</replaceable></option></term>
<listitem>
<para>
Specifies the test duration, in seconds. Longer durations
give slightly better accuracy, and are more likely to discover
problems with the system clock moving backwards. The default
test duration is 3 seconds.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-V</option></term>
<term><option>--version</option></term>

View File

@@ -62,8 +62,8 @@ static void
handle_args(int argc, char *argv[])
{
static struct option long_options[] = {
{"duration", required_argument, NULL, 'd'},
{"cutoff", required_argument, NULL, 'c'},
{"duration", required_argument, NULL, 'd'},
{NULL, 0, NULL, 0}
};
@@ -76,7 +76,7 @@ handle_args(int argc, char *argv[])
{
if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
{
printf(_("Usage: %s [-d DURATION] [-c CUTOFF]\n"), progname);
printf(_("Usage: %s [-c CUTOFF] [-d DURATION]\n"), progname);
exit(0);
}
if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
@@ -86,11 +86,31 @@ handle_args(int argc, char *argv[])
}
}
while ((option = getopt_long(argc, argv, "d:c:",
while ((option = getopt_long(argc, argv, "c:d:",
long_options, &optindex)) != -1)
{
switch (option)
{
case 'c':
errno = 0;
max_rprct = strtod(optarg, &endptr);
if (endptr == optarg || *endptr != '\0' || errno != 0)
{
fprintf(stderr, _("%s: invalid argument for option %s\n"),
progname, "--cutoff");
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
if (max_rprct < 0 || max_rprct > 100)
{
fprintf(stderr, _("%s: %s must be in range %u..%u\n"),
progname, "--cutoff", 0, 100);
exit(1);
}
break;
case 'd':
errno = 0;
optval = strtoul(optarg, &endptr, 10);
@@ -113,26 +133,6 @@ handle_args(int argc, char *argv[])
}
break;
case 'c':
errno = 0;
max_rprct = strtod(optarg, &endptr);
if (endptr == optarg || *endptr != '\0' || errno != 0)
{
fprintf(stderr, _("%s: invalid argument for option %s\n"),
progname, "--cutoff");
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
if (max_rprct < 0 || max_rprct > 100)
{
fprintf(stderr, _("%s: %s must be in range %u..%u\n"),
progname, "--cutoff", 0, 100);
exit(1);
}
break;
default:
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);