Patchwork vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

login
register
mail settings
Submitter Catalin Patulea
Date Nov. 9, 2012, 11:31 p.m.
Message ID <1352503875-30263-1-git-send-email-catalinp@google.com>
Download mbox | patch
Permalink /patch/198160/
State New
Headers show

Comments

Catalin Patulea - Nov. 9, 2012, 11:31 p.m.
Signed-off-by: Catalin Patulea <catalinp@google.com>
---
A cursory web search shows that this flag doesn't show up much other than in
QEMU mailing lists and source. I don't think this will break anything.

ui/vnc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Peter Maydell - Nov. 9, 2012, 11:58 p.m.
On 10 November 2012 00:31, Catalin Patulea <catalinp@google.com> wrote:
>
> Signed-off-by: Catalin Patulea <catalinp@google.com>
> ---
> A cursory web search shows that this flag doesn't show up much other than in
> QEMU mailing lists and source. I don't think this will break anything.

Yeah. In particular we documented it with the correct spelling
and nobody came along and reported the option as missing. I think
we can get away with this change. However...

> ui/vnc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 61f120e..073fbe7 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2945,7 +2945,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
>  #endif
>          } else if (strncmp(options, "lossy", 5) == 0) {
>              vs->lossy = true;
> -        } else if (strncmp(options, "non-adapative", 13) == 0) {
> +        } else if (strncmp(options, "non-adaptive", 13) == 0) {

...this is a strncmp, you need to update the length parameter
because you've changed the string.

>              vs->non_adaptive = true;
>          } else if (strncmp(options, "share=", 6) == 0) {
>              if (strncmp(options+6, "ignore", 6) == 0) {
> --
> 1.7.7.3

-- PMM
Anthony Liguori - Nov. 26, 2012, 9:49 p.m.
Catalin Patulea <catalinp@google.com> writes:

> Signed-off-by: Catalin Patulea <catalinp@google.com>
> ---
> A cursory web search shows that this flag doesn't show up much other than in
> QEMU mailing lists and source. I don't think this will break anything.
>

Applied. Thanks.

Regards,

Anthony Liguori

> ui/vnc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/ui/vnc.c b/ui/vnc.c
> index 61f120e..073fbe7 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -2945,7 +2945,7 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
>  #endif
>          } else if (strncmp(options, "lossy", 5) == 0) {
>              vs->lossy = true;
> -        } else if (strncmp(options, "non-adapative", 13) == 0) {
> +        } else if (strncmp(options, "non-adaptive", 13) == 0) {
>              vs->non_adaptive = true;
>          } else if (strncmp(options, "share=", 6) == 0) {
>              if (strncmp(options+6, "ignore", 6) == 0) {
> -- 
> 1.7.7.3

Patch

diff --git a/ui/vnc.c b/ui/vnc.c
index 61f120e..073fbe7 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2945,7 +2945,7 @@  void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
 #endif
         } else if (strncmp(options, "lossy", 5) == 0) {
             vs->lossy = true;
-        } else if (strncmp(options, "non-adapative", 13) == 0) {
+        } else if (strncmp(options, "non-adaptive", 13) == 0) {
             vs->non_adaptive = true;
         } else if (strncmp(options, "share=", 6) == 0) {
             if (strncmp(options+6, "ignore", 6) == 0) {