ooo-build r12607 - in trunk: . patches/dev300
- From: strba svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12607 - in trunk: . patches/dev300
- Date: Tue, 20 May 2008 13:51:19 +0000 (UTC)
Author: strba
Date: Tue May 20 13:51:18 2008
New Revision: 12607
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12607&view=rev
Log:
make the store-core.diff apply correctly with older patch
Modified:
trunk/ChangeLog
trunk/patches/dev300/store-core.diff
Modified: trunk/patches/dev300/store-core.diff
==============================================================================
--- trunk/patches/dev300/store-core.diff (original)
+++ trunk/patches/dev300/store-core.diff Tue May 20 13:51:18 2008
@@ -1,7 +1,6 @@
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/store.h store/inc/store/store.h
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/store.h 2005-09-08 10:39:22.000000000 +0200
+--- store/inc/store/store.h 2005-09-08 10:39:22.000000000 +0200
+++ store/inc/store/store.h 2007-03-14 10:21:25.000000000 +0100
-@@ -102,7 +102,8 @@ storeError SAL_CALL store_openFile (
+@@ -95,7 +95,8 @@ storeError SAL_CALL store_openFile (
rtl_uString *pFilename,
storeAccessMode eAccessMode,
sal_uInt16 nPageSize,
@@ -11,10 +10,9 @@
) SAL_THROW_EXTERN_C();
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/store.hxx store/inc/store/store.hxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/store.hxx 2005-09-08 10:39:40.000000000 +0200
+--- store/inc/store/store.hxx 2005-09-08 10:39:40.000000000 +0200
+++ store/inc/store/store.hxx 2007-03-14 10:04:31.000000000 +0100
-@@ -294,7 +294,8 @@ public:
+@@ -281,7 +281,8 @@ public:
inline storeError create (
const rtl::OUString &rFilename,
storeAccessMode eAccessMode,
@@ -24,10 +22,9 @@
) SAL_THROW(());
/** Open the temporary file in memory.
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/store.inl store/inc/store/store.inl
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/store.inl 2005-09-08 10:40:01.000000000 +0200
+--- store/inc/store/store.inl 2005-09-08 10:40:01.000000000 +0200
+++ store/inc/store/store.inl 2007-03-14 15:45:47.000000000 +0100
-@@ -326,14 +326,15 @@ inline sal_Bool OStoreFile::isValid (voi
+@@ -321,14 +321,15 @@ inline sal_Bool OStoreFile::isValid (voi
inline storeError OStoreFile::create (
const rtl::OUString &rFilename,
storeAccessMode eAccessMode,
@@ -45,10 +42,9 @@
}
inline storeError OStoreFile::createInMemory (
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/types.h store/inc/store/types.h
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/inc/store/types.h 2006-02-28 11:31:30.000000000 +0100
+--- store/inc/store/types.h 2006-02-28 11:31:30.000000000 +0100
+++ store/inc/store/types.h 2007-03-14 10:06:44.000000000 +0100
-@@ -48,16 +48,26 @@
+@@ -38,16 +38,26 @@
extern "C" {
#endif
@@ -78,10 +74,9 @@
#define STORE_MAXIMUM_PAGESIZE ((sal_uInt16)0x8000)
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/filelckb.cxx store/source/filelckb.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/filelckb.cxx 2006-09-17 03:11:02.000000000 +0200
+--- store/source/filelckb.cxx 2006-09-17 03:11:02.000000000 +0200
+++ store/source/filelckb.cxx 2007-02-28 22:58:41.000000000 +0100
-@@ -652,7 +652,13 @@ storeError OFileLockBytes::writeAt (
+@@ -636,7 +636,11 @@ storeError OFileLockBytes::writeAt (
// Acquire exclusive access.
osl::MutexGuard aGuard (m_aMutex);
if (m_pImpl->isValid())
@@ -89,17 +84,14 @@
+ {
+ storeError nErr;
+ nErr = m_pImpl->writeAt (nOffset, pBuffer, nBytes, rnDone);
-+// fprintf( stderr, "OFileLockBytes::writeAt %d (%d bytes) (%d written) err %d\n",
-+// nOffset, nBytes, rnDone, nErr );
+ return nErr;
+ }
else
return store_E_InvalidHandle;
}
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.cxx store/source/storbase.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.cxx 2006-09-17 03:11:51.000000000 +0200
+--- store/source/storbase.cxx 2006-09-17 03:11:51.000000000 +0200
+++ store/source/storbase.cxx 2007-03-29 10:34:20.000000000 +0200
-@@ -56,6 +56,7 @@
+@@ -43,6 +43,7 @@
#include <sal/types.h>
#include <rtl/alloc.h>
#include <rtl/ref.hxx>
@@ -107,7 +99,7 @@
#include <osl/diagnose.h>
#include <osl/endian.h>
#include <osl/mutex.hxx>
-@@ -81,6 +84,12 @@
+@@ -51,6 +52,12 @@
#include <store/lockbyte.hxx>
#include <storbase.hxx>
@@ -120,7 +112,7 @@
using namespace store;
/*========================================================================
-@@ -252,7 +259,9 @@ storeError OStorePageObject::verify (con
+@@ -222,7 +229,9 @@ storeError OStorePageObject::verify (con
* OStoreSuperBlock.
*
*======================================================================*/
@@ -131,7 +123,7 @@
struct OStoreSuperBlock
{
-@@ -280,7 +289,7 @@ struct OStoreSuperBlock
+@@ -250,7 +259,7 @@ struct OStoreSuperBlock
/** Construction.
*/
OStoreSuperBlock (void)
@@ -140,7 +132,7 @@
m_nMarked (0),
m_aMarked (0),
m_nUnused (0),
-@@ -316,14 +325,21 @@ struct OStoreSuperBlock
+@@ -286,14 +295,21 @@ struct OStoreSuperBlock
(m_nMarked == rOther.m_nMarked) &&
(m_aMarked == rOther.m_aMarked) &&
(m_nUnused == rOther.m_nUnused) &&
@@ -165,7 +157,7 @@
m_aDescr = rDescr;
m_nMarked = 0;
-@@ -390,13 +406,14 @@ struct OStoreSuperBlock
+@@ -360,13 +376,14 @@ struct OStoreSuperBlock
/** verify (external representation).
*/
@@ -182,7 +174,7 @@
return store_E_WrongFormat;
sal_uInt32 nCRC32 = 0;
-@@ -410,6 +427,26 @@ struct OStoreSuperBlock
+@@ -380,6 +397,26 @@ struct OStoreSuperBlock
else
return store_E_None;
}
@@ -209,7 +201,7 @@
};
/*========================================================================
-@@ -501,6 +538,10 @@ struct OStoreSuperBlockPage
+@@ -471,6 +508,10 @@ struct OStoreSuperBlockPage
SuperBlock m_aSuperTwo;
StateBlock m_aState;
@@ -220,7 +212,7 @@
/** size.
*/
static sal_uInt16 size (void)
-@@ -522,7 +563,7 @@ struct OStoreSuperBlockPage
+@@ -492,7 +533,7 @@ struct OStoreSuperBlockPage
/** Construction.
*/
@@ -229,7 +221,7 @@
{}
/** swap (internal and external representation).
-@@ -548,6 +589,8 @@ struct OStoreSuperBlockPage
+@@ -518,6 +559,8 @@ struct OStoreSuperBlockPage
swap();
#endif /* OSL_BIGENDIAN */
@@ -238,7 +230,7 @@
// Done.
return eErrCode;
}
-@@ -633,7 +676,7 @@ storeError OStoreSuperBlockPage::create
+@@ -603,7 +646,7 @@ storeError OStoreSuperBlockPage::create
if (eErrCode == store_E_None)
{
// Setup 1st and 2nd SuperBlock copy.
@@ -247,7 +239,7 @@
m_aSuperTwo = m_aSuperOne;
// Mark as modified.
-@@ -759,11 +802,11 @@ storeError OStoreSuperBlockPage::verify
+@@ -729,11 +772,11 @@ storeError OStoreSuperBlockPage::verify
#endif /* OSL_BIGENDIAN */
// Verify 1st copy.
@@ -261,7 +253,7 @@
if (eErrCode == store_E_None)
{
// Ok. Ensure identical copies (1st copy wins).
-@@ -794,7 +837,7 @@ storeError OStoreSuperBlockPage::verify
+@@ -764,7 +807,7 @@ storeError OStoreSuperBlockPage::verify
else
{
// Failure. Verify 2nd copy.
@@ -270,7 +262,7 @@
if (eErrCode == store_E_None)
{
// Ok. Replace 1st copy with 2nd copy.
-@@ -1009,7 +1052,7 @@ storeError OStorePageBIOS::verify (Super
+@@ -979,7 +1022,7 @@ storeError OStorePageBIOS::verify (Super
if (rpSuper == 0)
{
// Allocate.
@@ -279,7 +271,7 @@
return store_E_OutOfMemory;
// Load (w/o verification).
-@@ -1120,7 +1163,7 @@ storeError OStorePageBIOS::initialize (
+@@ -1090,7 +1133,7 @@ storeError OStorePageBIOS::initialize (
* create (SuperBlock).
* Precond: initialized, writeable (store_AccessCreate).
*/
@@ -288,7 +280,7 @@
{
// Acquire exclusive access.
osl::MutexGuard aGuard (m_aMutex);
-@@ -1133,7 +1176,14 @@ storeError OStorePageBIOS::create (sal_u
+@@ -1103,7 +1146,14 @@ storeError OStorePageBIOS::create (sal_u
// Check PageSize.
sal_uInt16 nMinSize = SuperPage::size();
@@ -304,7 +296,7 @@
nPageSize = std::max (nPageSize, nMinSize);
nPageSize = std::min (nPageSize, STORE_MAXIMUM_PAGESIZE);
-@@ -1148,7 +1198,7 @@ storeError OStorePageBIOS::create (sal_u
+@@ -1118,7 +1168,7 @@ storeError OStorePageBIOS::create (sal_u
return eErrCode;
// Check SuperBlock page allocation.
@@ -313,7 +305,7 @@
{
// Cleanup and fail.
releaseLock (0, SuperPage::size());
-@@ -1495,7 +1545,12 @@ storeError OStorePageBIOS::allocate (
+@@ -1465,7 +1515,12 @@ storeError OStorePageBIOS::allocate (
if (aListHead.m_nAddr)
{
// Allocate from FreeList.
@@ -327,7 +319,7 @@
aPageHead.location (aListHead.m_nAddr);
// Load PageHead.
-@@ -1508,9 +1563,9 @@ storeError OStorePageBIOS::allocate (
+@@ -1488,9 +1543,9 @@ storeError OStorePageBIOS::allocate (
// Verify FreeList head.
OSL_PRECOND(
@@ -339,7 +331,7 @@
{
// Recovery: Reset FreeList.
m_pSuper->m_aSuperTwo.unusedReset();
-@@ -1531,11 +1586,11 @@ storeError OStorePageBIOS::allocate (
+@@ -1501,11 +1556,11 @@ storeError OStorePageBIOS::allocate (
// Assign location.
OStorePageData &rData = rPage.getData();
@@ -354,7 +346,7 @@
// Save page.
eErrCode = poke (rPage);
-@@ -1669,8 +1724,8 @@ storeError OStorePageBIOS::free (OStoreP
+@@ -1639,8 +1694,8 @@ storeError OStorePageBIOS::free (OStoreP
// Push onto FreeList.
OStorePageLink aListHead (m_pSuper->m_aSuperTwo.unusedHead());
@@ -365,7 +357,7 @@
// Save PageHead.
eErrCode = poke (rData);
-@@ -1708,14 +1763,14 @@ storeError OStorePageBIOS::load (OStoreP
+@@ -1678,14 +1733,14 @@ storeError OStorePageBIOS::load (OStoreP
// Save PageDescriptor.
OStorePageData &rData = rPage.getData();
@@ -383,7 +375,7 @@
return eErrCode;
}
-@@ -1724,7 +1779,7 @@ storeError OStorePageBIOS::load (OStoreP
+@@ -1694,7 +1749,7 @@ storeError OStorePageBIOS::load (OStoreP
if (eErrCode != store_E_None)
{
// Restore PageDescriptor.
@@ -392,7 +384,7 @@
return eErrCode;
}
-@@ -1734,8 +1789,8 @@ storeError OStorePageBIOS::load (OStoreP
+@@ -1704,8 +1759,8 @@ storeError OStorePageBIOS::load (OStoreP
#endif /* OSL_BIGENDIAN */
// Verify PageDescriptor.
@@ -403,7 +395,7 @@
return store_E_InvalidAccess;
// Mark page as clean.
-@@ -1928,7 +1983,12 @@ storeError OStorePageBIOS::scanNext (
+@@ -1898,7 +1953,12 @@ storeError OStorePageBIOS::scanNext (
return store_E_InvalidAccess;
// Setup PageHead.
@@ -417,7 +409,7 @@
// Check context.
while (rCtx.isValid())
-@@ -1943,11 +2003,11 @@ storeError OStorePageBIOS::scanNext (
+@@ -1913,11 +1973,11 @@ storeError OStorePageBIOS::scanNext (
continue;
// Check PageHead Magic number.
@@ -431,7 +423,7 @@
continue;
// Load page.
-@@ -1971,14 +2031,14 @@ storeError OStorePageBIOS::scanNext (
+@@ -1941,14 +2001,14 @@ storeError OStorePageBIOS::scanNext (
storeError OStorePageBIOS::peek (OStorePageData &rData)
{
// Save PageDescriptor.
@@ -458,7 +450,7 @@
return eErrCode;
}
-@@ -1997,8 +2057,8 @@ storeError OStorePageBIOS::peek (OStoreP
+@@ -1967,8 +2027,8 @@ storeError OStorePageBIOS::peek (OStoreP
#endif /* OSL_BIGENDIAN */
// Verify PageDescriptor.
@@ -469,7 +461,7 @@
return store_E_InvalidAccess;
else
return store_E_None;
-@@ -2011,7 +2071,7 @@ storeError OStorePageBIOS::peek (OStoreP
+@@ -1981,7 +2041,7 @@ storeError OStorePageBIOS::peek (OStoreP
storeError OStorePageBIOS::poke (OStorePageData &rData)
{
// Save PageDescriptor.
@@ -478,7 +470,7 @@
#ifdef OSL_BIGENDIAN
// Swap to external representation.
-@@ -2022,7 +2082,7 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -1992,7 +2052,7 @@ storeError OStorePageBIOS::poke (OStoreP
rData.guard ();
// Write PageHead.
@@ -487,7 +479,7 @@
#ifdef OSL_BIGENDIAN
// Swap back to internal representation.
-@@ -2041,7 +2101,7 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -2011,7 +2071,7 @@ storeError OStorePageBIOS::poke (OStoreP
{
// Save PageDescriptor.
OStorePageData &rData = rPage.getData();
@@ -496,7 +488,7 @@
#ifdef OSL_BIGENDIAN
// Swap to external representation.
-@@ -2052,7 +2112,7 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -2022,7 +2082,7 @@ storeError OStorePageBIOS::poke (OStoreP
rPage.guard (aDescr);
// Write page.
@@ -505,7 +497,7 @@
#ifdef OSL_BIGENDIAN
// Swap back to internal representation.
-@@ -2067,3 +2127,183 @@ storeError OStorePageBIOS::poke (OStoreP
+@@ -2037,3 +2097,183 @@ storeError OStorePageBIOS::poke (OStoreP
return eErrCode;
}
@@ -689,8 +681,7 @@
+
+ return store_E_None;
+}
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.hxx store/source/storbase.hxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storbase.hxx 2006-06-20 02:33:00.000000000 +0200
+--- store/source/storbase.hxx 2006-06-20 02:33:00.000000000 +0200
+++ store/source/storbase.hxx 2007-03-14 16:27:02.000000000 +0100
@@ -33,6 +33,8 @@
*
@@ -1305,8 +1296,7 @@
/** Page Maintenance.
*/
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storcach.cxx store/source/storcach.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storcach.cxx 2006-09-17 03:12:04.000000000 +0200
+--- store/source/storcach.cxx 2006-09-17 03:12:04.000000000 +0200
+++ store/source/storcach.cxx 2007-03-08 12:17:33.000000000 +0100
@@ -82,7 +82,8 @@ namespace store
struct OStorePageCacheEntry
@@ -1388,8 +1378,7 @@
STORE_METHOD_LEAVE(pMutex, store_E_None);
}
}
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stordata.cxx store/source/stordata.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stordata.cxx 2006-09-17 03:12:18.000000000 +0200
+--- store/source/stordata.cxx 2006-09-17 03:12:18.000000000 +0200
+++ store/source/stordata.cxx 2007-03-15 14:02:00.000000000 +0100
@@ -74,7 +74,7 @@ using namespace store;
* OStoreIndirectionPageData.
@@ -2026,8 +2015,7 @@
rpTriple = new(nPageSize) indirect(nPageSize);
}
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stordata.hxx store/source/stordata.hxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stordata.hxx 2006-06-20 02:33:22.000000000 +0200
+--- store/source/stordata.hxx 2006-06-20 02:33:22.000000000 +0200
+++ store/source/stordata.hxx 2007-03-20 12:34:49.000000000 +0100
@@ -76,10 +76,6 @@ struct OStoreDataPageData : public store
@@ -3015,8 +3003,7 @@
/** get (external data page).
*/
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/store.cxx store/source/store.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/store.cxx 2006-09-17 03:12:37.000000000 +0200
+--- store/source/store.cxx 2006-09-17 03:12:37.000000000 +0200
+++ store/source/store.cxx 2007-03-14 10:11:07.000000000 +0100
@@ -163,7 +163,7 @@ storeError SAL_CALL store_createMemoryFi
return store_E_OutOfMemory;
@@ -3100,8 +3087,7 @@
if (eErrCode != store_E_None)
return eErrCode;
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storlckb.cxx store/source/storlckb.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storlckb.cxx 2006-09-17 03:12:50.000000000 +0200
+--- store/source/storlckb.cxx 2006-09-17 03:12:50.000000000 +0200
+++ store/source/storlckb.cxx 2007-03-13 11:27:31.000000000 +0100
@@ -125,7 +125,7 @@ static storeError __store_iget (
{
@@ -3299,8 +3285,7 @@
return store_E_None;
}
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storpage.cxx store/source/storpage.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storpage.cxx 2006-09-17 03:13:03.000000000 +0200
+--- store/source/storpage.cxx 2006-09-17 03:13:03.000000000 +0200
+++ store/source/storpage.cxx 2007-03-14 10:13:31.000000000 +0100
@@ -144,7 +144,8 @@ sal_Bool SAL_CALL OStorePageManager::isK
storeError OStorePageManager::initializeManager (
@@ -3761,8 +3746,7 @@
eErrCode = link (e.m_aKey, aDstKey);
}
e.m_nAttrib &= ~STORE_ATTRIB_ISLINK;
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storpage.hxx store/source/storpage.hxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/storpage.hxx 2006-06-20 02:34:18.000000000 +0200
+--- store/source/storpage.hxx 2006-06-20 02:34:18.000000000 +0200
+++ store/source/storpage.hxx 2007-03-14 10:09:52.000000000 +0100
@@ -81,7 +81,8 @@ public:
storeError initializeManager (
@@ -3774,8 +3758,7 @@
/** isValid.
* @return sal_True upon successful initialization,
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stortree.cxx store/source/stortree.cxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stortree.cxx 2006-09-17 03:13:15.000000000 +0200
+--- store/source/stortree.cxx 2006-09-17 03:13:15.000000000 +0200
+++ store/source/stortree.cxx 2007-03-15 14:12:58.000000000 +0100
@@ -78,7 +78,7 @@ using namespace store;
* OStoreBTreeNodeData.
@@ -3987,8 +3970,7 @@
m_rPage.truncate (1);
m_rPage.depth (m_rPage.depth() + 1);
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stortree.hxx store/source/stortree.hxx
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/source/stortree.hxx 2006-06-20 02:34:40.000000000 +0200
+--- store/source/stortree.hxx 2006-06-20 02:34:40.000000000 +0200
+++ store/source/stortree.hxx 2007-03-13 11:27:45.000000000 +0100
@@ -146,8 +146,15 @@ struct OStoreBTreeNodeData : public stor
@@ -4101,8 +4083,7 @@
}
/** queryMerge.
-diff -rup /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/workben/makefile.mk store/workben/makefile.mk
---- /home/rodo/svn/ooo-build-reference/build/oof680-m7/store/workben/makefile.mk 2005-09-08 10:49:17.000000000 +0200
+--- store/workben/makefile.mk 2005-09-08 10:49:17.000000000 +0200
+++ store/workben/makefile.mk 2007-02-28 22:58:41.000000000 +0100
@@ -68,12 +68,14 @@ CFLAGS+= -I..$/source
CXXFILES= \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]