From 9af3de80e5887844c3caa7e8221bba2758578166 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Fri, 8 Dec 2000 17:38:05 +0000 Subject: [PATCH] Adjustments to dav for apr_dbm_open args change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87262 13f79535-47bb-0310-9956-ffa450edef68 --- modules/dav/fs/dbm.c | 6 +++--- modules/dav/fs/mod_dav_fs.dsp | 7 +++---- modules/dav/main/mod_dav.dsp | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/dav/fs/dbm.c b/modules/dav/fs/dbm.c index fec5d2fb99..dbadd08a06 100644 --- a/modules/dav/fs/dbm.c +++ b/modules/dav/fs/dbm.c @@ -156,9 +156,9 @@ dav_error * dav_dbm_open_direct(apr_pool_t *p, const char *pathname, int ro, *pdb = NULL; - if ((status = apr_dbm_open(pathname, p, - ro ? APR_DBM_READONLY : APR_DBM_RWCREATE, - &file)) != APR_SUCCESS + if ((status = apr_dbm_open(&file, pathname, + ro ? APR_DBM_READONLY : APR_DBM_RWCREATE, p)) + != APR_SUCCESS && !ro) { /* ### do something with 'status' */ diff --git a/modules/dav/fs/mod_dav_fs.dsp b/modules/dav/fs/mod_dav_fs.dsp index d83909345c..a1754ecf90 100644 --- a/modules/dav/fs/mod_dav_fs.dsp +++ b/modules/dav/fs/mod_dav_fs.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="mod_dav_fs" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 @@ -22,7 +22,6 @@ CFG=mod_dav_fs - Win32 Release !MESSAGE # Begin Project -# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -68,8 +67,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\mod_dav_fsD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /ZI /c -# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /ZI /c +# ADD BASE CPP /nologo /MTd /W3 /GX /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /Zi /c +# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\main" /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /Zi /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" diff --git a/modules/dav/main/mod_dav.dsp b/modules/dav/main/mod_dav.dsp index b062697682..e4f48a7a16 100644 --- a/modules/dav/main/mod_dav.dsp +++ b/modules/dav/main/mod_dav.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="mod_dav" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 @@ -22,7 +22,6 @@ CFG=mod_dav - Win32 Release !MESSAGE # Begin Project -# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -68,8 +67,8 @@ LINK32=link.exe # PROP Intermediate_Dir ".\mod_davD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c +# ADD BASE CPP /nologo /MTd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\srclib\aputil" /I "..\..\..\srclib\sdbm" /I "..\..\..\srclib\expat-lite" /I "..\..\..\srclib\apr\include" /I "../../../srclib/apr-util/include" /I "..\..\..\include" /I "..\..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "DAV_DECLARE_EXPORT" /YX /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -- 2.40.0