2006-10-31 MorganL <morganl.webkit@yahoo.com>

        Reviewed by Maciej.

        Fixes http://bugs.webkit.org/show_bug.cgi?id=11286
        Includes some CRLF -> LF fixups.

        * platform/win/CookieJarWin.cpp:
        (WebCore::cookies):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 475cbd716674e452e026ba114ac92de062f689e1..96c426404281ea282fe531f441ec6c255b91cc56 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-31  MorganL  <morganl.webkit@yahoo.com>
+
+        Reviewed by Maciej.
+
+        Fixes http://bugs.webkit.org/show_bug.cgi?id=11286
+        Includes some CRLF -> LF fixups.
+
+        * platform/win/CookieJarWin.cpp:
+        (WebCore::cookies):
+
 2006-10-31  Adam Roben  <aroben@apple.com>
 
         Reviewed by Steve.

diff --git a/WebCore/platform/win/CookieJarWin.cpp b/WebCore/platform/win/CookieJarWin.cpp
index 83592c930f3cad506bb50152304a37b38cedaaee..a5e6146ce78841461ff7f030c67bf4c2c3a84ace 100644 (file)
--- a/WebCore/platform/win/CookieJarWin.cpp
+++ b/WebCore/platform/win/CookieJarWin.cpp
@@ -48,16 +48,15 @@ String cookies(const KURL& url)
     DeprecatedString str = url.url();
     str.append((UChar)'\0');
 
-    DWORD count;
-    InternetGetCookie((UChar*)str.unicode(), 0, 0, &count);\r
-    if (count <= 1) // Null terminator counts as 1.\r
-        return String();\r
-\r
-    UChar* buffer = new UChar[count];\r
-    InternetGetCookie((UChar*)str.unicode(), 0, buffer, &count);\r
-    String& result = String(buffer, count-1); // Ignore the null terminator.\r
-    delete buffer;\r
-    return result;\r
+    InternetGetCookie((UChar*)str.unicode(), 0, 0, &count);
+    if (count <= 1) // Null terminator counts as 1.
+        return String();
+
+    UChar* buffer = new UChar[count];
+    InternetGetCookie((UChar*)str.unicode(), 0, buffer, &count);
+    String& result = String(buffer, count-1); // Ignore the null terminator.
+    delete[] buffer;
+    return result;
 }
 
 bool cookiesEnabled()