diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:23:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:23:45 +0000 |
| commit | dada37c989ba0da4914a9dd4118f2389d42208a1 (patch) | |
| tree | e4546e7bd7ed02bfc4a6647d917dbe9772b7cc3f /codemaker | |
| parent | c2828a5ef4f2a586697d06d37fa4776d80f2ae77 (diff) | |
INTEGRATION: CWS warnings01 (1.8.48); FILE MERGED
2006/04/07 20:38:39 sb 1.8.48.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/22 22:24:25 sb 1.8.48.2: RESYNC: (1.8-1.9); FILE MERGED
2005/09/05 13:32:25 sb 1.8.48.1: #i53898# Made code warning-free.
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/source/cppumaker/cppuoptions.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index 58cb798e13ac..942ff8377560 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cppuoptions.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: vg $ $Date: 2006-03-15 09:13:03 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:23:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -270,7 +270,6 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) default: throw IllegalArgument("the option is unknown" + OString(av[i])); - break; } } else { @@ -296,9 +295,9 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) ret = initOptions(rargc, rargv, bCmdFile); - for (long i=0; i < rargc; i++) + for (long j=0; j < rargc; j++) { - free(rargv[i]); + free(rargv[j]); } } } else @@ -309,7 +308,11 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) } else { OUString system_filepath; - OSL_VERIFY( osl_Process_E_None == osl_getCommandArg( i-1, &system_filepath.pData ) ); + if (osl_getCommandArg( i-1, &system_filepath.pData ) + != osl_Process_E_None) + { + OSL_ASSERT(false); + } m_inputFiles.push_back(OUStringToOString(system_filepath, osl_getThreadTextEncoding())); } } |