[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
mitz at apple.com
mitz at apple.com
Thu Apr 8 00:54:33 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit a71961148ec995044140081febd9ec9651601eb4
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 5 17:45:37 2010 +0000
Build fix
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::append):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52800 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf709c6..d115064 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-05 Dan Bernstein <mitz at apple.com>
+
+ Build fix
+
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::append):
+
2010-01-05 Yong Li <yong.li at torchmobile.com>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/SharedBuffer.cpp b/WebCore/platform/SharedBuffer.cpp
index 51a400f..00334e5 100644
--- a/WebCore/platform/SharedBuffer.cpp
+++ b/WebCore/platform/SharedBuffer.cpp
@@ -141,14 +141,14 @@ void SharedBuffer::append(const char* data, int length)
for (;;) {
memcpy(segment, data, bytesToCopy);
- if (length == bytesToCopy)
+ if (static_cast<unsigned>(length) == bytesToCopy)
break;
length -= bytesToCopy;
data += bytesToCopy;
segment = allocateSegment();
m_segments.append(segment);
- bytesToCopy = length < segmentSize ? length : segmentSize;
+ bytesToCopy = static_cast<unsigned>(length) < segmentSize ? length : segmentSize;
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list