Kaydet (Commit) b15b51b7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

sal/osl/unx: profile.c -> profile.cxx (to facilitate further fixes)

Change-Id: I3de66f499d20e7765b530890f746ccfe322252ac
üst 9a06a6e6
...@@ -165,6 +165,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ ...@@ -165,6 +165,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/module \ sal/osl/unx/module \
sal/osl/unx/process \ sal/osl/unx/process \
sal/osl/unx/process_impl \ sal/osl/unx/process_impl \
sal/osl/unx/profile \
$(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \ $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
)) ))
$(eval $(call gb_Library_add_cobjects,sal,\ $(eval $(call gb_Library_add_cobjects,sal,\
...@@ -172,7 +173,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\ ...@@ -172,7 +173,6 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/mutex \ sal/osl/unx/mutex \
sal/osl/unx/nlsupport \ sal/osl/unx/nlsupport \
sal/osl/unx/pipe \ sal/osl/unx/pipe \
sal/osl/unx/profile \
sal/osl/unx/readwrite_helper \ sal/osl/unx/readwrite_helper \
sal/osl/unx/security \ sal/osl/unx/security \
sal/osl/unx/socket \ sal/osl/unx/socket \
......
...@@ -135,7 +135,7 @@ static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_ ...@@ -135,7 +135,7 @@ static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_
static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags); static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, oslProfileOption Flags);
/* implemented in file.c */ /* implemented in file.c */
extern oslFileError FileURLToPath( char *, size_t, rtl_uString* ); extern "C" oslFileError FileURLToPath( char *, size_t, rtl_uString* );
oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOption Options) oslProfile SAL_CALL osl_openProfile(rtl_uString *ustrProfileName, oslProfileOption Options)
{ {
...@@ -151,7 +151,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o ...@@ -151,7 +151,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
{ {
osl_TFile* pFile; osl_TFile* pFile;
osl_TProfileImpl* pProfile; osl_TProfileImpl* pProfile;
sal_Bool bRet = sal_False; bool bRet = false;
#ifdef TRACE_OSL_PROFILE #ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_openProfile"); OSL_TRACE("In osl_openProfile");
...@@ -1288,7 +1288,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags) ...@@ -1288,7 +1288,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate) static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
{ {
sal_Bool bRet = sal_True; bool bRet = true;
#ifdef TRACE_OSL_PROFILE #ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_OslProfile_rewindFile"); OSL_TRACE("In osl_OslProfile_rewindFile");
#endif #endif
...@@ -1881,7 +1881,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) ...@@ -1881,7 +1881,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
if (! addEntry(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1], if (! addEntry(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1],
i, pStr, pChar - pStr)) i, pStr, pChar - pStr))
{ {
OSL_ASSERT(0); OSL_ASSERT(false);
continue; continue;
} }
...@@ -1892,7 +1892,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) ...@@ -1892,7 +1892,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1)) if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1))
{ {
OSL_ASSERT(0); OSL_ASSERT(false);
continue; continue;
} }
...@@ -1987,7 +1987,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) ...@@ -1987,7 +1987,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
{ {
osl_TFile* pFile=0; osl_TFile* pFile=0;
sal_Char* pszExtension = "tmp"; sal_Char const * pszExtension = "tmp";
sal_Char pszTmpName[PATH_MAX]; sal_Char pszTmpName[PATH_MAX];
oslProfileOption PFlags=0; oslProfileOption PFlags=0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment