[PATCH xserver 1/3] xwayland: Fix whitespace errors

Olivier Fourdan ofourdan at redhat.com
Thu Jun 16 09:58:20 UTC 2016


Hi Jason,

----- Original Message -----
> Substitute a few errant tab characters with eight spaces to conform to the
> prevailing style.
> 
> Signed-off-by: Jason Gerecke <jason.gerecke at wacom.com>
> ---
>  hw/xwayland/xwayland-glamor.c |  2 +-
>  hw/xwayland/xwayland-input.c  | 14 +++++++-------
>  hw/xwayland/xwayland-output.c |  2 +-
>  3 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
> index 73ccd71..068c224 100644
> --- a/hw/xwayland/xwayland-glamor.c
> +++ b/hw/xwayland/xwayland-glamor.c
> @@ -347,7 +347,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)\n",
> -	      xwl_screen->device_name, strerror(errno));
> +              xwl_screen->device_name, strerror(errno));
>         return;
>     }
>  
> diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
> index 0735d43..65f8961 100644
> --- a/hw/xwayland/xwayland-input.c
> +++ b/hw/xwayland/xwayland-input.c
> @@ -591,8 +591,8 @@ keyboard_handle_repeat_info (void *data, struct
> wl_keyboard *keyboard,
>      XkbControlsPtr ctrl;
>  
>      if (rate < 0 || delay < 0) {
> -	ErrorF("Wrong rate/delay: %d, %d\n", rate, delay);
> -	return;
> +        ErrorF("Wrong rate/delay: %d, %d\n", rate, delay);
> +        return;
>      }
>  
>      for (dev = inputInfo.devices; dev; dev = dev->next) {
> @@ -600,15 +600,15 @@ keyboard_handle_repeat_info (void *data, struct
> wl_keyboard *keyboard,
>              dev != GetMaster(xwl_seat->keyboard, MASTER_KEYBOARD))
>              continue;
>  
> -	if (rate != 0) {
> +    if (rate != 0) {

indentation is wrong here, it's all within the for { } block.

>              ctrl = dev->key->xkbInfo->desc->ctrls;
>              ctrl->repeat_delay = delay;
>              /* rate is number of keys per second */
>              ctrl->repeat_interval = 1000 / rate;
>  
> -	    XkbSetRepeatKeys(dev, -1, AutoRepeatModeOn);
> -	} else
> -	    XkbSetRepeatKeys(dev, -1, AutoRepeatModeOff);
> +            XkbSetRepeatKeys(dev, -1, AutoRepeatModeOn);
> +        } else
> +            XkbSetRepeatKeys(dev, -1, AutoRepeatModeOff);
>      }
>  }
>  
> @@ -843,7 +843,7 @@ seat_handle_capabilities(void *data, struct wl_seat
> *seat,
>  
>  static void
>  seat_handle_name(void *data, struct wl_seat *seat,
> -		 const char *name)
> +                 const char *name)
>  {
>  
>  }
> diff --git a/hw/xwayland/xwayland-output.c b/hw/xwayland/xwayland-output.c
> index 4903062..130b31d 100644
> --- a/hw/xwayland/xwayland-output.c
> +++ b/hw/xwayland/xwayland-output.c
> @@ -122,7 +122,7 @@ output_handle_mode(void *data, struct wl_output
> *wl_output, uint32_t flags,
>  
>  static inline void
>  output_get_new_size(struct xwl_output *xwl_output,
> -		    int *height, int *width)
> +                    int *height, int *width)
>  {
>      if (*width < xwl_output->x + xwl_output->width)
>          *width = xwl_output->x + xwl_output->width;
> --
> 2.8.3
> 

Cheers,
Olivier


More information about the xorg-devel mailing list