Fix -Wmissing-field-initializers

This commit is contained in:
Fabiano Fidêncio 2014-09-01 14:19:52 +02:00
parent fb938c210a
commit b76e561d82
5 changed files with 31 additions and 37 deletions

View File

@ -815,19 +815,16 @@ static void vmc_state(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
printf("%s: %d\n", __func__, connected); printf("%s: %d\n", __func__, connected);
} }
static SpiceCharDeviceInterface vdagent_sif = { static SpiceBaseInterface base = {
.base.type = SPICE_INTERFACE_CHAR_DEVICE, .type = SPICE_INTERFACE_CHAR_DEVICE,
.base.description = "test spice virtual channel char device", .description = "test spice virtual channel char device",
.base.major_version = SPICE_INTERFACE_CHAR_DEVICE_MAJOR, .major_version = SPICE_INTERFACE_CHAR_DEVICE_MAJOR,
.base.minor_version = SPICE_INTERFACE_CHAR_DEVICE_MINOR, .minor_version = SPICE_INTERFACE_CHAR_DEVICE_MINOR,
.state = vmc_state,
.write = vmc_write,
.read = vmc_read,
}; };
SpiceCharDeviceInstance vdagent_sin = { SpiceCharDeviceInstance vdagent_sin = {
.base = { .base = {
.sif = &vdagent_sif.base, .sif = &base,
}, },
.subtype = "vdagent", .subtype = "vdagent",
}; };

View File

@ -45,8 +45,8 @@ void set_primary_params(SPICE_GNUC_UNUSED Test *test,
} }
static Command commands[] = { static Command commands[] = {
{DESTROY_PRIMARY, NULL}, {DESTROY_PRIMARY, NULL, .cb_opaque = NULL,},
{CREATE_PRIMARY, set_primary_params}, {CREATE_PRIMARY, set_primary_params, .cb_opaque = NULL},
}; };
int main(void) int main(void)

View File

@ -66,17 +66,17 @@ void set_destroy_parameters(SPICE_GNUC_UNUSED Test *test,
} }
static Command commands[] = { static Command commands[] = {
{SIMPLE_CREATE_SURFACE, set_surface_params}, {SIMPLE_CREATE_SURFACE, set_surface_params, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DRAW_SOLID, set_draw_parameters}, {SIMPLE_DRAW_SOLID, set_draw_parameters, .cb_opaque = NULL},
{SIMPLE_DESTROY_SURFACE, set_destroy_parameters}, {SIMPLE_DESTROY_SURFACE, set_destroy_parameters, .cb_opaque = NULL},
}; };
void on_client_connected(Test *test) void on_client_connected(Test *test)

View File

@ -21,11 +21,11 @@
SpicePlaybackInstance playback_instance; SpicePlaybackInstance playback_instance;
static const SpicePlaybackInterface playback_sif = { static const SpiceBaseInterface base = {
.base.type = SPICE_INTERFACE_PLAYBACK, .type = SPICE_INTERFACE_PLAYBACK,
.base.description = "test playback", .description = "test playback",
.base.major_version = SPICE_INTERFACE_PLAYBACK_MAJOR, .major_version = SPICE_INTERFACE_PLAYBACK_MAJOR,
.base.minor_version = SPICE_INTERFACE_PLAYBACK_MINOR, .minor_version = SPICE_INTERFACE_PLAYBACK_MINOR,
}; };
uint32_t *frame; uint32_t *frame;
@ -97,7 +97,7 @@ int main(void)
spice_server_set_noauth(server); spice_server_set_noauth(server);
spice_server_init(server, core); spice_server_init(server, core);
playback_instance.base.sif = &playback_sif.base; playback_instance.base.sif = &base;
spice_server_add_interface(server, &playback_instance.base); spice_server_add_interface(server, &playback_instance.base);
spice_server_playback_start(&playback_instance); spice_server_playback_start(&playback_instance);

View File

@ -79,14 +79,11 @@ static void vmc_state(SPICE_GNUC_UNUSED SpiceCharDeviceInstance *sin,
{ {
} }
static SpiceCharDeviceInterface vmc_interface = { static SpiceBaseInterface base = {
.base.type = SPICE_INTERFACE_CHAR_DEVICE, .type = SPICE_INTERFACE_CHAR_DEVICE,
.base.description = "test spice virtual channel char device", .description = "test spice virtual channel char device",
.base.major_version = SPICE_INTERFACE_CHAR_DEVICE_MAJOR, .major_version = SPICE_INTERFACE_CHAR_DEVICE_MAJOR,
.base.minor_version = SPICE_INTERFACE_CHAR_DEVICE_MINOR, .minor_version = SPICE_INTERFACE_CHAR_DEVICE_MINOR,
.state = vmc_state,
.write = vmc_write,
.read = vmc_read,
}; };
SpiceCharDeviceInstance vmc_instance = { SpiceCharDeviceInstance vmc_instance = {
@ -100,7 +97,7 @@ int main(void)
core = basic_event_loop_init(); core = basic_event_loop_init();
test = test_new(core); test = test_new(core);
vmc_instance.base.sif = &vmc_interface.base; vmc_instance.base.sif = &base;
spice_server_add_interface(test->server, &vmc_instance.base); spice_server_add_interface(test->server, &vmc_instance.base);
ping_timer = core->timer_add(pinger, NULL); ping_timer = core->timer_add(pinger, NULL);