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

2
trunk/src/app/srs_app_caster_flv.cpp
View file

@ -207,7 +207,7 @@ int SrsDynamicHttpConn::do_proxy(ISrsHttpResponseReader* rr, SrsFlvDecoder* dec)
char* data = new char[size];
if ((ret = dec->read_tag_data(data, size)) != ERROR_SUCCESS) {
srs_freep(data);
srs_freepa(data);
if (!srs_is_client_gracefully_close(ret)) {
srs_error("flv: proxy tag data failed. ret=%d", ret);
}

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;
}

6
trunk/src/app/srs_app_http_conn.cpp
View file

@ -79,7 +79,7 @@ SrsHttpResponseWriter::SrsHttpResponseWriter(SrsStSocket* io)
SrsHttpResponseWriter::~SrsHttpResponseWriter()
{
srs_freep(hdr);
srs_freep(iovss_cache);
srs_freepa(iovss_cache);
}
int SrsHttpResponseWriter::final_request()
@ -191,7 +191,7 @@ int SrsHttpResponseWriter::writev(iovec* iov, int iovcnt, ssize_t* pnwrite)
int nb_iovss = 3 + iovcnt;
iovec* iovss = iovss_cache;
if (nb_iovss_cache < nb_iovss) {
srs_freep(iovss_cache);
srs_freepa(iovss_cache);
nb_iovss_cache = nb_iovss;
iovss = iovss_cache = new iovec[nb_iovss];
}
@ -509,7 +509,7 @@ SrsHttpMessage::~SrsHttpMessage()
{
srs_freep(_body);
srs_freep(_uri);
srs_freep(_http_ts_send_buffer);
srs_freepa(_http_ts_send_buffer);
}
int SrsHttpMessage::update(string url, bool allow_jsonp, http_parser* header, SrsFastStream* body, vector<SrsHttpHeaderField>& headers)

2
trunk/src/app/srs_app_listener.cpp
View file

@ -94,7 +94,7 @@ SrsUdpListener::~SrsUdpListener()
// close it manually.
close(_fd);
srs_freep(buf);
srs_freepa(buf);
}
int SrsUdpListener::fd()

2
trunk/src/app/srs_app_log.cpp
View file

@ -91,7 +91,7 @@ SrsFastLog::SrsFastLog()
SrsFastLog::~SrsFastLog()
{
srs_freep(log_data);
srs_freepa(log_data);
if (fd > 0) {
::close(fd);

4
trunk/src/app/srs_app_source.cpp
View file

@ -162,7 +162,7 @@ SrsFastVector::SrsFastVector()
SrsFastVector::~SrsFastVector()
{
free();
srs_freep(msgs);
srs_freepa(msgs);
}
int SrsFastVector::size()
@ -221,7 +221,7 @@ void SrsFastVector::push_back(SrsSharedPtrMessage* msg)
srs_warn("fast vector incrase %d=>%d", nb_msgs, size);
// use new array.
srs_freep(msgs);
srs_freepa(msgs);
msgs = buf;
nb_msgs = size;
}