Hello, find attached a trivial patch fixing two typos.
cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
>From c1c175ec392986c9e8a6de0cc9f3e96b161ec33d Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Fri, 4 Mar 2016 19:59:08 +0100 Subject: [PATCH] Typo fixes supresses and formated Also rename $formated_time perl variable to $formatted_time for consistency. --- doc/doc-docbook/spec.xfpt | 2 +- src/src/deliver.c | 6 +++--- src/src/eximstats.src | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index a67f486..05e65b3 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -3153,7 +3153,7 @@ settings can be obtained by using &%routers%&, &%transports%&, or .cindex "environment" If &%environment%& is given as an argument, the set of environment -variables is output, line by line. Using the &%-n%& flag supresses the value of the +variables is output, line by line. Using the &%-n%& flag suppresses the value of the variables. .cindex "options" "macro &-- extracting" diff --git a/src/src/deliver.c b/src/src/deliver.c index e588ee4..9066a14 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -6953,7 +6953,7 @@ if (addr_senddsn) if (auth_xtextdecode(dsn_envid, &xdec_envid) > 0) fprintf(f, "Original-Envelope-ID: %s\n", dsn_envid); else - fprintf(f, "X-Original-Envelope-ID: error decoding xtext formated ENVID\n"); + fprintf(f, "X-Original-Envelope-ID: error decoding xtext formatted ENVID\n"); } fputc('\n', f); @@ -7339,7 +7339,7 @@ wording. */ if (auth_xtextdecode(dsn_envid, &xdec_envid) > 0) fprintf(f, "Original-Envelope-ID: %s\n", dsn_envid); else - fprintf(f, "X-Original-Envelope-ID: error decoding xtext formated ENVID\n"); + fprintf(f, "X-Original-Envelope-ID: error decoding xtext formatted ENVID\n"); } fputc('\n', f); @@ -7872,7 +7872,7 @@ else if (addr_defer != (address_item *)(+1)) if (auth_xtextdecode(dsn_envid, &xdec_envid) > 0) fprintf(f,"Original-Envelope-ID: %s\n", dsn_envid); else - fprintf(f,"X-Original-Envelope-ID: error decoding xtext formated ENVID\n"); + fprintf(f,"X-Original-Envelope-ID: error decoding xtext formatted ENVID\n"); } fputc('\n', f); diff --git a/src/src/eximstats.src b/src/src/eximstats.src index 4370b4e..2369ec3 100644 --- a/src/src/eximstats.src +++ b/src/src/eximstats.src @@ -757,7 +757,7 @@ sub volume_rounded { } else { # We don't want any rounding to be done. - # and we don't need broken formated output which on one hand avoids numbers from + # and we don't need broken formatted output which on one hand avoids numbers from # being interpreted as string by Spreadsheed Calculators, on the other hand # breaks if more than 4 digits! -> flexible length instead of fixed length # Format the return value at the output routine! -fh @@ -871,10 +871,10 @@ $p; # Eg 3h20m5s => 12005 ####################################################################### sub unformat_time { - my($formated_time) = pop @_; + my($formatted_time) = pop @_; my $time = 0; - while ($formated_time =~ s/^(\d+)([wdhms]?)//) { + while ($formatted_time =~ s/^(\d+)([wdhms]?)//) { $time += $1 if ($2 eq '' || $2 eq 's'); $time += $1 * 60 if ($2 eq 'm'); $time += $1 * 60 * 60 if ($2 eq 'h'); @@ -3360,8 +3360,8 @@ sub parse_old_eximstat_reports { my $previous_seconds_on_queue = 0; if (/^\s*(Under|Over|)\s+(\d+[smhdw])\s+(\d+)/) { print STDERR "Parsing $_" if $debug; - my($modifier,$formated_time,$count) = ($1,$2,$3); - my $seconds = unformat_time($formated_time); + my($modifier,$formatted_time,$count) = ($1,$2,$3); + my $seconds = unformat_time($formatted_time); my $time_on_queue = ($seconds + $previous_seconds_on_queue) / 2; $previous_seconds_on_queue = $seconds; $time_on_queue = $seconds * 2 if ($modifier eq 'Over'); -- 2.7.0
-- ## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim details at http://www.exim.org/ ##
