zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision d66326c..4df108a (367167:367307)

Browse Source 
The changes in d66326c..4df108a/build/common.gypi
enables a lot more warnings, which have been disabled/fixed in this CL.
See tracking bugs for remaining work.

Change log: d66326c..4df108a
Full diff: d66326c..4df108a

Changed dependencies:
* src/buildtools: fee7f1e..6d0c448
* src/third_party/libsrtp: b8dd754..8a7662a
DEPS diff: d66326c..4df108a/DEPS

No update to Clang.

BUG=webrtc:5397, webrtc:5398, webrtc:5399
TBR=hta@webrtc.org, perkj@webrtc.org
NOTRY=True

Review URL: https://codereview.webrtc.org/1553033002

Cr-Commit-Position: refs/heads/master@{#11147}
This commit is contained in:
kjellander
2016-01-04 10:15:53 -08:00
committed by Commit bot
parent 4138e08eb6
commit 60ca31bf5d
15 changed files with 47 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
webrtc/base/linux.cc
View File

@ -233,33 +233,6 @@ bool ConfigParser::ParseLine(std::string* key, std::string* value) {
return true;
}
#if !defined(WEBRTC_CHROMIUM_BUILD)
static bool ExpectLineFromStream(FileStream* stream,
std::string* out) {
StreamResult res = stream->ReadLine(out);
if (res != SR_SUCCESS) {
if (res != SR_EOS) {
LOG(LS_ERROR) << "Error when reading from stream";
} else {
LOG(LS_ERROR) << "Incorrect number of lines in stream";
}
return false;
}
return true;
}
static void ExpectEofFromStream(FileStream* stream) {
std::string unused;
StreamResult res = stream->ReadLine(&unused);
if (res == SR_SUCCESS) {
LOG(LS_WARNING) << "Ignoring unexpected extra lines from stream";
} else if (res != SR_EOS) {
LOG(LS_WARNING) << "Error when checking for extra lines from stream";
}
}
#endif
std::string ReadLinuxUname() {
struct utsname buf;
if (uname(&buf) < 0) {