[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-370-g05a9809

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  05a98093a733cb9e92f29bffeb1a652c6c16fb3d (commit)
       via  f7791f12d0dc0c1c7fe48a49115558d29de2de1e (commit)
      from  cbfdd2c73fadd5b06565244d70260b18316601dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 05a98093a733cb9e92f29bffeb1a652c6c16fb3d
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Aug 27 13:35:42 2010 +0200

    File::truncate doesn't do a seek.  Change TestFile::testTruncate 
accordingly.

diff --git a/myserver/tests/test_file.cpp b/myserver/tests/test_file.cpp
index e34abf2..f688029 100644
--- a/myserver/tests/test_file.cpp
+++ b/myserver/tests/test_file.cpp
@@ -210,9 +210,11 @@ public:
 
     CPPUNIT_ASSERT_EQUAL (tfile->getFileSize (), (off_t) dataLen / 2);
 
+    CPPUNIT_ASSERT_EQUAL (tfile->seek (0), 0);
+
     CPPUNIT_ASSERT_EQUAL (tfile->writeToFile (data, dataLen, &nbw), 0);
 
-    CPPUNIT_ASSERT_EQUAL (tfile->getFileSize (), (off_t) (dataLen + dataLen / 
2));
+    CPPUNIT_ASSERT_EQUAL (tfile->getFileSize (), (off_t) dataLen);
 
     try
       {



commit f7791f12d0dc0c1c7fe48a49115558d29de2de1e
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Aug 27 13:32:12 2010 +0200

    Fix segfault caused by recursive call of the same function.

diff --git a/myserver/src/base/exceptions/checked.cpp 
b/myserver/src/base/exceptions/checked.cpp
index 670ad1c..3dd1d39 100644
--- a/myserver/src/base/exceptions/checked.cpp
+++ b/myserver/src/base/exceptions/checked.cpp
@@ -80,7 +80,7 @@ namespace checked
 
   int ftruncate (int fd, off_t length)
   {
-    return checkError (ftruncate (fd, length));
+    return checkError (::ftruncate (fd, length));
   }
 
   char *getcwd (char *buf, size_t size)

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/base/exceptions/checked.cpp |    2 +-
 myserver/tests/test_file.cpp             |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU MyServer