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

merge srs2, use srs_freepa for array

Browse source
This commit is contained in:
winlin 2015-11-02 11:05:39 +08:00
parent cef1ae5a8e
commit 8cec06e898
16 changed files with 69 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/app/srs_app_config.cpp
View file

@ -127,7 +127,7 @@ namespace _srs_internal
SrsConfigBuffer::~SrsConfigBuffer()
{
srs_freep(start);
srs_freepa(start);
}
int SrsConfigBuffer::fullfill(const char* filename)
@ -146,7 +146,7 @@ namespace _srs_internal
int filesize = (int)reader.filesize();
// create buffer
srs_freep(start);
srs_freepa(start);
pos = last = start = new char[filesize];
end = start + filesize;
@ -1091,7 +1091,7 @@ int SrsConfDirective::read_token(SrsConfigBuffer* buffer, vector<string>& args,
if (!word_str.empty()) {
args.push_back(word_str);
}
srs_freep(aword);
srs_freepa(aword);
if (ch == ';') {
return ERROR_SYSTEM_CONFIG_DIRECTIVE;
@ -6833,4 +6833,3 @@ SrsConfDirective* SrsConfig::get_stats_disk_device()
return conf;
}