From: jeremie.galarneau@efficios.com (Jérémie Galarneau)
Subject: [lttng-dev] [PATCH lttng-tools] Typo: catched -> caught
Date: Wed, 20 Apr 2016 16:11:39 -0400 [thread overview]
Message-ID: <CA+jJMxu_9UXOSD+b_mj78oQEkS-qtwM12WR9=WRQkX=YRwabyQ@mail.gmail.com> (raw)
In-Reply-To: <1461098095-17631-1-git-send-email-mjeanson@efficios.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2537 bytes --]
Merged in master, stable-2.8 and stable-2.7. Thanks!
Jérémie
On Tue, Apr 19, 2016 at 4:34 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> src/bin/lttng-consumerd/lttng-consumerd.c | 2 +-
> src/common/consumer/consumer.c | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
> index 87ffb05..00660fc 100644
> --- a/src/bin/lttng-consumerd/lttng-consumerd.c
> +++ b/src/bin/lttng-consumerd/lttng-consumerd.c
> @@ -101,7 +101,7 @@ static void sighandler(int sig)
>
> /*
> * Ignore SIGPIPE because it should not stop the consumer whenever a
> - * SIGPIPE is catched through a FD operation.
> + * SIGPIPE is caught through a FD operation.
> */
> if (sig == SIGPIPE) {
> return;
> diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
> index d57271c..cb05a1e 100644
> --- a/src/common/consumer/consumer.c
> +++ b/src/common/consumer/consumer.c
> @@ -2261,10 +2261,10 @@ restart:
> DBG("Metadata poll return from wait with %d fd(s)",
> LTTNG_POLL_GETNB(&events));
> health_poll_exit();
> - DBG("Metadata event catched in thread");
> + DBG("Metadata event caught in thread");
> if (ret < 0) {
> if (errno == EINTR) {
> - ERR("Poll EINTR catched");
> + ERR("Poll EINTR caught");
> goto restart;
> }
> if (LTTNG_POLL_GETNB(&events) == 0) {
> @@ -2844,10 +2844,10 @@ restart:
> DBG("Channel poll return from wait with %d fd(s)",
> LTTNG_POLL_GETNB(&events));
> health_poll_exit();
> - DBG("Channel event catched in thread");
> + DBG("Channel event caught in thread");
> if (ret < 0) {
> if (errno == EINTR) {
> - ERR("Poll EINTR catched");
> + ERR("Poll EINTR caught");
> goto restart;
> }
> if (LTTNG_POLL_GETNB(&events) == 0) {
> --
> 2.7.4
>
--
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
prev parent reply other threads:[~2016-04-20 20:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-19 20:34 Michael Jeanson
2016-04-20 20:11 ` Jérémie Galarneau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+jJMxu_9UXOSD+b_mj78oQEkS-qtwM12WR9=WRQkX=YRwabyQ@mail.gmail.com' \
--to=jeremie.galarneau@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox