[Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Stefan Weil]

* it's -> its
* grammar fix in ui/vnc-enc-zywrle.h

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

This is v3 of http://patchwork.ozlabs.org/patch/257416/.

v3:
Don't try to improve a strange sentence in the same context ("Of cause [...]").

 qapi-schema.json    |    2 +-
 slirp/if.c          |    2 +-
 ui/vnc-enc-zywrle.h |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index 60f3fd1..a003aa1 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1914,7 +1914,7 @@
 #
 # Since: 0.14.0
 #
-# Notes: This command only exists as a stop-gap.  It's use is highly
+# Notes: This command only exists as a stop-gap.  Its use is highly
 #        discouraged.  The semantics of this command are not guaranteed.
 #
 #        Known limitations:
diff --git a/slirp/if.c b/slirp/if.c
index 87ca8a5..fb7acf8 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -142,7 +142,7 @@ diddit:
 
 /*
  * Send a packet
- * We choose a packet based on it's position in the output queues;
+ * We choose a packet based on its position in the output queues;
  * If there are packets on the fastq, they are sent FIFO, before
  * everything else.  Otherwise we choose the first packet from the
  * batchq and send it.  the next packet chosen will be from the session
diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h
index 1ff40b1..d436d58 100644
--- a/ui/vnc-enc-zywrle.h
+++ b/ui/vnc-enc-zywrle.h
@@ -305,7 +305,7 @@ static inline void harr(int8_t *px0, int8_t *px1)
    |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1
 
  In this method, H/L and X0/X1 is always same position.
- This lead us to more speed and less memory.
+ This leads us to more speed and less memory.
  Of cause, the result of both method is quite same
  because it's only difference that coefficient position.
 */
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Don Koch]

On 10/11/2013 03:34 PM, Stefan Weil wrote:
> * it's -> its
> * grammar fix in ui/vnc-enc-zywrle.h
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> 
> This is v3 of http://patchwork.ozlabs.org/patch/257416/.
> 
> v3:
> Don't try to improve a strange sentence in the same context ("Of cause [...]").
> 
>  qapi-schema.json    |    2 +-
>  slirp/if.c          |    2 +-
>  ui/vnc-enc-zywrle.h |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 60f3fd1..a003aa1 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -1914,7 +1914,7 @@
>  #
>  # Since: 0.14.0
>  #
> -# Notes: This command only exists as a stop-gap.  It's use is highly
> +# Notes: This command only exists as a stop-gap.  Its use is highly
>  #        discouraged.  The semantics of this command are not guaranteed.
>  #
>  #        Known limitations:
> diff --git a/slirp/if.c b/slirp/if.c
> index 87ca8a5..fb7acf8 100644
> --- a/slirp/if.c
> +++ b/slirp/if.c
> @@ -142,7 +142,7 @@ diddit:
>  
>  /*
>   * Send a packet
> - * We choose a packet based on it's position in the output queues;
> + * We choose a packet based on its position in the output queues;
>   * If there are packets on the fastq, they are sent FIFO, before
>   * everything else.  Otherwise we choose the first packet from the
>   * batchq and send it.  the next packet chosen will be from the session
> diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h
> index 1ff40b1..d436d58 100644
> --- a/ui/vnc-enc-zywrle.h
> +++ b/ui/vnc-enc-zywrle.h
> @@ -305,7 +305,7 @@ static inline void harr(int8_t *px0, int8_t *px1)
>     |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1
>  
>   In this method, H/L and X0/X1 is always same position.
> - This lead us to more speed and less memory.
> + This leads us to more speed and less memory.
>   Of cause, the result of both method is quite same
>   because it's only difference that coefficient position.
>  */
> 

Since you're in the neighborhood, this paragraph needs more fixes:

 In this method, H/L and X0/X1 is always in the same position.
 This leads us to more speed and less memory.
 Of course, the result of both methods is the same
 because the only difference is the coefficient position.

Thanks,
-d

Re: [Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Stefan Weil]

Am 11.10.2013 22:03, schrieb Don Koch:
> On 10/11/2013 03:34 PM, Stefan Weil wrote:
>> * it's -> its
>> * grammar fix in ui/vnc-enc-zywrle.h
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>
>> This is v3 of http://patchwork.ozlabs.org/patch/257416/.
>>
>> v3:
>> Don't try to improve a strange sentence in the same context ("Of cause [...]").
>>
>>  qapi-schema.json    |    2 +-
>>  slirp/if.c          |    2 +-
>>  ui/vnc-enc-zywrle.h |    2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/qapi-schema.json b/qapi-schema.json
>> index 60f3fd1..a003aa1 100644
>> --- a/qapi-schema.json
>> +++ b/qapi-schema.json
>> @@ -1914,7 +1914,7 @@
>>  #
>>  # Since: 0.14.0
>>  #
>> -# Notes: This command only exists as a stop-gap.  It's use is highly
>> +# Notes: This command only exists as a stop-gap.  Its use is highly
>>  #        discouraged.  The semantics of this command are not guaranteed.
>>  #
>>  #        Known limitations:
>> diff --git a/slirp/if.c b/slirp/if.c
>> index 87ca8a5..fb7acf8 100644
>> --- a/slirp/if.c
>> +++ b/slirp/if.c
>> @@ -142,7 +142,7 @@ diddit:
>>  
>>  /*
>>   * Send a packet
>> - * We choose a packet based on it's position in the output queues;
>> + * We choose a packet based on its position in the output queues;
>>   * If there are packets on the fastq, they are sent FIFO, before
>>   * everything else.  Otherwise we choose the first packet from the
>>   * batchq and send it.  the next packet chosen will be from the session
>> diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h
>> index 1ff40b1..d436d58 100644
>> --- a/ui/vnc-enc-zywrle.h
>> +++ b/ui/vnc-enc-zywrle.h
>> @@ -305,7 +305,7 @@ static inline void harr(int8_t *px0, int8_t *px1)
>>     |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1
>>  
>>   In this method, H/L and X0/X1 is always same position.
>> - This lead us to more speed and less memory.
>> + This leads us to more speed and less memory.
>>   Of cause, the result of both method is quite same
>>   because it's only difference that coefficient position.
>>  */
>>
> Since you're in the neighborhood, this paragraph needs more fixes:
>
>  In this method, H/L and X0/X1 is always in the same position.

Shouldn't it be "are always"? :-)

>  This leads us to more speed and less memory.
>  Of course, the result of both methods is the same
>  because the only difference is the coefficient position.
>
> Thanks,
> -d

Maybe. Please let us fix that in a later patch.
See also the previous discussion
(http://patchwork.ozlabs.org/patch/257416/).

Regards,
Stefan

Re: [Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Don Koch]

On 10/11/2013 04:08 PM, Stefan Weil wrote:
> Am 11.10.2013 22:03, schrieb Don Koch:
>> On 10/11/2013 03:34 PM, Stefan Weil wrote:
>>> * it's -> its
>>> * grammar fix in ui/vnc-enc-zywrle.h
>>>
>>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>>> ---
>>>
>>> This is v3 of http://patchwork.ozlabs.org/patch/257416/.
>>>
>>> v3:
>>> Don't try to improve a strange sentence in the same context ("Of cause [...]").
>>>
>>>  qapi-schema.json    |    2 +-
>>>  slirp/if.c          |    2 +-
>>>  ui/vnc-enc-zywrle.h |    2 +-
>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/qapi-schema.json b/qapi-schema.json
>>> index 60f3fd1..a003aa1 100644
>>> --- a/qapi-schema.json
>>> +++ b/qapi-schema.json
>>> @@ -1914,7 +1914,7 @@
>>>  #
>>>  # Since: 0.14.0
>>>  #
>>> -# Notes: This command only exists as a stop-gap.  It's use is highly
>>> +# Notes: This command only exists as a stop-gap.  Its use is highly
>>>  #        discouraged.  The semantics of this command are not guaranteed.
>>>  #
>>>  #        Known limitations:
>>> diff --git a/slirp/if.c b/slirp/if.c
>>> index 87ca8a5..fb7acf8 100644
>>> --- a/slirp/if.c
>>> +++ b/slirp/if.c
>>> @@ -142,7 +142,7 @@ diddit:
>>>  
>>>  /*
>>>   * Send a packet
>>> - * We choose a packet based on it's position in the output queues;
>>> + * We choose a packet based on its position in the output queues;
>>>   * If there are packets on the fastq, they are sent FIFO, before
>>>   * everything else.  Otherwise we choose the first packet from the
>>>   * batchq and send it.  the next packet chosen will be from the session
>>> diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h
>>> index 1ff40b1..d436d58 100644
>>> --- a/ui/vnc-enc-zywrle.h
>>> +++ b/ui/vnc-enc-zywrle.h
>>> @@ -305,7 +305,7 @@ static inline void harr(int8_t *px0, int8_t *px1)
>>>     |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1
>>>  
>>>   In this method, H/L and X0/X1 is always same position.
>>> - This lead us to more speed and less memory.
>>> + This leads us to more speed and less memory.
>>>   Of cause, the result of both method is quite same
>>>   because it's only difference that coefficient position.
>>>  */
>>>
>> Since you're in the neighborhood, this paragraph needs more fixes:
>>
>>  In this method, H/L and X0/X1 is always in the same position.
> 
> Shouldn't it be "are always"? :-)

Yes. I got swamped by the other typos. :-)
> 
>>  This leads us to more speed and less memory.
>>  Of course, the result of both methods is the same
>>  because the only difference is the coefficient position.
>>
>> Thanks,
>> -d
> 
> Maybe. Please let us fix that in a later patch.\

Works for me.

> See also the previous discussion
> (http://patchwork.ozlabs.org/patch/257416/).

I had unfortunately deleted that thread when I saw there was an update.
*sigh*

> Regards,
> Stefan

Reviewed-By: Don Koch <dkoch@verizon.com>

-d

Re: [Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 972 bytes --]

On 10/11/2013 02:03 PM, Don Koch wrote:

>>   In this method, H/L and X0/X1 is always same position.
>> - This lead us to more speed and less memory.
>> + This leads us to more speed and less memory.
>>   Of cause, the result of both method is quite same
>>   because it's only difference that coefficient position.
>>  */
>>
> 
> Since you're in the neighborhood, this paragraph needs more fixes:
> 
>  In this method, H/L and X0/X1 is always in the same position.
>  This leads us to more speed and less memory.
>  Of course, the result of both methods is the same
>  because the only difference is the coefficient position.

Broken record.  This was what was attempted in v1, where the argument
was that the original wording is so obtuse that it is not obvious that
this is the correct replacement.

I actually like the approach of v2.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

Re: [Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Peter Maydell]

On 12 October 2013 05:03, Don Koch <dkoch@verizon.com> wrote:
> On 10/11/2013 03:34 PM, Stefan Weil wrote:
>> * it's -> its
>> * grammar fix in ui/vnc-enc-zywrle.h
>>
>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>> ---
>>
>> This is v3 of http://patchwork.ozlabs.org/patch/257416/.
>>
>> v3:
>> Don't try to improve a strange sentence in the same context ("Of cause [...]").

>>   In this method, H/L and X0/X1 is always same position.
>> - This lead us to more speed and less memory.
>> + This leads us to more speed and less memory.
>>   Of cause, the result of both method is quite same
>>   because it's only difference that coefficient position.
>>  */
>>
>
> Since you're in the neighborhood, this paragraph needs more fixes:

No, see the note above and the previous discussion.

>  In this method, H/L and X0/X1 is always in the same position.
>  This leads us to more speed and less memory.
>  Of course, the result of both methods is the same
>  because the only difference is the coefficient position.

Unless you want to say you've reviewed the code and
are completely confident that the original author meant
"the same" or "exactly the same" and not "quite similar"
then we need to leave the original wording alone.

-- PMM

Re: [Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Don Koch]

On 10/11/2013 04:10 PM, Peter Maydell wrote:
> On 12 October 2013 05:03, Don Koch <dkoch@verizon.com> wrote:
>> On 10/11/2013 03:34 PM, Stefan Weil wrote:
>>> * it's -> its
>>> * grammar fix in ui/vnc-enc-zywrle.h
>>>
>>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>>> ---
>>>
>>> This is v3 of http://patchwork.ozlabs.org/patch/257416/.
>>>
>>> v3:
>>> Don't try to improve a strange sentence in the same context ("Of cause [...]").
> 
>>>   In this method, H/L and X0/X1 is always same position.
>>> - This lead us to more speed and less memory.
>>> + This leads us to more speed and less memory.
>>>   Of cause, the result of both method is quite same
>>>   because it's only difference that coefficient position.
>>>  */
>>>
>>
>> Since you're in the neighborhood, this paragraph needs more fixes:
> 
> No, see the note above and the previous discussion.

In that case, there in no point in fixing just the lead/leads typo.

>>  In this method, H/L and X0/X1 is always in the same position.
>>  This leads us to more speed and less memory.
>>  Of course, the result of both methods is the same
>>  because the only difference is the coefficient position.
> 
> Unless you want to say you've reviewed the code and
> are completely confident that the original author meant
> "the same" or "exactly the same" and not "quite similar"
> then we need to leave the original wording alone.
> 
> -- PMM
> 

-d

Re: [Qemu-devel] [Qemu-trivial] [PATCH v3] misc: Spelling and grammar fixes in comments

[Michael Tokarev]

So guys, do we agree to apply this or not, after all? :)

Thanks,

/mjt

12.10.2013 00:28, Don Koch wrote:
> On 10/11/2013 04:10 PM, Peter Maydell wrote:
>> On 12 October 2013 05:03, Don Koch <dkoch@verizon.com> wrote:
>>> On 10/11/2013 03:34 PM, Stefan Weil wrote:
>>>> * it's -> its
>>>> * grammar fix in ui/vnc-enc-zywrle.h
>>>>
>>>> Signed-off-by: Stefan Weil <sw@weilnetz.de>
>>>> ---
>>>>
>>>> This is v3 of http://patchwork.ozlabs.org/patch/257416/.
>>>>
>>>> v3:
>>>> Don't try to improve a strange sentence in the same context ("Of cause [...]").
>>
>>>>    In this method, H/L and X0/X1 is always same position.
>>>> - This lead us to more speed and less memory.
>>>> + This leads us to more speed and less memory.
>>>>    Of cause, the result of both method is quite same
>>>>    because it's only difference that coefficient position.
>>>>   */
>>>>
>>>
>>> Since you're in the neighborhood, this paragraph needs more fixes:
>>
>> No, see the note above and the previous discussion.
>
> In that case, there in no point in fixing just the lead/leads typo.
>
>>>   In this method, H/L and X0/X1 is always in the same position.
>>>   This leads us to more speed and less memory.
>>>   Of course, the result of both methods is the same
>>>   because the only difference is the coefficient position.
>>
>> Unless you want to say you've reviewed the code and
>> are completely confident that the original author meant
>> "the same" or "exactly the same" and not "quite similar"
>> then we need to leave the original wording alone.
>>
>> -- PMM
>>
>
> -d
>
>
>

Re: [Qemu-devel] [Qemu-trivial] [PATCH v3] misc: Spelling and grammar fixes in comments

[Stefan Weil]

Am 21.10.2013 10:46, schrieb Michael Tokarev:
> So guys, do we agree to apply this or not, after all? :)
>
> Thanks,
>
> /mjt

The discussion was a bit confusing.

Finally, the patch got two reviews (Reviewed-by: Peter Maydell
<peter.maydell@linaro.org>, Reviewed-By: Don Koch <dkoch@verizon.com>,
see http://patchwork.ozlabs.org/patch/282925/).I assume that Reviewed-By
is unusual but obviously the same as Reviewed-by.

Eric Blake wrote that he liked the approach of patch v2, but did not
object to v3.

Therefore I think that you can take the patch v3 into your queue.

Regards,
Stefan

Re: [Qemu-devel] [PATCH v3] misc: Spelling and grammar fixes in comments

[Peter Maydell]

On 12 October 2013 04:34, Stefan Weil <sw@weilnetz.de> wrote:
> * it's -> its
> * grammar fix in ui/vnc-enc-zywrle.h
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM

Re: [Qemu-devel] [Qemu-trivial] [PATCH v3] misc: Spelling and grammar fixes in comments

[Michael Tokarev]

11.10.2013 23:34, Stefan Weil wrote:
> * it's -> its
> * grammar fix in ui/vnc-enc-zywrle.h

Thanks, applied to the trivial patches queue.

/mjt