* [PATCH] tools: Fix recevied/received typos
@ 2016-07-28 16:21 Mat Martineau
2016-07-29 11:11 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 3+ messages in thread
From: Mat Martineau @ 2016-07-28 16:21 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Mat Martineau
---
While fixing this, I noticed that ubcsp.{c,h} are the only source files
without proper Unix line endings. It's an easy fix but a lot of
churn. Let me know if I should submit a patch for that.
Mat
---
tools/l2test.c | 2 +-
tools/scotest.c | 2 +-
tools/ubcsp.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/l2test.c b/tools/l2test.c
index d4e3ae6..1819423 100644
--- a/tools/l2test.c
+++ b/tools/l2test.c
@@ -830,7 +830,7 @@ static void dump_mode(int sk)
return;
}
- syslog(LOG_INFO, "Recevied %d bytes", len);
+ syslog(LOG_INFO, "Received %d bytes", len);
hexdump(buf, len);
}
}
diff --git a/tools/scotest.c b/tools/scotest.c
index 596e403..f894c24 100644
--- a/tools/scotest.c
+++ b/tools/scotest.c
@@ -265,7 +265,7 @@ static void dump_mode(int sk)
syslog(LOG_INFO,"Receiving ...");
while ((len = read(sk, buf, data_size)) > 0)
- syslog(LOG_INFO, "Recevied %d bytes", len);
+ syslog(LOG_INFO, "Received %d bytes", len);
}
static void recv_mode(int sk)
diff --git a/tools/ubcsp.c b/tools/ubcsp.c
index b3f883a..cd17d48 100644
--- a/tools/ubcsp.c
+++ b/tools/ubcsp.c
@@ -351,14 +351,14 @@ bad_match_loop:
/*****************************************************************************/
/** **/
-/** ubcsp_recevied_packet **/
+/** ubcsp_received_packet **/
/** **/
/** This function is called when we have a SLIP END octet and a full **/
/** packet header and possibly data in the receive packet **/
/** **/
/*****************************************************************************/
-static uint8 ubcsp_recevied_packet (void)
+static uint8 ubcsp_received_packet (void)
{
static uint8
receive_crc,
@@ -1107,7 +1107,7 @@ uint8 ubcsp_poll (uint8 *activity)
{
/* process the received packet */
- *activity |= ubcsp_recevied_packet ();
+ *activity |= ubcsp_received_packet ();
if (*activity & UBCSP_PACKET_ACK)
{
--
2.9.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tools: Fix recevied/received typos
2016-07-28 16:21 [PATCH] tools: Fix recevied/received typos Mat Martineau
@ 2016-07-29 11:11 ` Luiz Augusto von Dentz
2016-07-29 16:42 ` Mat Martineau
0 siblings, 1 reply; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2016-07-29 11:11 UTC (permalink / raw)
To: Mat Martineau; +Cc: linux-bluetooth@vger.kernel.org
Hi Mat,
On Thu, Jul 28, 2016 at 7:21 PM, Mat Martineau
<mathew.j.martineau@linux.intel.com> wrote:
> ---
>
> While fixing this, I noticed that ubcsp.{c,h} are the only source files
> without proper Unix line endings. It's an easy fix but a lot of
> churn. Let me know if I should submit a patch for that.
>
> Mat
>
> ---
> tools/l2test.c | 2 +-
> tools/scotest.c | 2 +-
> tools/ubcsp.c | 6 +++---
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tools/l2test.c b/tools/l2test.c
> index d4e3ae6..1819423 100644
> --- a/tools/l2test.c
> +++ b/tools/l2test.c
> @@ -830,7 +830,7 @@ static void dump_mode(int sk)
> return;
> }
>
> - syslog(LOG_INFO, "Recevied %d bytes", len);
> + syslog(LOG_INFO, "Received %d bytes", len);
> hexdump(buf, len);
> }
> }
> diff --git a/tools/scotest.c b/tools/scotest.c
> index 596e403..f894c24 100644
> --- a/tools/scotest.c
> +++ b/tools/scotest.c
> @@ -265,7 +265,7 @@ static void dump_mode(int sk)
>
> syslog(LOG_INFO,"Receiving ...");
> while ((len = read(sk, buf, data_size)) > 0)
> - syslog(LOG_INFO, "Recevied %d bytes", len);
> + syslog(LOG_INFO, "Received %d bytes", len);
> }
>
> static void recv_mode(int sk)
> diff --git a/tools/ubcsp.c b/tools/ubcsp.c
> index b3f883a..cd17d48 100644
> --- a/tools/ubcsp.c
> +++ b/tools/ubcsp.c
> @@ -351,14 +351,14 @@ bad_match_loop:
>
> /*****************************************************************************/
> /** **/
> -/** ubcsp_recevied_packet **/
> +/** ubcsp_received_packet **/
> /** **/
> /** This function is called when we have a SLIP END octet and a full **/
> /** packet header and possibly data in the receive packet **/
> /** **/
> /*****************************************************************************/
>
> -static uint8 ubcsp_recevied_packet (void)
> +static uint8 ubcsp_received_packet (void)
> {
> static uint8
> receive_crc,
> @@ -1107,7 +1107,7 @@ uint8 ubcsp_poll (uint8 *activity)
> {
> /* process the received packet */
>
> - *activity |= ubcsp_recevied_packet ();
> + *activity |= ubcsp_received_packet ();
>
> if (*activity & UBCSP_PACKET_ACK)
> {
> --
> 2.9.2
Doesn't apply:
Applying: tools: Fix recevied/received typos
error: patch failed: tools/ubcsp.c:351
error: tools/ubcsp.c: patch does not apply
Patch failed at 0002 tools: Fix recevied/received typos
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tools: Fix recevied/received typos
2016-07-29 11:11 ` Luiz Augusto von Dentz
@ 2016-07-29 16:42 ` Mat Martineau
0 siblings, 0 replies; 3+ messages in thread
From: Mat Martineau @ 2016-07-29 16:42 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth@vger.kernel.org
On Fri, 29 Jul 2016, Luiz Augusto von Dentz wrote:
> Doesn't apply:
>
> Applying: tools: Fix recevied/received typos
> error: patch failed: tools/ubcsp.c:351
> error: tools/ubcsp.c: patch does not apply
> Patch failed at 0002 tools: Fix recevied/received typos
That's a surprise. Turns out it's an issue with the CRLF line endings in
ubcsp.c, and there's nothing to be done about it on the git format-patch /
git send-email side.
Please use 'git am --keep-cr' to apply the patch.
Maybe converting ubscp.{h,c} to Unix line endings is worth it after all.
What do you think?
--
Mat Martineau
Intel OTC
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-29 16:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-28 16:21 [PATCH] tools: Fix recevied/received typos Mat Martineau
2016-07-29 11:11 ` Luiz Augusto von Dentz
2016-07-29 16:42 ` Mat Martineau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox