<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[24813] trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24813">24813</a></dd>
<dt>Author</dt> <dd>andersca</dd>
<dt>Date</dt> <dd>2007-08-01 18:43:19 -0700 (Wed, 01 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Fix build.
* Misc/WebNSURLExtras.mm:
(+[NSURL _web_URLWithUserTypedString:relativeToURL:]):
(-[NSURL _web_userVisibleString]):
(-[NSURL _web_URLWithLowercasedScheme]):
(-[NSURL _web_dataForURLComponentType:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitChangeLog">trunk/WebKit/ChangeLog</a></li>
<li><a href="#trunkWebKitMiscWebNSURLExtrasmm">trunk/WebKit/Misc/WebNSURLExtras.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (24812 => 24813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog 2007-08-02 01:18:37 UTC (rev 24812)
+++ trunk/WebKit/ChangeLog 2007-08-02 01:43:19 UTC (rev 24813)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2007-08-01 Anders Carlsson <andersca@apple.com>
+
+ Fix build.
+
+ * Misc/WebNSURLExtras.mm:
+ (+[NSURL _web_URLWithUserTypedString:relativeToURL:]):
+ (-[NSURL _web_userVisibleString]):
+ (-[NSURL _web_URLWithLowercasedScheme]):
+ (-[NSURL _web_dataForURLComponentType:]):
+
</ins><span class="cx"> 2007-08-01 Alice Liu <alice.liu@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by .
</span></span></pre></div>
<a id="trunkWebKitMiscWebNSURLExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/Misc/WebNSURLExtras.mm (24812 => 24813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/Misc/WebNSURLExtras.mm 2007-08-02 01:18:37 UTC (rev 24812)
+++ trunk/WebKit/Misc/WebNSURLExtras.mm 2007-08-02 01:43:19 UTC (rev 24813)
</span><span class="lines">@@ -357,13 +357,13 @@
</span><span class="cx"> NSData *userTypedData = [string dataUsingEncoding:NSUTF8StringEncoding];
</span><span class="cx"> ASSERT(userTypedData);
</span><span class="cx">
</span><del>- const UInt8 *inBytes = [userTypedData bytes];
</del><ins>+ const UInt8 *inBytes = (const UInt8 *)[userTypedData bytes];
</ins><span class="cx"> int inLength = [userTypedData length];
</span><span class="cx"> if (inLength == 0) {
</span><span class="cx"> return [NSURL URLWithString:@""];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- char *outBytes = malloc(inLength * 3); // large enough to %-escape every character
</del><ins>+ char *outBytes = (char *)malloc(inLength * 3); // large enough to %-escape every character
</ins><span class="cx"> char *p = outBytes;
</span><span class="cx"> int outLength = 0;
</span><span class="cx"> int i;
</span><span class="lines">@@ -431,14 +431,14 @@
</span><span class="cx"> - (NSString *)_web_userVisibleString
</span><span class="cx"> {
</span><span class="cx"> NSData *data = [self _web_originalData];
</span><del>- const unsigned char *before = [data bytes];
</del><ins>+ const unsigned char *before = (const unsigned char*)[data bytes];
</ins><span class="cx"> int length = [data length];
</span><span class="cx">
</span><span class="cx"> bool needsHostNameDecoding = false;
</span><span class="cx">
</span><span class="cx"> const unsigned char *p = before;
</span><span class="cx"> int bufferLength = (length * 3) + 1;
</span><del>- char *after = malloc(bufferLength); // large enough to %-escape every character
</del><ins>+ char *after = (char *)malloc(bufferLength); // large enough to %-escape every character
</ins><span class="cx"> char *q = after;
</span><span class="cx"> int i;
</span><span class="cx"> for (i = 0; i < length; i++) {
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx"> CFIndex bytesFilled = CFURLGetBytes((CFURLRef)self, buffer, URL_BYTES_BUFFER_LENGTH);
</span><span class="cx"> if (bytesFilled == -1) {
</span><span class="cx"> CFIndex bytesToAllocate = CFURLGetBytes((CFURLRef)self, NULL, 0);
</span><del>- buffer = malloc(bytesToAllocate);
</del><ins>+ buffer = (UInt8 *)malloc(bytesToAllocate);
</ins><span class="cx"> bytesFilled = CFURLGetBytes((CFURLRef)self, buffer, bytesToAllocate);
</span><span class="cx"> ASSERT(bytesFilled == bytesToAllocate);
</span><span class="cx"> }
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> CFIndex bytesFilled = CFURLGetBytes((CFURLRef)self, allBytesBuffer, URLComponentTypeBufferLength);
</span><span class="cx"> if (bytesFilled == -1) {
</span><span class="cx"> CFIndex bytesToAllocate = CFURLGetBytes((CFURLRef)self, NULL, 0);
</span><del>- allBytesBuffer = malloc(bytesToAllocate);
</del><ins>+ allBytesBuffer = (UInt8 *)malloc(bytesToAllocate);
</ins><span class="cx"> bytesFilled = CFURLGetBytes((CFURLRef)self, allBytesBuffer, bytesToAllocate);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx">
</span><span class="cx"> NSData *componentData = [NSData dataWithBytes:allBytesBuffer + range.location length:range.length];
</span><span class="cx">
</span><del>- const unsigned char *bytes = [componentData bytes];
</del><ins>+ const unsigned char *bytes = (const unsigned char *)[componentData bytes];
</ins><span class="cx"> NSMutableData *resultData = [NSMutableData data];
</span><span class="cx"> // NOTE: add leading '?' to query strings non-zero length query strings.
</span><span class="cx"> // NOTE: retain question-mark only query strings.
</span></span></pre>
</div>
</div>
</body>
</html>