diff options
author | David Henningsson <david.henningsson@canonical.com> | 2014-04-15 11:52:22 +0200 |
---|---|---|
committer | David Henningsson <david.henningsson@canonical.com> | 2014-04-15 11:52:22 +0200 |
commit | d3f2bfa21bd1966f6d624dfbfc74f8913bb054a5 (patch) | |
tree | b3fe58a28e58116c50c0e02442722ea1aea809e7 | |
parent | a5ba31bf9627b6c7d7f5e03cdccff2d52fa3299d (diff) |
pstream: Use pa_xnew0 in initialization
...for simplicity.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r-- | src/pulsecore/pstream.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c index 190fc9a33..2c1444ffd 100644 --- a/src/pulsecore/pstream.c +++ b/src/pulsecore/pstream.c @@ -237,11 +237,10 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo pa_assert(io); pa_assert(pool); - p = pa_xnew(pa_pstream, 1); + p = pa_xnew0(pa_pstream, 1); PA_REFCNT_INIT(p); p->io = io; pa_iochannel_set_callback(io, io_callback, p); - p->dead = false; p->mainloop = m; p->defer_event = m->defer_new(m, defer_callback, p); @@ -249,41 +248,14 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo p->send_queue = pa_queue_new(); - p->write.current = NULL; - p->write.index = 0; - pa_memchunk_reset(&p->write.memchunk); - p->read.memblock = NULL; - p->read.packet = NULL; - p->read.index = 0; - - p->receive_packet_callback = NULL; - p->receive_packet_callback_userdata = NULL; - p->receive_memblock_callback = NULL; - p->receive_memblock_callback_userdata = NULL; - p->drain_callback = NULL; - p->drain_callback_userdata = NULL; - p->die_callback = NULL; - p->die_callback_userdata = NULL; - p->revoke_callback = NULL; - p->revoke_callback_userdata = NULL; - p->release_callback = NULL; - p->release_callback_userdata = NULL; - p->mempool = pool; - p->use_shm = false; - p->export = NULL; - /* We do importing unconditionally */ p->import = pa_memimport_new(p->mempool, memimport_release_cb, p); pa_iochannel_socket_set_rcvbuf(io, pa_mempool_block_size_max(p->mempool)); pa_iochannel_socket_set_sndbuf(io, pa_mempool_block_size_max(p->mempool)); -#ifdef HAVE_CREDS - p->send_creds_now = false; - p->read_creds_valid = false; -#endif return p; } |