Acked-by: Pavel Grunt <pgrunt@xxxxxxxxxx>
On Thu, 2015-12-17 at 12:12 +0100, Lukas Venhoda wrote:
> ---
> COPYING.LIB | 18 +++++++++---------
> ChangeLog | 2 +-
> usb-redirection-protocol.txt | 4 ++--
> usbredirhost/usbredirhost.c | 4 ++--
> usbredirparser/usbredirparser.c | 10 +++++-----
> usbredirparser/usbredirproto.h | 6 +++---
> usbredirserver/usbredirserver.1 | 2 +-
> usbredirserver/usbredirserver.c | 2 +-
> usbredirtestclient/usbredirtestclient.c | 2 +-
> 9 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/COPYING.LIB b/COPYING.LIB
> index 4362b49..e5ab03e 100644
> --- a/COPYING.LIB
> +++ b/COPYING.LIB
> @@ -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/ChangeLog b/ChangeLog
> index fd3b54c..60956c1 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -76,7 +76,7 @@ usbredir-0.5.1 19 September 2012
>
> usbredir-0.5 7 September 2012
> -------------------------------
> --Windows support
> +-Windows support
> -Add support for 64 bit packet ids
> -usbredirparser:
> -Add state serialization support
> diff --git a/usb-redirection-protocol.txt b/usb-redirection-
> protocol.txt
> index 33187bc..1022dc8 100644
> --- a/usb-redirection-protocol.txt
> +++ b/usb-redirection-protocol.txt
> @@ -261,7 +261,7 @@ Currently the following capabilities are defined:
>
> enum {
> /* Supports USB 3 bulk streams */
> - usb_redir_cap_bulk_streams,
> + usb_redir_cap_bulk_streams,
> /* The device_connect packet has the device_version_bcd field */
> usb_redir_cap_connect_device_version,
> /* Supports usb_redir_filter_reject and usb_redir_filter_filter
> pkts */
> @@ -729,7 +729,7 @@
> usb_redir_header.length: sizeof(usb_redir_start_bulk_receiving_heade
> r)
> struct usb_redir_start_bulk_receiving_header {
> uint32_t stream_id;
> uint32_t bytes_per_transfer;
> - uint8_t endpoint;
> + uint8_t endpoint;
> uint8_t no_transfers;
> }
>
> diff --git a/usbredirhost/usbredirhost.c
> b/usbredirhost/usbredirhost.c
> index 83baa3b..3e80677 100644
> --- a/usbredirhost/usbredirhost.c
> +++ b/usbredirhost/usbredirhost.c
> @@ -306,7 +306,7 @@ static int
> libusb_status_or_error_to_redir_status(struct usbredirhost *host,
> case LIBUSB_TRANSFER_OVERFLOW:
> return usb_redir_babble;
>
> - case LIBUSB_ERROR_INVALID_PARAM:
> + case LIBUSB_ERROR_INVALID_PARAM:
> return usb_redir_inval;
> case LIBUSB_ERROR_NO_DEVICE:
> usbredirhost_handle_disconnect(host);
> @@ -1342,7 +1342,7 @@ void
> usbredirhost_wait_for_cancel_completion(struct usbredirhost *host)
> wait = host->cancels_pending || host->transfers_head.next;
> UNLOCK(host);
> } while (wait);
> -}
> +}
>
> /* Only called from read callbacks */
> static void usbredirhost_cancel_pending_urbs_on_interface(
> diff --git a/usbredirparser/usbredirparser.c
> b/usbredirparser/usbredirparser.c
> index d1f9850..5dfeb9e 100644
> --- a/usbredirparser/usbredirparser.c
> +++ b/usbredirparser/usbredirparser.c
> @@ -92,7 +92,7 @@ va_log(struct usbredirparser_priv *parser, int
> verbose, const char *fmt, ...)
> va_start(ap, fmt);
> vsnprintf(buf + n, sizeof(buf) - n, fmt, ap);
> va_end(ap);
> -
> +
> parser->callb.log_func(parser->callb.priv, verbose, buf);
> }
>
> @@ -302,7 +302,7 @@ static int usbredirparser_get_type_header_len(
> struct usbredirparser_priv *parser =
> (struct usbredirparser_priv *)parser_pub;
> int command_for_host = 0;
> -
> +
> if (parser->flags & usbredirparser_fl_usb_host) {
> command_for_host = 1;
> }
> @@ -1057,7 +1057,7 @@ int usbredirparser_do_write(struct
> usbredirparser *parser_pub)
> int w, ret = 0;
>
> LOCK(parser);
> - for (;;) {
> + for (;;) {
> wbuf = parser->write_buf;
> if (!wbuf)
> break;
> @@ -1725,8 +1725,8 @@ int usbredirparser_unserialize(struct
> usbredirparser *parser_pub,
> int type_header_len =
> usbredirparser_get_type_header_len(parser_pub,
> parser-
> >header.type, 0);
> - if (type_header_len < 0 ||
> - type_header_len > sizeof(parser->type_header)
> ||
> + if (type_header_len < 0 ||
> + type_header_len > sizeof(parser->type_header) ||
> parser->header.length < type_header_len ||
> (parser->header.length > type_header_len &&
> !usbredirparser_expect_extra_data(parser))) {
> diff --git a/usbredirparser/usbredirproto.h
> b/usbredirparser/usbredirproto.h
> index 598da2f..d1d51a4 100644
> --- a/usbredirparser/usbredirproto.h
> +++ b/usbredirparser/usbredirproto.h
> @@ -116,7 +116,7 @@ enum {
>
> enum {
> /* Supports USB 3 bulk streams */
> - usb_redir_cap_bulk_streams,
> + usb_redir_cap_bulk_streams,
> /* The device_connect packet has the device_version_bcd field */
> usb_redir_cap_connect_device_version,
> /* Supports usb_redir_filter_reject and usb_redir_filter_filter
> pkts */
> @@ -138,7 +138,7 @@ enum {
> struct usb_redir_header {
> uint32_t type;
> uint32_t length;
> - uint64_t id;
> + uint64_t id;
> } ATTR_PACKED;
>
> struct usb_redir_hello_header {
> @@ -264,7 +264,7 @@ struct usb_redir_control_packet_header {
> uint8_t status;
> uint16_t value;
> uint16_t index;
> - uint16_t length;
> + uint16_t length;
> } ATTR_PACKED;
>
> struct usb_redir_bulk_packet_header {
> diff --git a/usbredirserver/usbredirserver.1
> b/usbredirserver/usbredirserver.1
> index 2d68d57..b36debc 100644
> --- a/usbredirserver/usbredirserver.1
> +++ b/usbredirserver/usbredirserver.1
> @@ -33,6 +33,6 @@ http://lists.freedesktop.org/mailman/listinfo/spice
> -devel
> .SH COPYRIGHT
> Copyright 2010-2012 Red Hat, Inc.
> License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/
> gpl.html>.
> -.br
> +.br
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law.
> diff --git a/usbredirserver/usbredirserver.c
> b/usbredirserver/usbredirserver.c
> index 02a80be..ff773ed 100644
> --- a/usbredirserver/usbredirserver.c
> +++ b/usbredirserver/usbredirserver.c
> @@ -282,7 +282,7 @@ int main(int argc, char *argv[])
> perror("Error setsockopt(SO_REUSEADDR) failed");
> exit(1);
> }
> -
> +
> memset(&serveraddr, 0, sizeof(serveraddr));
> serveraddr.sin6_family = AF_INET6;
> serveraddr.sin6_port = htons(port);
> diff --git a/usbredirtestclient/usbredirtestclient.c
> b/usbredirtestclient/usbredirtestclient.c
> index 99474b0..8dcd2be 100644
> --- a/usbredirtestclient/usbredirtestclient.c
> +++ b/usbredirtestclient/usbredirtestclient.c
> @@ -378,7 +378,7 @@ static int usbredirtestclient_cmdline_ctrl(void)
> return 0;
> }
>
> - if (!(control_packet.endpoint & 0x80)) {
> + if (!(control_packet.endpoint & 0x80)) {
> int i;
>
> data = malloc(control_packet.length);
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel