diff options
Diffstat (limited to 'pjmedia')
-rw-r--r-- | pjmedia/src/pjmedia-audiodev/legacy_dev.c | 9 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-audiodev/null_dev.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/avi_dev.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/colorbar_dev.c | 4 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/clock_thread.c | 7 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/stream.c | 7 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/transport_ice.c | 6 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/vid_stream.c | 6 |
8 files changed, 11 insertions, 36 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/legacy_dev.c b/pjmedia/src/pjmedia-audiodev/legacy_dev.c index c1896987..19e383b4 100644 --- a/pjmedia/src/pjmedia-audiodev/legacy_dev.c +++ b/pjmedia/src/pjmedia-audiodev/legacy_dev.c @@ -141,9 +141,7 @@ static pj_status_t factory_destroy(pjmedia_aud_dev_factory *f) status = pjmedia_snd_deinit(); if (status == PJ_SUCCESS) { - pj_pool_t *pool = wf->pool; - wf->pool = NULL; - pj_pool_release(pool); + pj_pool_safe_release(&wf->pool); } return status; @@ -455,10 +453,7 @@ static pj_status_t stream_destroy(pjmedia_aud_stream *s) status = pjmedia_snd_stream_close(strm->snd_strm); if (status == PJ_SUCCESS) { - pj_pool_t *pool = strm->pool; - - strm->pool = NULL; - pj_pool_release(pool); + pj_pool_safe_release(&strm->pool); } return status; diff --git a/pjmedia/src/pjmedia-audiodev/null_dev.c b/pjmedia/src/pjmedia-audiodev/null_dev.c index 01f10516..afe55438 100644 --- a/pjmedia/src/pjmedia-audiodev/null_dev.c +++ b/pjmedia/src/pjmedia-audiodev/null_dev.c @@ -160,10 +160,8 @@ static pj_status_t null_factory_init(pjmedia_aud_dev_factory *f) static pj_status_t null_factory_destroy(pjmedia_aud_dev_factory *f) { struct null_audio_factory *nf = (struct null_audio_factory*)f; - pj_pool_t *pool = nf->pool; - nf->pool = NULL; - pj_pool_release(pool); + pj_pool_safe_release(&nf->pool); return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia-videodev/avi_dev.c b/pjmedia/src/pjmedia-videodev/avi_dev.c index a398b8cc..df2eea3d 100644 --- a/pjmedia/src/pjmedia-videodev/avi_dev.c +++ b/pjmedia/src/pjmedia-videodev/avi_dev.c @@ -192,10 +192,8 @@ static pj_status_t avi_factory_init(pjmedia_vid_dev_factory *f) static pj_status_t avi_factory_destroy(pjmedia_vid_dev_factory *f) { struct avi_factory *cf = (struct avi_factory*)f; - pj_pool_t *pool = cf->pool; - cf->pool = NULL; - pj_pool_release(pool); + pj_pool_safe_release(&cf->pool); return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia-videodev/colorbar_dev.c b/pjmedia/src/pjmedia-videodev/colorbar_dev.c index a65b0d65..f892a074 100644 --- a/pjmedia/src/pjmedia-videodev/colorbar_dev.c +++ b/pjmedia/src/pjmedia-videodev/colorbar_dev.c @@ -252,10 +252,8 @@ static pj_status_t cbar_factory_init(pjmedia_vid_dev_factory *f) static pj_status_t cbar_factory_destroy(pjmedia_vid_dev_factory *f) { struct cbar_factory *cf = (struct cbar_factory*)f; - pj_pool_t *pool = cf->pool; - cf->pool = NULL; - pj_pool_release(pool); + pj_pool_safe_release(&cf->pool); return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia/clock_thread.c b/pjmedia/src/pjmedia/clock_thread.c index 3423bf21..73fb5fdd 100644 --- a/pjmedia/src/pjmedia/clock_thread.c +++ b/pjmedia/src/pjmedia/clock_thread.c @@ -415,11 +415,8 @@ PJ_DEF(pj_status_t) pjmedia_clock_destroy(pjmedia_clock *clock) clock->lock = NULL; } - if (clock->pool) { - pj_pool_t *pool = clock->pool; - clock->pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&clock->pool); + return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c index 34067ae1..082ec6ea 100644 --- a/pjmedia/src/pjmedia/stream.c +++ b/pjmedia/src/pjmedia/stream.c @@ -2571,11 +2571,8 @@ PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream ) } #endif - if (stream->own_pool) { - pj_pool_t *pool = stream->own_pool; - stream->own_pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&stream->own_pool); + return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia/transport_ice.c b/pjmedia/src/pjmedia/transport_ice.c index 40a4d569..2bf9ec90 100644 --- a/pjmedia/src/pjmedia/transport_ice.c +++ b/pjmedia/src/pjmedia/transport_ice.c @@ -1878,11 +1878,7 @@ static pj_status_t transport_destroy(pjmedia_transport *tp) tp_ice->ice_st = NULL; } - if (tp_ice->pool) { - pj_pool_t *pool = tp_ice->pool; - tp_ice->pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&tp_ice->pool); return PJ_SUCCESS; } diff --git a/pjmedia/src/pjmedia/vid_stream.c b/pjmedia/src/pjmedia/vid_stream.c index 234cbc64..68d39173 100644 --- a/pjmedia/src/pjmedia/vid_stream.c +++ b/pjmedia/src/pjmedia/vid_stream.c @@ -1804,11 +1804,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_destroy( pjmedia_vid_stream *stream ) } #endif - if (stream->own_pool) { - pj_pool_t *pool = stream->own_pool; - stream->own_pool = NULL; - pj_pool_release(pool); - } + pj_pool_safe_release(&stream->own_pool); return PJ_SUCCESS; } |