summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-23 04:26:29 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-23 04:26:29 +0000
commitb285a98a45c5ddd4ad9080a06d5a7d4943ac19d9 (patch)
treeaf4db21e058435015f70227b4cf642d13a1045ce
parent1b37b0ab63451279102485fe0663e72059fc3f96 (diff)
downloadchromium_src-b285a98a45c5ddd4ad9080a06d5a7d4943ac19d9.zip
chromium_src-b285a98a45c5ddd4ad9080a06d5a7d4943ac19d9.tar.gz
chromium_src-b285a98a45c5ddd4ad9080a06d5a7d4943ac19d9.tar.bz2
Try to fix the tree.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10177 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/process_util_unittest.cc2
-rw-r--r--webkit/tools/npapi_layout_test_plugin/PluginObject.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc
index c3bcea9..a3b6e5b 100644
--- a/base/process_util_unittest.cc
+++ b/base/process_util_unittest.cc
@@ -181,7 +181,7 @@ MULTIPROCESS_TEST_MAIN(ProcessUtilsLeakFDChildProcess) {
#endif // defined(OS_LINUX)
num_open_files -= expected_num_open_fds;
- ssize_t written = write(write_pipe, &num_open_files, sizeof(num_open_files));
+ int written = write(write_pipe, &num_open_files, sizeof(num_open_files));
DCHECK_EQ(written, sizeof(num_open_files));
close(write_pipe);
diff --git a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
index fee079e..2afda67 100644
--- a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
+++ b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
@@ -557,9 +557,10 @@ static bool testPostURLFile(PluginObject* obj, const NPVariant* args, uint32_t a
if (!tempFile)
return false;
- ssize_t written = fwrite(contentsString.UTF8Characters, contentsString.UTF8Length, 1, tempFile);
- DCHECK_EQ(written, 1);
+ int written = fwrite(contentsString.UTF8Characters, contentsString.UTF8Length, 1, tempFile);
fclose(tempFile);
+ if (written != 1)
+ return false;
NPError error = browser->posturl(obj->npp, url, target, pathString.UTF8Length, path, TRUE);