diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-03-16 07:34:16 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-03-16 07:34:16 +0000 |
| commit | 2a9988f3e4c9b8d40ffebaa4427908de29324711 (patch) | |
| tree | 0fec17a1ff6201f61e16e3bb03821c62080be372 /pjmedia | |
| parent | e8673ffff74a0e9a63ce789e884a98a369bc8cc3 (diff) | |
Fix #1212:
- Updated pj_register_strerror() to just return PJ_SUCCESS when the same range
and handler is being re-registered.
- Removed the usage of static flag of error string handler registration in some
modules, which prevent the re-registration of the handler, e.g: in restarting
pjsua, as such flags never got reseted.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3455 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/audiodev.c | 9 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia/endpoint.c | 13 |
2 files changed, 8 insertions, 14 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c index 26288616..1614955d 100644 --- a/pjmedia/src/pjmedia-audiodev/audiodev.c +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c @@ -364,7 +364,7 @@ static void deinit_driver(unsigned drv_idx) PJ_DEF(pj_status_t) pjmedia_aud_subsys_init(pj_pool_factory *pf) { unsigned i; - pj_status_t status = PJ_SUCCESS; + pj_status_t status; /* Allow init() to be called multiple times as long as there is matching * number of shutdown(). @@ -374,9 +374,10 @@ PJ_DEF(pj_status_t) pjmedia_aud_subsys_init(pj_pool_factory *pf) } /* Register error subsystem */ - pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START, - PJ_ERRNO_SPACE_SIZE, - &pjmedia_audiodev_strerror); + status = pj_register_strerror(PJMEDIA_AUDIODEV_ERRNO_START, + PJ_ERRNO_SPACE_SIZE, + &pjmedia_audiodev_strerror); + pj_assert(status == PJ_SUCCESS); /* Init */ aud_subsys.pf = pf; diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c index 8f781796..bb7929df 100644 --- a/pjmedia/src/pjmedia/endpoint.c +++ b/pjmedia/src/pjmedia/endpoint.c @@ -43,11 +43,6 @@ static const pj_str_t STR_SENDRECV = { "sendrecv", 8 }; -/* Flag to indicate whether pjmedia error subsystem has been registered - * to pjlib. - */ -static int error_subsys_registered; - /* Config to control rtpmap inclusion for static payload types */ pj_bool_t pjmedia_add_rtpmap_for_static_pt = PJMEDIA_ADD_RTPMAP_FOR_STATIC_PT; @@ -105,11 +100,9 @@ PJ_DEF(pj_status_t) pjmedia_endpt_create(pj_pool_factory *pf, unsigned i; pj_status_t status; - if (!error_subsys_registered) { - pj_register_strerror(PJMEDIA_ERRNO_START, PJ_ERRNO_SPACE_SIZE, - &pjmedia_strerror); - error_subsys_registered = 1; - } + status = pj_register_strerror(PJMEDIA_ERRNO_START, PJ_ERRNO_SPACE_SIZE, + &pjmedia_strerror); + pj_assert(status == PJ_SUCCESS); PJ_ASSERT_RETURN(pf && p_endpt, PJ_EINVAL); PJ_ASSERT_RETURN(worker_cnt <= MAX_THREADS, PJ_EINVAL); |