[PATCH] xfree86 : Remove xf86sFlag

[Peter Hutterer]

On Sun, Aug 01, 2010 at 04:01:16PM -0700, Jesse Adkins wrote:
> xf86Flag is set, but never checked.

please add an empy line between your s-o-b and the preceding paragraph.

> Signed-off-by: Jesse Adkins <jesserayadkins at gmail.com>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
  Peter

> ---
>  hw/xfree86/common/xf86Globals.c |    1 -
>  hw/xfree86/common/xf86Init.c    |    6 ------
>  hw/xfree86/common/xf86Priv.h    |    1 -
>  3 files changed, 0 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
> index 43665d1..42feac3 100644
> --- a/hw/xfree86/common/xf86Globals.c
> +++ b/hw/xfree86/common/xf86Globals.c
> @@ -170,7 +170,6 @@ const char *xf86VisualNames[] = {
>  /* Parameters set only from the command line */
>  char *xf86ServerName = "no-name";
>  Bool xf86fpFlag = FALSE;
> -Bool xf86sFlag = FALSE;
>  Bool xf86bsEnableFlag = FALSE;
>  Bool xf86bsDisableFlag = FALSE;
>  Bool xf86silkenMouseDisableFlag = FALSE;
> diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
> index ca532ee..ba4d20a 100644
> --- a/hw/xfree86/common/xf86Init.c
> +++ b/hw/xfree86/common/xf86Init.c
> @@ -1211,12 +1211,6 @@ ddxProcessArgument(int argc, char **argv, int i)
>      xf86bsEnableFlag = TRUE;
>      return 0;
>    }
> -  /* Notice the -s flag, but allow it to pass to the dix layer */
> -  if (!strcmp(argv[i], "-s"))
> -  {
> -    xf86sFlag = TRUE;
> -    return 0;
> -  }
>    if (!strcmp(argv[i], "-pixmap24"))
>    {
>      xf86Pix24 = Pix24Use24;
> diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
> index b5e7a45..a34e7e4 100644
> --- a/hw/xfree86/common/xf86Priv.h
> +++ b/hw/xfree86/common/xf86Priv.h
> @@ -53,7 +53,6 @@ extern _X_EXPORT  Bool xf86VidModeDisabled;
>  extern _X_EXPORT  Bool xf86VidModeAllowNonLocal;
>  #endif 
>  extern _X_EXPORT  Bool xf86fpFlag;
> -extern _X_EXPORT  Bool xf86sFlag;
>  extern _X_EXPORT  Bool xf86bsEnableFlag;
>  extern _X_EXPORT  Bool xf86bsDisableFlag;
>  extern _X_EXPORT  Bool xf86silkenMouseDisableFlag;
> -- 
> 1.7.0.4
>