diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-04 12:17:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-04 12:18:00 +0100 |
| commit | b15b51b76997c5b4cce5fa3d70df99acc1a5439a (patch) | |
| tree | 5443de394e750b149f8ea0f26417af48db3631b8 /sal | |
| parent | 9a06a6e6499e275c3b277cd88878522757a5de37 (diff) | |
sal/osl/unx: profile.c -> profile.cxx (to facilitate further fixes)
Change-Id: I3de66f499d20e7765b530890f746ccfe322252ac
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Library_sal.mk | 2 | ||||
| -rw-r--r-- | sal/osl/unx/profile.cxx (renamed from sal/osl/unx/profile.c) | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 6b16426a29ac..bda3dd346959 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -165,6 +165,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/module \ sal/osl/unx/process \ sal/osl/unx/process_impl \ + sal/osl/unx/profile \ $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \ )) $(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/nlsupport \ sal/osl/unx/pipe \ - sal/osl/unx/profile \ sal/osl/unx/readwrite_helper \ sal/osl/unx/security \ sal/osl/unx/socket \ diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.cxx index 906109bab827..53f0757e7686 100644 --- a/sal/osl/unx/profile.c +++ b/sal/osl/unx/profile.cxx @@ -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); /* 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) { @@ -151,7 +151,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o { osl_TFile* pFile; osl_TProfileImpl* pProfile; - sal_Bool bRet = sal_False; + bool bRet = false; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_openProfile"); @@ -1288,7 +1288,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags) static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate) { - sal_Bool bRet = sal_True; + bool bRet = true; #ifdef TRACE_OSL_PROFILE OSL_TRACE("In osl_OslProfile_rewindFile"); #endif @@ -1881,7 +1881,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) if (! addEntry(pProfile, &pProfile->m_Sections[pProfile->m_NoSections - 1], i, pStr, pChar - pStr)) { - OSL_ASSERT(0); + OSL_ASSERT(false); continue; } @@ -1892,7 +1892,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile) if (! addSection(pProfile, i, pStr + 1, pChar - pStr - 1)) { - OSL_ASSERT(0); + OSL_ASSERT(false); continue; } @@ -1987,7 +1987,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup) static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile) { osl_TFile* pFile=0; - sal_Char* pszExtension = "tmp"; + sal_Char const * pszExtension = "tmp"; sal_Char pszTmpName[PATH_MAX]; oslProfileOption PFlags=0; |