external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #913, use complex error for reload utc time

Browse source
This commit is contained in:
winlin 2017-07-29 20:02:38 +08:00
parent 5c9a12e72a
commit 661eb8b37c
9 changed files with 86 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/utest/srs_utest_reload.cpp
View file

@ -285,7 +285,6 @@ MockSrsReloadConfig::~MockSrsReloadConfig()
srs_error_t MockSrsReloadConfig::do_reload(string buf)
{
int ret = ERROR_SUCCESS;
srs_error_t err = srs_success;
MockSrsReloadConfig conf;
@ -293,8 +292,8 @@ srs_error_t MockSrsReloadConfig::do_reload(string buf)
return srs_error_wrap(err, "parse");
}
if ((ret = MockSrsConfig::reload_conf(&conf)) != ERROR_SUCCESS) {
return srs_error_new(ret, "reload conf");
if ((err = MockSrsConfig::reload_conf(&conf)) != srs_success) {
return srs_error_wrap(err, "reload conf");
}
return err;