[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 18524df89c27879fdd0e33753eeeaebba4cb2646
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 28 21:05:31 2009 +0000

    Rubberstamped by Oliver Hunt.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-28
    Fix the warning:
    
    "warning: ignoring return value of 'char* getcwd(char*, size_t)',
    declared with attribute warn_unused_result".
    
    by actually checking the result. In the case it is null, an
    error has occoured, so treat it as the other fatal errors.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::DumpRenderTree::initializeFonts):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d01dcd3..fb66fbe 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-28  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Rubberstamped by Oliver Hunt.
+
+        Fix the warning:
+
+        "warning: ignoring return value of 'char* getcwd(char*, size_t)',
+        declared with attribute warn_unused_result".
+
+        by actually checking the result. In the case it is null, an
+        error has occoured, so treat it as the other fatal errors.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::DumpRenderTree::initializeFonts):
+
 2009-10-27  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index ec86877..9faa37f 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -596,7 +596,8 @@ void DumpRenderTree::initializeFonts()
         exit(1);
     }
     char currentPath[PATH_MAX+1];
-    getcwd(currentPath, PATH_MAX);
+    if (!getcwd(currentPath, PATH_MAX))
+        qFatal("Couldn't get current working directory");
     QByteArray configFile = currentPath;
     FcConfig *config = FcConfigCreate();
     configFile += "/WebKitTools/DumpRenderTree/qt/fonts.conf";

-- 
WebKit Debian packaging