On Tue, Mar 13, 2012 at 01:40:09PM +0000, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berra...@redhat.com>
>
These fixes apply to spice too, since common was copied out of it
(grumble).
> * common/quic.c, common/rop3.c, common/sw_canvas.c,
> gtk/spice-client-glib-usb-acl-helper.c: s/()/(void)/
> ---
> common/quic.c | 6 +++---
> common/rop3.c | 8 ++++----
> common/sw_canvas.c | 2 +-
> gtk/spice-client-glib-usb-acl-helper.c | 2 +-
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/common/quic.c b/common/quic.c
> index e2c211d..9f2c978 100644
> --- a/common/quic.c
> +++ b/common/quic.c
> @@ -246,7 +246,7 @@ static const unsigned int tabrand_chaos[TABRAND_TABSIZE]
> = {
> 0x81474925, 0xa8b6c7ad, 0xee5931de, 0xb2f8158d, 0x59fb7409, 0x2e3dfaed,
> 0x9af25a3f, 0xe1fed4d5,
> };
>
> -static unsigned int stabrand()
> +static unsigned int stabrand(void)
> {
> //ASSERT( !(TABRAND_SEEDMASK & TABRAND_TABSIZE));
> //ASSERT( TABRAND_SEEDMASK + 1 == TABRAND_TABSIZE );
> @@ -530,7 +530,7 @@ static int J[MELCSTATES] = {
> };
>
> /* creates the bit counting look-up table. */
> -static void init_zeroLUT()
> +static void init_zeroLUT(void)
> {
> int i, j, k, l;
>
> @@ -1690,7 +1690,7 @@ void quic_destroy(QuicContext *quic)
> encoder->usr->free(encoder->usr, encoder);
> }
>
> -void quic_init()
> +void quic_init(void)
> {
> if (!need_init) {
> return;
> diff --git a/common/rop3.c b/common/rop3.c
> index 77f0a71..15de023 100644
> --- a/common/rop3.c
> +++ b/common/rop3.c
> @@ -38,7 +38,7 @@ typedef void (*rop3_with_pattern_handler_t)(pixman_image_t
> *d, pixman_image_t *s
> typedef void (*rop3_with_color_handler_t)(pixman_image_t *d, pixman_image_t
> *s,
> SpicePoint *src_pos, uint32_t rgb);
>
> -typedef void (*rop3_test_handler_t)();
> +typedef void (*rop3_test_handler_t)(void);
>
> #define ROP3_NUM_OPS 256
>
> @@ -63,7 +63,7 @@ static void default_rop3_withe_color_handler(pixman_image_t
> *d, pixman_image_t *
> WARN("not implemented 0x%x");
> }
>
> -static void default_rop3_test_handler()
> +static void default_rop3_test_handler(void)
> {
> }
>
> @@ -134,7 +134,7 @@ static void rop3_handle_c##depth##_##name(pixman_image_t
> *d, pixman_image_t *s,
> }
> \
> }
> \
>
> \
> -static void rop3_test##depth##_##name()
> \
> +static void rop3_test##depth##_##name(void)
> \
> {
> \
> uint8_t d = 0xaa;
> \
> uint8_t s = 0xcc;
> \
> @@ -381,7 +381,7 @@ ROP3_HANDLERS(DPSoo, *src | *pat | *dest, 0xfe);
> rop3_test_handlers_32[index] = rop3_test32_##op; \
> rop3_test_handlers_16[index] = rop3_test16_##op;
>
> -void rop3_init()
> +void rop3_init(void)
> {
> static int need_init = 1;
> int i;
> diff --git a/common/sw_canvas.c b/common/sw_canvas.c
> index 09b649f..34ca910 100644
> --- a/common/sw_canvas.c
> +++ b/common/sw_canvas.c
> @@ -1278,7 +1278,7 @@ SpiceCanvas *canvas_create_for_data(int width, int
> height, uint32_t format,
> );
> }
>
> -void sw_canvas_init() //unsafe global function
> +void sw_canvas_init(void) //unsafe global function
> {
> if (!need_init) {
> return;
> diff --git a/gtk/spice-client-glib-usb-acl-helper.c
> b/gtk/spice-client-glib-usb-acl-helper.c
> index 4317bdc..724d62a 100644
> --- a/gtk/spice-client-glib-usb-acl-helper.c
> +++ b/gtk/spice-client-glib-usb-acl-helper.c
> @@ -150,7 +150,7 @@ out:
> return ret;
> }
>
> -static void cleanup()
> +static void cleanup(void)
> {
> if (polkit_cancellable)
> g_cancellable_cancel(polkit_cancellable);
> --
> 1.7.7.6
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
