diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-01 18:37:04 +0200 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-10-15 18:30:30 +0100 |
| commit | c61404f102d2a6c5f0fb6e6f7d1c17911c91d053 (patch) | |
| tree | bf6b469f62f48fe201f9ac0e568e6b70fd7b237b /server | |
| parent | 31a66ae6e78a3e1323c3eeb96fb18907873fd601 (diff) | |
| download | spice-c61404f102d2a6c5f0fb6e6f7d1c17911c91d053.tar.gz spice-c61404f102d2a6c5f0fb6e6f7d1c17911c91d053.tar.xz spice-c61404f102d2a6c5f0fb6e6f7d1c17911c91d053.zip | |
worker: replace init with red_worker_new
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
Diffstat (limited to 'server')
| -rw-r--r-- | server/red_worker.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index 538911d6..acca8949 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -12099,8 +12099,9 @@ static void handle_dev_input(int fd, int event, void *opaque) dispatcher_handle_recv_read(red_dispatcher_get_dispatcher(worker->red_dispatcher)); } -static void red_init(RedWorker *worker, WorkerInitData *init_data) +static RedWorker* red_worker_new(WorkerInitData *init_data) { + RedWorker *worker = spice_new0(RedWorker, 1); RedWorkerMessage message; Dispatcher *dispatcher; int i; @@ -12108,7 +12109,6 @@ static void red_init(RedWorker *worker, WorkerInitData *init_data) spice_assert(sizeof(CursorItem) <= QXL_CURSUR_DEVICE_DATA_SIZE); - memset(worker, 0, sizeof(RedWorker)); record_filename = getenv("SPICE_WORKER_RECORD_FILENAME"); if (record_filename) { static const char header[] = "SPICE_REPLAY 1\n"; @@ -12193,6 +12193,8 @@ static void red_init(RedWorker *worker, WorkerInitData *init_data) #endif red_init_zlib(worker); worker->event_timeout = INF_EVENT_WAIT; + + return worker; } static void red_display_cc_free_glz_drawables(RedChannelClient *rcc) @@ -12204,7 +12206,7 @@ static void red_display_cc_free_glz_drawables(RedChannelClient *rcc) SPICE_GNUC_NORETURN void *red_worker_main(void *arg) { - RedWorker *worker = spice_malloc(sizeof(RedWorker)); + RedWorker *worker = red_worker_new(arg); spice_info("begin"); spice_assert(MAX_PIPE_SIZE > WIDE_CLIENT_ACK_WINDOW && @@ -12214,8 +12216,6 @@ SPICE_GNUC_NORETURN void *red_worker_main(void *arg) spice_error("pthread_getcpuclockid failed"); } - red_init(worker, (WorkerInitData *)arg); - for (;;) { int i, num_events; unsigned int timeout; |