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

fix warning for xcode.

Browse source
This commit is contained in:
winlin 2015-03-14 13:09:34 +08:00
parent 6d15d0ea99
commit 5c6ef6ded6
4 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
View file

@ -75,7 +75,6 @@
3C1232ED1AAEA70F00CE8F6C /* libhttp_parser.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C1232EC1AAEA70F00CE8F6C /* libhttp_parser.a */; }; 3C1232ED1AAEA70F00CE8F6C /* libhttp_parser.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C1232EC1AAEA70F00CE8F6C /* libhttp_parser.a */; };
3C1EE6AE1AB1055800576EE9 /* srs_app_hds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1EE6AC1AB1055800576EE9 /* srs_app_hds.cpp */; }; 3C1EE6AE1AB1055800576EE9 /* srs_app_hds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1EE6AC1AB1055800576EE9 /* srs_app_hds.cpp */; };
3C1EE6D71AB1367D00576EE9 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 3C1EE6D61AB1367D00576EE9 /* README.md */; }; 3C1EE6D71AB1367D00576EE9 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 3C1EE6D61AB1367D00576EE9 /* README.md */; };
3C663F0E1AB0155100286D8B /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 3C663F011AB0155100286D8B /* Makefile */; };
3C663F0F1AB0155100286D8B /* srs_aac_raw_publish.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C663F021AB0155100286D8B /* srs_aac_raw_publish.c */; }; 3C663F0F1AB0155100286D8B /* srs_aac_raw_publish.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C663F021AB0155100286D8B /* srs_aac_raw_publish.c */; };
3C663F101AB0155100286D8B /* srs_audio_raw_publish.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C663F031AB0155100286D8B /* srs_audio_raw_publish.c */; }; 3C663F101AB0155100286D8B /* srs_audio_raw_publish.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C663F031AB0155100286D8B /* srs_audio_raw_publish.c */; };
3C663F111AB0155100286D8B /* srs_bandwidth_check.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C663F041AB0155100286D8B /* srs_bandwidth_check.c */; }; 3C663F111AB0155100286D8B /* srs_bandwidth_check.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C663F041AB0155100286D8B /* srs_bandwidth_check.c */; };
@ -299,8 +298,7 @@
3C1EE6D31AB1367D00576EE9 /* AUTHORS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS.txt; path = ../../../AUTHORS.txt; sourceTree = "<group>"; }; 3C1EE6D31AB1367D00576EE9 /* AUTHORS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AUTHORS.txt; path = ../../../AUTHORS.txt; sourceTree = "<group>"; };
3C1EE6D41AB1367D00576EE9 /* DONATIONS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DONATIONS.txt; path = ../../../DONATIONS.txt; sourceTree = "<group>"; }; 3C1EE6D41AB1367D00576EE9 /* DONATIONS.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DONATIONS.txt; path = ../../../DONATIONS.txt; sourceTree = "<group>"; };
3C1EE6D51AB1367D00576EE9 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../../../LICENSE; sourceTree = "<group>"; }; 3C1EE6D51AB1367D00576EE9 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE; path = ../../../LICENSE; sourceTree = "<group>"; };
3C1EE6D61AB1367D00576EE9 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../../README.md; sourceTree = "<group>"; wrapsLines = 0; }; 3C1EE6D61AB1367D00576EE9 /* README.md */ = {isa = PBXFileReference; explicitFileType = net.daringfireball.markdown; fileEncoding = 4; name = README.md; path = ../../../README.md; sourceTree = "<group>"; wrapsLines = 0; };
3C663F011AB0155100286D8B /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../../research/librtmp/Makefile; sourceTree = "<group>"; };
3C663F021AB0155100286D8B /* srs_aac_raw_publish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_aac_raw_publish.c; path = ../../../research/librtmp/srs_aac_raw_publish.c; sourceTree = "<group>"; }; 3C663F021AB0155100286D8B /* srs_aac_raw_publish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_aac_raw_publish.c; path = ../../../research/librtmp/srs_aac_raw_publish.c; sourceTree = "<group>"; };
3C663F031AB0155100286D8B /* srs_audio_raw_publish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_audio_raw_publish.c; path = ../../../research/librtmp/srs_audio_raw_publish.c; sourceTree = "<group>"; }; 3C663F031AB0155100286D8B /* srs_audio_raw_publish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_audio_raw_publish.c; path = ../../../research/librtmp/srs_audio_raw_publish.c; sourceTree = "<group>"; };
3C663F041AB0155100286D8B /* srs_bandwidth_check.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_bandwidth_check.c; path = ../../../research/librtmp/srs_bandwidth_check.c; sourceTree = "<group>"; }; 3C663F041AB0155100286D8B /* srs_bandwidth_check.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srs_bandwidth_check.c; path = ../../../research/librtmp/srs_bandwidth_check.c; sourceTree = "<group>"; };
@ -657,7 +655,6 @@
3C663F001AB014B500286D8B /* research */ = { 3C663F001AB014B500286D8B /* research */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
3C663F011AB0155100286D8B /* Makefile */,
3C663F021AB0155100286D8B /* srs_aac_raw_publish.c */, 3C663F021AB0155100286D8B /* srs_aac_raw_publish.c */,
3C663F031AB0155100286D8B /* srs_audio_raw_publish.c */, 3C663F031AB0155100286D8B /* srs_audio_raw_publish.c */,
3C663F041AB0155100286D8B /* srs_bandwidth_check.c */, 3C663F041AB0155100286D8B /* srs_bandwidth_check.c */,
@ -799,7 +796,6 @@
3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */, 3C663F141AB0155100286D8B /* srs_flv_parser.c in Sources */,
3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */, 3C1232451AAE81A400CE8F6C /* srs_rtmp_io.cpp in Sources */,
3C1232431AAE81A400CE8F6C /* srs_rtmp_buffer.cpp in Sources */, 3C1232431AAE81A400CE8F6C /* srs_rtmp_buffer.cpp in Sources */,
3C663F0E1AB0155100286D8B /* Makefile in Sources */,
3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */, 3C1232211AAE814D00CE8F6C /* srs_kernel_buffer.cpp in Sources */,
3C1232471AAE81A400CE8F6C /* srs_rtmp_sdk.cpp in Sources */, 3C1232471AAE81A400CE8F6C /* srs_rtmp_sdk.cpp in Sources */,
3C1232A61AAE81D900CE8F6C /* srs_app_kbps.cpp in Sources */, 3C1232A61AAE81D900CE8F6C /* srs_app_kbps.cpp in Sources */,

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

@ -334,7 +334,7 @@ int SrsConfDirective::read_token(SrsConfigBuffer* buffer, vector<string>& args,
} }
if (found) { if (found) {
int len = buffer->pos - pstart; int len = (int)(buffer->pos - pstart);
char* aword = new char[len]; char* aword = new char[len];
memcpy(aword, pstart, len); memcpy(aword, pstart, len);
aword[len - 1] = 0; aword[len - 1] = 0;
@ -1471,7 +1471,7 @@ int SrsConfig::check_config()
} else if (n == "http_remux") { } else if (n == "http_remux") {
for (int j = 0; j < (int)conf->directives.size(); j++) { for (int j = 0; j < (int)conf->directives.size(); j++) {
string m = conf->at(j)->name.c_str(); string m = conf->at(j)->name.c_str();
if (m != "enabled" && m != "mount" && m != "fast_cache" && m != "crss") { if (m != "enabled" && m != "mount" && m != "fast_cache" && m != "hstrs") {
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("unsupported vhost http_remux directive %s, ret=%d", m.c_str(), ret); srs_error("unsupported vhost http_remux directive %s, ret=%d", m.c_str(), ret);
return ret; return ret;
@ -1629,7 +1629,7 @@ int SrsConfig::check_config()
int nb_connections = get_max_connections(); int nb_connections = get_max_connections();
int nb_total = nb_connections + nb_consumed_fds; int nb_total = nb_connections + nb_consumed_fds;
int max_open_files = sysconf(_SC_OPEN_MAX); int max_open_files = (int)sysconf(_SC_OPEN_MAX);
int nb_canbe = max_open_files - nb_consumed_fds - 1; int nb_canbe = max_open_files - nb_consumed_fds - 1;
// for each play connections, we open a pipe(2fds) to convert SrsConsumver to io, // for each play connections, we open a pipe(2fds) to convert SrsConsumver to io,

16
trunk/src/app/srs_app_http.cpp
View file

@ -57,7 +57,7 @@ int srs_go_http_response_json(ISrsHttpResponseWriter* w, string data)
w->header()->set_content_length(data.length()); w->header()->set_content_length(data.length());
w->header()->set_content_type("application/json"); w->header()->set_content_type("application/json");
return w->write((char*)data.data(), data.length()); return w->write((char*)data.data(), (int)data.length());
} }
// get the status text of code. // get the status text of code.
@ -388,7 +388,7 @@ int SrsHttpFileServer::serve_file(ISrsHttpResponseWriter* w, SrsHttpMessage* r,
// write body. // write body.
int64_t left = length; int64_t left = length;
if ((ret = copy(w, &fs, r, left)) != ERROR_SUCCESS) { if ((ret = copy(w, &fs, r, (int)left)) != ERROR_SUCCESS) {
if (!srs_is_client_gracefully_close(ret)) { if (!srs_is_client_gracefully_close(ret)) {
srs_error("read file=%s size=%d failed, ret=%d", fullpath.c_str(), left, ret); srs_error("read file=%s size=%d failed, ret=%d", fullpath.c_str(), left, ret);
} }
@ -475,7 +475,7 @@ int SrsHttpFileServer::copy(ISrsHttpResponseWriter* w, SrsFileReader* fs, SrsHtt
} }
left -= nread; left -= nread;
if ((ret = w->write(buf, nread)) != ERROR_SUCCESS) { if ((ret = w->write(buf, (int)nread)) != ERROR_SUCCESS) {
break; break;
} }
} }
@ -681,7 +681,7 @@ bool SrsHttpServeMux::path_match(string pattern, string path)
return false; return false;
} }
int n = pattern.length(); int n = (int)pattern.length();
// not endswith '/', exactly match. // not endswith '/', exactly match.
if (pattern.at(n - 1) != '/') { if (pattern.at(n - 1) != '/') {
@ -883,7 +883,7 @@ int SrsHttpResponseReader::read(std::string& data)
} }
// read by specified content-length // read by specified content-length
int max = (int)owner->content_length() - nb_read; int max = (int)owner->content_length() - (int)nb_read;
if (max <= 0) { if (max <= 0) {
is_eof = true; is_eof = true;
return ret; return ret;
@ -910,7 +910,7 @@ int SrsHttpResponseReader::read_chunked(std::string& data)
srs_error("chunk header start with CRLF. ret=%d", ret); srs_error("chunk header start with CRLF. ret=%d", ret);
return ret; return ret;
} }
length = p - start + 2; length = (int)(p - start + 2);
at = buffer->read_slice(length); at = buffer->read_slice(length);
break; break;
} }
@ -936,7 +936,7 @@ int SrsHttpResponseReader::read_chunked(std::string& data)
at[length - 2] = 0; at[length - 2] = 0;
// size is the bytes size, excludes the chunk header and end CRLF. // size is the bytes size, excludes the chunk header and end CRLF.
int ilength = ::strtol(at, NULL, 16); int ilength = (int)::strtol(at, NULL, 16);
if (ilength < 0) { if (ilength < 0) {
ret = ERROR_HTTP_INVALID_CHUNK_HEADER; ret = ERROR_HTTP_INVALID_CHUNK_HEADER;
srs_error("chunk header negative, length=%d. ret=%d", ilength, ret); srs_error("chunk header negative, length=%d. ret=%d", ilength, ret);
@ -1317,7 +1317,7 @@ int SrsHttpParser::parse_message_imp(SrsStSocket* skt)
// consume the parsed bytes. // consume the parsed bytes.
if (nparsed && nparsed - body_parsed > 0) { if (nparsed && nparsed - body_parsed > 0) {
buffer->read_slice(nparsed - body_parsed); buffer->read_slice((int)nparsed - (int)body_parsed);
} }
// ok atleast header completed, // ok atleast header completed,

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

@ -134,7 +134,7 @@ int SrsVodStream::serve_flv_stream(ISrsHttpResponseWriter* w, SrsHttpMessage* r,
} }
// send data // send data
if ((ret = copy(w, &fs, r, left)) != ERROR_SUCCESS) { if ((ret = copy(w, &fs, r, (int)left)) != ERROR_SUCCESS) {
srs_warn("read flv=%s size=%d failed, ret=%d", fullpath.c_str(), left, ret); srs_warn("read flv=%s size=%d failed, ret=%d", fullpath.c_str(), left, ret);
return ret; return ret;
} }
@ -158,7 +158,7 @@ int SrsVodStream::serve_mp4_stream(ISrsHttpResponseWriter* w, SrsHttpMessage* r,
// parse -1 to whole file. // parse -1 to whole file.
if (end == -1) { if (end == -1) {
end = fs.filesize(); end = (int)fs.filesize();
} }
if (end > fs.filesize() || start > end) { if (end > fs.filesize() || start > end) {
@ -187,7 +187,7 @@ int SrsVodStream::serve_mp4_stream(ISrsHttpResponseWriter* w, SrsHttpMessage* r,
fs.lseek(start); fs.lseek(start);
// send data // send data
if ((ret = copy(w, &fs, r, left)) != ERROR_SUCCESS) { if ((ret = copy(w, &fs, r, (int)left)) != ERROR_SUCCESS) {
srs_warn("read mp4=%s size=%d failed, ret=%d", fullpath.c_str(), left, ret); srs_warn("read mp4=%s size=%d failed, ret=%d", fullpath.c_str(), left, ret);
return ret; return ret;
} }