diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:29:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 13:29:26 +0000 |
| commit | 1f5fa79a939500d479570f647c5b828f41a78a52 (patch) | |
| tree | 8771595e4bb97645bd5a172eafb1aa1d8997966b /registry | |
| parent | 3e353d5bc84cbacea94429fbedc6bf2c3f8dfa96 (diff) | |
INTEGRATION: CWS warnings01 (1.3.28); FILE MERGED
2005/11/21 13:37:39 sb 1.3.28.3: #i53898# Made code warning-free.
2005/09/22 22:06:30 sb 1.3.28.2: RESYNC: (1.3-1.4); FILE MERGED
2005/09/05 10:06:53 sb 1.3.28.1: #i53898# Made code warning-free.
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/tools/regmerge.cxx | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx index 76b40bb502cb..8c7ac6308e8d 100644 --- a/registry/tools/regmerge.cxx +++ b/registry/tools/regmerge.cxx @@ -4,9 +4,9 @@ * * $RCSfile: regmerge.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 05:19:02 $ + * last change: $Author: hr $ $Date: 2006-06-19 14:29:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,11 +87,22 @@ OUString convertToFileUrl(const OString& fileName) if ( fileName.indexOf('.') == 0 || fileName.indexOf(SEPARATOR) < 0 ) { OUString uWorkingDir; - OSL_VERIFY( osl_getProcessWorkingDir(&uWorkingDir.pData) == osl_Process_E_None ); - OSL_VERIFY( FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName) == FileBase::E_None ); + if (osl_getProcessWorkingDir(&uWorkingDir.pData) != osl_Process_E_None) + { + OSL_ASSERT(false); + } + if (FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName) + != FileBase::E_None) + { + OSL_ASSERT(false); + } } else { - OSL_VERIFY( FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName) == FileBase::E_None ); + if (FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName) + != FileBase::E_None) + { + OSL_ASSERT(false); + } } return uUrlFileName; @@ -240,11 +251,13 @@ int _cdecl main( int argc, char * argv[] ) { ::rtl::OUString mergeKeyName( ::rtl::OUString::createFromAscii(realargv[2]) ); ::rtl::OUString targetRegName; - RegError _ret = REG_NO_ERROR; for (int i = 3; i < realargc; i++) { targetRegName = convertToFileUrl(realargv[i]); - if (_ret = reg_mergeKey(hRootKey, mergeKeyName.pData, targetRegName.pData, sal_False, bVerbose)) + RegError _ret = reg_mergeKey( + hRootKey, mergeKeyName.pData, targetRegName.pData, sal_False, + bVerbose); + if (_ret) { if (_ret == REG_MERGE_CONFLICT) { |