[PATCH] xwayland: Fix error strings

Daniel Stone daniel at fooishbar.org
Wed May 6 04:32:12 PDT 2015


On 6 May 2015 at 04:07, Robert Ancell <robert.ancell at canonical.com> wrote:
> Fix missing newlines from error string and fix grammar.

Thanks Robert. Keith, please merge directly:
Reviewed-by: Daniel Stone <daniels at collabora.com>

Cheers,
Daniel

> Signed-off-by: Robert Ancell <robert.ancell at canonical.com>
> ---
>  hw/xwayland/xwayland-glamor.c | 4 ++--
>  hw/xwayland/xwayland-input.c  | 2 +-
>  hw/xwayland/xwayland-output.c | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
> index d06006c..6b6e597 100644
> --- a/hw/xwayland/xwayland-glamor.c
> +++ b/hw/xwayland/xwayland-glamor.c
> @@ -310,7 +310,7 @@ xwl_drm_init_egl(struct xwl_screen *xwl_screen)
>      }
>
>      if (!epoxy_has_gl_extension("GL_OES_EGL_image")) {
> -        ErrorF("GL_OES_EGL_image no available");
> +        ErrorF("GL_OES_EGL_image not available\n");
>          return;
>      }
>
> @@ -329,7 +329,7 @@ xwl_drm_handle_device(void *data, struct wl_drm *drm, const char *device)
>
>     xwl_screen->drm_fd = open(xwl_screen->device_name, O_RDWR | O_CLOEXEC);
>     if (xwl_screen->drm_fd == -1) {
> -       ErrorF("wayland-egl: could not open %s (%s)",
> +       ErrorF("wayland-egl: could not open %s (%s)\n",
>               xwl_screen->device_name, strerror(errno));
>         return;
>     }
> diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
> index cc3bc53..488b839 100644
> --- a/hw/xwayland/xwayland-input.c
> +++ b/hw/xwayland/xwayland-input.c
> @@ -561,7 +561,7 @@ create_input_device(struct xwl_screen *xwl_screen, uint32_t id)
>
>      xwl_seat = calloc(sizeof *xwl_seat, 1);
>      if (xwl_seat == NULL) {
> -        ErrorF("create_input ENOMEM");
> +        ErrorF("create_input ENOMEM\n");
>          return;
>      }
>
> diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
> index 778914c..155cbc1 100644
> --- a/hw/xwayland/xwayland-output.c
> +++ b/hw/xwayland/xwayland-output.c
> @@ -159,7 +159,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id)
>
>      xwl_output = calloc(sizeof *xwl_output, 1);
>      if (xwl_output == NULL) {
> -        ErrorF("create_output ENOMEM");
> +        ErrorF("create_output ENOMEM\n");
>          return NULL;
>      }
>
> @@ -168,7 +168,7 @@ xwl_output_create(struct xwl_screen *xwl_screen, uint32_t id)
>      wl_output_add_listener(xwl_output->output, &output_listener, xwl_output);
>
>      if (snprintf(name, sizeof name, "XWAYLAND%d", serial++) < 0) {
> -        ErrorF("create_output ENOMEM");
> +        ErrorF("create_output ENOMEM\n");
>          free(xwl_output);
>          return NULL;
>      }
> --
> 2.1.4
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel


More information about the xorg-devel mailing list