[PATCH 20/20] dix: reduce scope of tmp and mult.

[Simon Thum]

On 04/20/2011 08:28 AM, Peter Hutterer wrote:
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  dix/ptrveloc.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
> index 0741604..4901d6a 100644
> --- a/dix/ptrveloc.c
> +++ b/dix/ptrveloc.c
> @@ -1122,7 +1122,6 @@ acceleratePointerPredictable(
>      ValuatorMask* val,
>      CARD32 evtime)
>  {
> -    float tmp, mult; /* no need to init */
>      int dx = 0, dy = 0, tmpi;
>      DeviceVelocityPtr velocitydata = GetDevicePredictableAccelData(dev);
>      Bool soften = TRUE;
> @@ -1150,6 +1149,8 @@ acceleratePointerPredictable(
>          }
>  
>          if (dev->ptrfeed && dev->ptrfeed->ctrl.num) {
> +            float mult;
> +
>              /* invoke acceleration profile to determine acceleration */
>              mult = ComputeAcceleration (dev, velocitydata,
>                                          dev->ptrfeed->ctrl.threshold,
> @@ -1167,6 +1168,7 @@ acceleratePointerPredictable(
>                  /* Calculate the new delta (with accel) and drop it back
>                   * into the valuator masks */
>                  if (dx) {
> +                    float tmp;
>                      tmp = mult * fdx + dev->last.remainder[0];
>                      /* Since it may not be apparent: lrintf() does not offer
>                       * strong statements about rounding; however because we
> @@ -1178,6 +1180,7 @@ acceleratePointerPredictable(
>                      dev->last.remainder[0] = tmp - (float)tmpi;
>                  }
>                  if (dy) {
> +                    float tmp;
>                      tmp = mult * fdy + dev->last.remainder[1];
>                      tmpi = lrintf(tmp);
>                      valuator_mask_set(val, 1, tmpi);
Reviewed-by: Simon Thum <simon.thum at gmx.de>

Cheers,

Simon