[Spice-devel] [common PATCH] Remove trailing whitespace

Pavel Grunt pgrunt at redhat.com
Fri Dec 18 02:36:30 PST 2015


Acked-by: Pavel Grunt <pgrunt at redhat.com>

thanks,

Pavel

On Thu, 2015-12-17 at 12:14 +0100, Lukas Venhoda wrote:
> ---
>  COPYING               | 18 +++++++++---------
>  common/canvas_utils.c |  2 +-
>  common/lines.c        | 10 +++++-----
>  common/log.c          |  4 ++--
>  common/sw_canvas.c    |  2 +-
>  5 files changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/COPYING b/COPYING
> index 4362b49..e5ab03e 100644
> --- a/COPYING
> +++ b/COPYING
> @@ -55,7 +55,7 @@ modified by someone else and passed on, the
> recipients should know
>  that what they have is not the original version, so that the
> original
>  author's reputation will not be affected by problems that might be
>  introduced by others.
> -
> +
>    Finally, software patents pose a constant threat to the existence
> of
>  any free program.  We wish to make sure that a company cannot
>  effectively restrict the users of a free program by obtaining a
> @@ -111,7 +111,7 @@ modification follow.  Pay close attention to the
> difference between a
>  "work based on the library" and a "work that uses the library".  The
>  former contains code derived from the library, whereas the latter
> must
>  be combined with the library in order to run.
> -
> +
>                    GNU LESSER GENERAL PUBLIC LICENSE
>     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
>  
> @@ -158,7 +158,7 @@ Library.
>    You may charge a fee for the physical act of transferring a copy,
>  and you may at your option offer warranty protection in exchange for
> a
>  fee.
> -
> +
>    2. You may modify your copy or copies of the Library or any
> portion
>  of it, thus forming a work based on the Library, and copy and
>  distribute such modifications or work under the terms of Section 1
> @@ -216,7 +216,7 @@ instead of to this License.  (If a newer version
> than version 2 of the
>  ordinary GNU General Public License has appeared, then you can
> specify
>  that version instead if you wish.)  Do not make any other change in
>  these notices.
> -
> +
>    Once this change is made in a given copy, it is irreversible for
>  that copy, so the ordinary GNU General Public License applies to all
>  subsequent copies and derivative works made from that copy.
> @@ -267,7 +267,7 @@ Library will still fall under Section 6.)
>  distribute the object code for the work under the terms of Section
> 6.
>  Any executables containing that work also fall under Section 6,
>  whether or not they are linked directly with the Library itself.
> -
> +
>    6. As an exception to the Sections above, you may also combine or
>  link a "work that uses the Library" with the Library to produce a
>  work containing portions of the Library, and distribute that work
> @@ -329,7 +329,7 @@ restrictions of other proprietary libraries that
> do not normally
>  accompany the operating system.  Such a contradiction means you
> cannot
>  use both them and the Library together in an executable that you
>  distribute.
> -
> +
>    7. You may place library facilities that are a work based on the
>  Library side-by-side in a single library together with other library
>  facilities not covered by this License, and distribute such a
> combined
> @@ -370,7 +370,7 @@ subject to these terms and conditions.  You may
> not impose any further
>  restrictions on the recipients' exercise of the rights granted
> herein.
>  You are not responsible for enforcing compliance by third parties
> with
>  this License.
> -
> +
>    11. If, as a consequence of a court judgment or allegation of
> patent
>  infringement or for any other reason (not limited to patent issues),
>  conditions are imposed on you (whether by court order, agreement or
> @@ -422,7 +422,7 @@ conditions either of that version or of any later
> version published by
>  the Free Software Foundation.  If the Library does not specify a
>  license version number, you may choose any version ever published by
>  the Free Software Foundation.
> -
> +
>    14. If you wish to incorporate parts of the Library into other
> free
>  programs whose distribution conditions are incompatible with these,
>  write to the author to ask for permission.  For software which is
> @@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
> THE POSSIBILITY OF SUCH
>  DAMAGES.
>  
>                       END OF TERMS AND CONDITIONS
> -
> +
>             How to Apply These Terms to Your New Libraries
>  
>    If you develop a new library, and you want it to be of the
> greatest
> diff --git a/common/canvas_utils.c b/common/canvas_utils.c
> index 0d1591a..789cd76 100644
> --- a/common/canvas_utils.c
> +++ b/common/canvas_utils.c
> @@ -293,7 +293,7 @@ pixman_image_t
> *alloc_lz_image_surface(LzDecodeUsrData *canvas_data,
>  
>      /* pixman requires strides to be 4-byte aligned */
>      stride = SPICE_ALIGN(stride, 4);
> -    
> +
>      if (!top_down) {
>          stride = -stride;
>      }
> diff --git a/common/lines.c b/common/lines.c
> index 36b40a7..10ca318 100644
> --- a/common/lines.c
> +++ b/common/lines.c
> @@ -927,7 +927,7 @@ end of the line, we will find the largest number
> of Y steps that
>  satisfies the inequality.  In that case, since we are representing
>  the Y steps as (dy - N), we will actually want to solve for the
>  smallest N in that equation.
> -
> +
>  Case 1:  X major, starting X coordinate moved by M steps
>  
>                  -2dx <= 2Mdy - 2Ndx - dx - B < 0
> @@ -975,7 +975,7 @@ steps, so we want the highest N, so we use the <
> inequality:
>            = floor((2Mdy + dx + B + 2dx - 1) / 2dx) - 1
>            = floor((2Mdy + dx + B + 2dx - 1 - 2dx) / 2dx)
>            = floor((2Mdy + dx + B - 1) / 2dx)
> -
> +
>  Case 3: Y major, starting X coordinate moved by M steps
>  
>                  -2dy <= 2Ndx - 2Mdy - dy - B < 0
> @@ -1021,7 +1021,7 @@ Same analysis as Case 4, but we want the
> smallest number of Y steps
>  which means the largest N, so we use the <= inequality:
>  
>          N = floor((2Mdy + dy - B) / 2dx)
> -
> +
>  Now let's try the Y coordinates, we have the same 4 cases.
>  
>  Case 5: X major, starting Y coordinate moved by N steps
> @@ -1066,7 +1066,7 @@ Same derivations as Case 6, but we want the
> smallest # of X steps
>  which means the largest M, so use the <= inequality:
>  
>          M = floor((2Ndx + dx - B) / 2dy)
> -
> +
>  Case 7: Y major, starting Y coordinate moved by N steps
>  
>                  -2dy <= 2Ndx - 2Mdy - dy - B < 0
> @@ -1111,7 +1111,7 @@ steps which means the largest M, so we use the
> < inequality:
>            = floor((2Ndx + dy + B + 2dy - 1) / 2dy) - 1
>            = floor((2Ndx + dy + B + 2dy - 1 - 2dy) / 2dy)
>            = floor((2Ndx + dy + B - 1) / 2dy)
> -
> +
>  So, our equations are:
>  
>          1:  X major move x1 to x1+M     floor((2Mdy + dx - B) / 2dx)
> diff --git a/common/log.c b/common/log.c
> index fc5c129..df394d2 100644
> --- a/common/log.c
> +++ b/common/log.c
> @@ -52,7 +52,7 @@ static const char *
> spice_log_level_to_string(SpiceLogLevel level)
>      };
>  #endif
>      const char *str = NULL;
>> +
>      if (level < SPICE_N_ELEMENTS(to_string)) {
>          str = to_string[level];
>      }
> @@ -76,7 +76,7 @@ void spice_logv(const char *log_domain,
>                  va_list args)
>  {
>      const char *level = spice_log_level_to_string(log_level);
> -    
> +
>      if (debug_level == -1) {
>          debug_level = getenv("SPICE_DEBUG_LEVEL") ?
> atoi(getenv("SPICE_DEBUG_LEVEL")) : SPICE_LOG_LEVEL_WARNING;
>      }
> diff --git a/common/sw_canvas.c b/common/sw_canvas.c
> index 7d67ca5..a43cee4 100644
> --- a/common/sw_canvas.c
> +++ b/common/sw_canvas.c
> @@ -95,7 +95,7 @@ static pixman_image_t *get_image(SpiceCanvas
> *canvas, int force_opaque)
>          uint32_t *data;
>          int stride;
>          int width, height;
> -        
> +
>          /* Remove alpha bits from format */
>          format = (pixman_format_code_t)(((uint32_t)format) & ~(0xf
> << 12));
>          data = pixman_image_get_data (sw_canvas->image);


More information about the Spice-devel mailing list