Index: source/dbbe/Layer.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/Layer.cxx,v retrieving revision 1.1.2.12 diff -u -r1.1.2.12 Layer.cxx --- source/dbbe/Layer.cxx 17 Jul 2006 13:30:58 -0000 1.1.2.12 +++ source/dbbe/Layer.cxx 11 Aug 2006 08:56:29 -0000 @@ -173,17 +173,17 @@ } - void BaseLayer::readData(backend::XLayer * pContext, - const uno::Reference& xHandler, - Database& aDb, - rtl::OString aKey) + void BaseLayer::doReadData(backend::XLayer * pContext, + const uno::Reference& xHandler, + Database& aDb, + rtl::OString aKey) throw (backend::MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException) { if (!xHandler.is()) { rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM( - "BaseLayer - Cannot readData: Handler is NULL.")); + "BaseLayer - Cannot doReadData: Handler is NULL.")); throw lang::NullPointerException(sMessage,pContext); } @@ -216,7 +216,6 @@ sMsg.appendAscii(aKey.getStr()); sMsg.appendAscii("\"\n"); throw backend::BackendAccessException(sMsg.makeStringAndClear(), pContext, uno::Any()); - break; } } @@ -278,7 +277,7 @@ Layer::Layer( const uno::Reference& xFactory, Database& aDatabase, - const rtl::OString aKey) + const rtl::OString& aKey) :BaseLayer(xFactory, aDatabase, aKey) { } @@ -294,7 +293,7 @@ lang::WrappedTargetException, uno::RuntimeException) { - BaseLayer::readData(this, xHandler, getDb(), getKey()); + doReadData(this, xHandler, getDb(), getKey()); } rtl::OUString Layer::getTimestamp() @@ -309,7 +308,7 @@ UpdatableLayer::UpdatableLayer( const uno::Reference& xFactory, Database& aDatabase, - const rtl::OString aKey) + const rtl::OString& aKey) :BaseLayer(xFactory, aDatabase, aKey) { } @@ -325,7 +324,7 @@ lang::WrappedTargetException, uno::RuntimeException) { - BaseLayer::readData(this, xHandler, getDb(), getKey()); + doReadData(this, xHandler, getDb(), getKey()); } rtl::OUString UpdatableLayer::getTimestamp() @@ -411,7 +410,7 @@ findSubLayers(aKey); } - void BaseCompositeLayer::readSubLayerData( + void BaseCompositeLayer::doReadSubLayerData( backend::XCompositeLayer * pContext, const uno::Reference& xHandler, const rtl::OUString& aSubLayerId) @@ -422,7 +421,7 @@ if (!xHandler.is()) { rtl::OUString const sMessage(RTL_CONSTASCII_USTRINGPARAM( - "BaseCompositeLayer - Cannot readSubLayerData: Handler is NULL.")); + "BaseCompositeLayer - Cannot doReadSubLayerData: Handler is NULL.")); throw lang::NullPointerException(sMessage,pContext); } @@ -447,7 +446,7 @@ } if (mSubLayerKeys[i].getLength() != 0) { - BaseLayer::readData(pContext, xHandler, getDb(), mSubLayerKeys[i]) ; + doReadData(pContext, xHandler, getDb(), mSubLayerKeys[i]) ; } else { @@ -538,7 +537,7 @@ lang::WrappedTargetException, lang::IllegalArgumentException, uno::RuntimeException) { - return BaseCompositeLayer::readSubLayerData(this,xHandler,aSubLayerId); + return doReadSubLayerData(this,xHandler,aSubLayerId); } @@ -560,7 +559,7 @@ throw (backend::MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException) { - BaseLayer::readData(static_cast(this),xHandler, getDb(), getKey()); + doReadData(static_cast(this),xHandler, getDb(), getKey()); } void SAL_CALL UpdatableCompositeLayer::replaceWith( @@ -630,7 +629,7 @@ lang::WrappedTargetException, lang::IllegalArgumentException, uno::RuntimeException) { - return BaseCompositeLayer::readSubLayerData(this,xHandler,aSubLayerId); + return doReadSubLayerData(this,xHandler,aSubLayerId); } rtl::OUString SAL_CALL UpdatableCompositeLayer::getTimestamp() @@ -640,5 +639,5 @@ } - }; //namespace dbbe -}; //namespace configmgr + } //namespace dbbe +} //namespace configmgr Index: source/dbbe/Layer.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/Layer.hxx,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 Layer.hxx --- source/dbbe/Layer.hxx 9 Jun 2006 23:04:56 -0000 1.1.2.4 +++ source/dbbe/Layer.hxx 11 Aug 2006 08:56:29 -0000 @@ -96,7 +96,7 @@ throw (uno::Exception); virtual void SAL_CALL getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) const; - + using PropertySetHelper::getFastPropertyValue; }; //end lift @@ -140,10 +140,10 @@ @throws com::sun::star::lang::WrappedTargetException if an error occurs while accessing the data. */ - void readData(backend::XLayer * pContext, - const uno::Reference& xHandler, - Database& aDb, - rtl::OString aKey) + void doReadData(backend::XLayer * pContext, + const uno::Reference& xHandler, + Database& aDb, + rtl::OString aKey) throw (backend::MalformedDataException, lang::NullPointerException, lang::WrappedTargetException, uno::RuntimeException); /** @@ -184,7 +184,7 @@ Layer( const uno::Reference& xFactory, Database& aDatabase, - rtl::OString aKey); + const rtl::OString& aKey); /** Descructor */ ~Layer(); @@ -227,7 +227,7 @@ UpdatableLayer( const uno::Reference& xFactory, Database& aDatabase, - rtl::OString aKey); + const rtl::OString & aKey); /** Descructor */ ~UpdatableLayer(); @@ -292,7 +292,7 @@ throw (lang::WrappedTargetException, uno::RuntimeException) { return mSubLayerIds; } - void SAL_CALL readSubLayerData( + void SAL_CALL doReadSubLayerData( backend::XCompositeLayer * pContext, const uno::Reference& xHandler, const rtl::OUString& aSubLayerId) @@ -453,6 +453,6 @@ uno::Reference mLayerWriter ; }; -}}; //configmgr::dbbe +}} //configmgr::dbbe #endif //CONFIMGR_DBBE_LAYER_HXX_ Index: source/dbbe/Record.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/Record.cxx,v retrieving revision 1.1.2.17 diff -u -r1.1.2.17 Record.cxx --- source/dbbe/Record.cxx 8 Aug 2006 17:38:44 -0000 1.1.2.17 +++ source/dbbe/Record.cxx 11 Aug 2006 08:56:29 -0000 @@ -338,6 +338,6 @@ return ret; } - }; -}; //namespace + } +} //namespace Index: source/dbbe/basestratum.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/basestratum.cxx,v retrieving revision 1.1.2.13 diff -u -r1.1.2.13 basestratum.cxx --- source/dbbe/basestratum.cxx 17 Jul 2006 13:11:57 -0000 1.1.2.13 +++ source/dbbe/basestratum.cxx 11 Aug 2006 08:56:30 -0000 @@ -283,7 +283,6 @@ case Database::E_NOENT: return false; - break; default: //something bad happened rtl::OUStringBuffer errbuf; @@ -293,10 +292,9 @@ errbuf.appendAscii("\" "); rtl::OUString const errmsg = errbuf.makeStringAndClear(); throw backend::BackendAccessException(errmsg,*this,uno::Any()); - break; } return true; } - }; //namespace dbbe -}; //namespace configmgr + } //namespace dbbe +} //namespace configmgr Index: source/dbbe/basestratum.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/basestratum.hxx,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 basestratum.hxx --- source/dbbe/basestratum.hxx 2 May 2006 20:29:20 -0000 1.1.2.2 +++ source/dbbe/basestratum.hxx 11 Aug 2006 08:56:30 -0000 @@ -234,7 +234,7 @@ const rtl::OString &aSubLayer); - }; //namespace dbbe -}; //namespace configmgr + } //namespace dbbe +} //namespace configmgr #endif//CONFIMGR_DBBE_BASESTRATUM_HXX_ Index: source/dbbe/database.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/database.cxx,v retrieving revision 1.1.2.18 diff -u -r1.1.2.18 database.cxx --- source/dbbe/database.cxx 14 Jul 2006 16:59:23 -0000 1.1.2.18 +++ source/dbbe/database.cxx 11 Aug 2006 08:56:30 -0000 @@ -56,14 +56,28 @@ #include #endif//_OSL_PROCESS_H_ -#if defined(FREEBSD) || defined(NETBSD) ||\ - defined(LINUX) || defined(SOLARIS) +#if defined(FREEBSD) || defined(NETBSD) || defined(LINUX) #define HAVE_FADVISE #include #endif #include +extern "C" +{ + static void* malloc_wrapper(size_t size) + { + return rtl_allocateMemory(size); + } + static void* realloc_wrapper(void *ptr, size_t size) + { + return rtl_reallocateMemory(ptr, size); + } + static void free_wrapper(void *ptr) + { + rtl_freeMemory(ptr); + } +} namespace configmgr { @@ -135,19 +149,6 @@ } } - static inline void* malloc_wrapper(size_t size) - { - return rtl_allocateMemory(size); - } - static inline void* realloc_wrapper(void *ptr, size_t size) - { - return rtl_reallocateMemory(ptr, size); - } - static inline void free_wrapper(void *ptr) - { - rtl_freeMemory(ptr); - } - Database::RC Database::open(bool create) { using namespace osl; @@ -274,7 +275,6 @@ { case DB_NOTFOUND: return E_NOENT; - break; case 0: { @@ -284,11 +284,9 @@ OSL_ASSERT(*ppRecord); return E_None; } - break; default: return E_invalidError; - break; } return E_invalidError; //control never reaches here } @@ -412,8 +410,6 @@ default: abort(); - break; - } } if (pCursor->c_close(pCursor)) @@ -441,11 +437,9 @@ OSL_ASSERT(filenamep); aPath= rtl::OString(filenamep); return E_None; - break; default: return E_invalidError; - break; } return E_invalidError; } @@ -487,8 +481,8 @@ return E_invalidError; } - }; //dbbe -}; //configmgr + } //dbbe +} //configmgr Index: source/dbbe/factory.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/factory.cxx,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 factory.cxx --- source/dbbe/factory.cxx 9 May 2006 21:36:35 -0000 1.1.2.3 +++ source/dbbe/factory.cxx 11 Aug 2006 08:56:30 -0000 @@ -86,7 +86,7 @@ return pDb; } - }; -}; //namespaces + } +} //namespaces #endif //CONFIGMGR_DBBE_FACTORY_HXX_ Index: source/dbbe/factory.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/factory.hxx,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 factory.hxx --- source/dbbe/factory.hxx 25 May 2006 01:09:47 -0000 1.1.2.3 +++ source/dbbe/factory.hxx 11 Aug 2006 08:56:30 -0000 @@ -92,7 +92,7 @@ DbHash mDbs; }; - }; -}; //namespace + } +} //namespace #endif //CONFIGMGR_DBBE_FACTORY_HXX_ Index: source/dbbe/multistratum.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/multistratum.cxx,v retrieving revision 1.1.2.17 diff -u -r1.1.2.17 multistratum.cxx --- source/dbbe/multistratum.cxx 17 Jul 2006 12:57:37 -0000 1.1.2.17 +++ source/dbbe/multistratum.cxx 11 Aug 2006 08:56:30 -0000 @@ -117,7 +117,6 @@ case Database::E_NOENT: return uno::Sequence(); - break; default: //something bad happened rtl::OUStringBuffer errbuf; @@ -127,7 +126,6 @@ errbuf.appendAscii("\"\n"); rtl::OUString const errmsg = errbuf.makeStringAndClear(); throw backend::BackendAccessException(errmsg,*this,uno::Any()); - break; } return uno::Sequence(&aResult.front(), static_cast(aResult.size())); @@ -250,5 +248,5 @@ return xResult; //should be NULL? } - }; //namespace dbbe -}; //namespace configmgr + } //namespace dbbe +} //namespace configmgr Index: source/dbbe/multistratum.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/multistratum.hxx,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 multistratum.hxx --- source/dbbe/multistratum.hxx 5 May 2006 00:23:53 -0000 1.1.2.2 +++ source/dbbe/multistratum.hxx 11 Aug 2006 08:56:30 -0000 @@ -113,8 +113,8 @@ virtual const ServiceImplementationInfo * getServiceInfoData() const; } ; - }; //namespace dbbe -}; //namespace configmgr + } //namespace dbbe +} //namespace configmgr #endif Index: source/dbbe/singlestratum.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/singlestratum.cxx,v retrieving revision 1.1.2.11 diff -u -r1.1.2.11 singlestratum.cxx --- source/dbbe/singlestratum.cxx 19 Jul 2006 23:02:50 -0000 1.1.2.11 +++ source/dbbe/singlestratum.cxx 11 Aug 2006 08:56:30 -0000 @@ -185,6 +185,6 @@ } - }; //namespace dbbe -}; //namespace configmr + } //namespace dbbe +} //namespace configmr Index: source/dbbe/singlestratum.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/Attic/singlestratum.hxx,v retrieving revision 1.1.2.2 diff -u -r1.1.2.2 singlestratum.hxx --- source/dbbe/singlestratum.hxx 2 May 2006 20:29:22 -0000 1.1.2.2 +++ source/dbbe/singlestratum.hxx 11 Aug 2006 08:56:30 -0000 @@ -92,8 +92,8 @@ virtual const ServiceImplementationInfo * getServiceInfoData() const; }; - }; //dbbe -}; //configmgr + } //dbbe +} //configmgr #endif Index: source/dbbe/util/argparse.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/argparse.cxx,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 argparse.cxx --- source/dbbe/util/argparse.cxx 11 Jul 2006 14:01:29 -0000 1.1.2.3 +++ source/dbbe/util/argparse.cxx 11 Aug 2006 08:56:30 -0000 @@ -152,17 +152,17 @@ return 0; } - int optind= 1; - while (optind < argc) + int n= 1; + while (n < argc) { - arg* match= argMatch(argv[optind]); + arg* match= argMatch(argv[n]); if (match) { OSL_ASSERT(match->flagStore); *(match->flagStore)= true; if (match->hasValue) { - char *equals= strstr(argv[optind], "="); + char *equals= strstr(argv[n], "="); if (equals) { OSL_ASSERT(match->valueStore); @@ -170,12 +170,12 @@ OSL_ASSERT(match->valueStore); } } - optind++; + n++; } else - return optind; + return n; } - return optind; + return n; } bool argParser::mandatoryOptsSet() const Index: source/dbbe/util/argparse.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/argparse.hxx,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 argparse.hxx --- source/dbbe/util/argparse.hxx 27 Apr 2006 23:47:44 -0000 1.1.2.1 +++ source/dbbe/util/argparse.hxx 11 Aug 2006 08:56:30 -0000 @@ -44,13 +44,13 @@ */ struct arg { - char* argName; //the name of the argument (foo, etc) + char const* argName; //the name of the argument (foo, etc) char shortName; //the (f in -f, etc) bool optional; //true if optional false otherwise bool hasValue; //true if this option has a value (-foo=bar) bool* flagStore; //true is written here if option is set char** valueStore; //string is copied here if option is set - char* usageString; //the string that explains this usage + char const* usageString; //the string that explains this usage //in the printUsage method }; Index: source/dbbe/util/graph.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/graph.cxx,v retrieving revision 1.1.2.11 diff -u -r1.1.2.11 graph.cxx --- source/dbbe/util/graph.cxx 14 Jul 2006 01:28:32 -0000 1.1.2.11 +++ source/dbbe/util/graph.cxx 11 Aug 2006 08:56:30 -0000 @@ -177,7 +177,7 @@ out << "}" << endl; } - }; //dbbe -}; //configmgr + } //dbbe +} //configmgr #endif //CONFIGMGR_DBBE_UTIL_GRAPH_HXX_ Index: source/dbbe/util/graph.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/graph.hxx,v retrieving revision 1.1.2.7 diff -u -r1.1.2.7 graph.hxx --- source/dbbe/util/graph.hxx 9 Jun 2006 23:04:57 -0000 1.1.2.7 +++ source/dbbe/util/graph.hxx 11 Aug 2006 08:56:30 -0000 @@ -72,7 +72,7 @@ public: typedef std::hash_map, eqstr> nodeHash; - typedef std::hash_set, eqstr> keySet; + typedef std::hash_set, eqstr> keySet; // typedef std::set keySet; // typedef std::hash_map, eqstr> nodeHash; // typedef std::hash_set, eqstr> keySet; @@ -188,8 +188,8 @@ // }; }; - }; -}; + } +} #endif Index: source/dbbe/util/main.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/main.cxx,v retrieving revision 1.1.2.15 diff -u -r1.1.2.15 main.cxx --- source/dbbe/util/main.cxx 11 Jul 2006 14:01:29 -0000 1.1.2.15 +++ source/dbbe/util/main.cxx 11 Aug 2006 08:56:30 -0000 @@ -151,7 +151,7 @@ {0, 0, 0, 0, 0, 0, 0} }; argParser aParser(argc, argv, args, summary); - int optind= aParser.parseArgs(); + int n= aParser.parseArgs(); if (helpFlag) { aParser.printUsage(NULL, footer); @@ -160,7 +160,7 @@ if (!aParser.mandatoryOptsSet()) { aParser.printUsage(NULL, footer); - abort(); + exit(1); } /* modes */ @@ -174,14 +174,14 @@ { std::cerr << "No database file specified!" << std::endl << std::endl; aParser.printUsage(NULL, footer); - abort(); + exit(1); } - if (optind < argc) + if (n < argc) { DatabaseSanityChecker* pDatabaseSanityChecker= new DatabaseSanityChecker(db_path); OSL_ASSERT(pDatabaseSanityChecker); - if (!strcmp(argv[optind], sanity_check)) + if (!strcmp(argv[n], sanity_check)) { OSL_VERIFY(Database::E_None == pDatabaseSanityChecker->open()); @@ -195,34 +195,33 @@ std::cerr << "Errors detected in database!" << std::endl; abort(); } - delete pDatabaseSanityChecker; } - else if(!strcmp(argv[optind], stat)) + else if(!strcmp(argv[n], stat)) { Database *pDatabase= new Database(db_path); OSL_ASSERT(pDatabase); OSL_VERIFY(Database::E_None == pDatabase->open()); - optind++; + n++; char* graphFile= NULL; - if (optind < argc) + if (n < argc) { - graphFile= argv[optind]; + graphFile= argv[n]; } configmgr::dbbe::Stat(*pDatabase, graphFile); delete pDatabase; exit(0); } - else if(!strcmp(argv[optind], import)) + else if(!strcmp(argv[n], import)) { Database *pDatabase= new Database(db_path); OSL_ASSERT(pDatabase); OSL_VERIFY(Database::E_None == pDatabase->open(true)); configmgr::dbbe::databaseLoadStore aDatabaseLoadStore(*pDatabase, db_path); - optind++; - if (optind < argc) + n++; + if (n < argc) { - aDatabaseLoadStore.importPath(argv[optind++], code, purgeFlag); + aDatabaseLoadStore.importPath(argv[n++], code, purgeFlag); if (pDatabase) { delete pDatabase; @@ -236,19 +235,19 @@ { delete pDatabase; } - abort(); + exit(1); } } - else if (!strcmp(argv[optind], xport)) + else if (!strcmp(argv[n], xport)) { Database *pDatabase= new Database(db_path); OSL_ASSERT(pDatabase); OSL_VERIFY(Database::E_None == pDatabase->open()); configmgr::dbbe::databaseLoadStore aDatabaseLoadStore(*pDatabase, db_path); - optind++; - if (optind < argc) + n++; + if (n < argc) { - aDatabaseLoadStore.exportNamespace(argv[optind++], argv[optind++], code); + aDatabaseLoadStore.exportNamespace(argv[n++], argv[n++], code); if (pDatabase) { delete pDatabase; @@ -262,19 +261,19 @@ { delete pDatabase; } - abort(); + exit(1); } } - else if (!strcmp(argv[optind], remove)) + else if (!strcmp(argv[n], remove)) { Database *pDatabase= new Database(db_path); OSL_ASSERT(pDatabase); OSL_VERIFY(Database::E_None == pDatabase->open()); configmgr::dbbe::databaseLoadStore aDatabaseLoadStore(*pDatabase, db_path); - optind++; - if (optind < argc) + n++; + if (n < argc) { - aDatabaseLoadStore.purgeKey(argv[optind++]); + aDatabaseLoadStore.purgeKey(argv[n++]); exit(0); } else @@ -284,14 +283,12 @@ { delete pDatabase; } - abort(); + exit(1); } } aParser.printUsage(NULL, footer); - abort(); + exit(1); } aParser.printUsage(NULL, footer); - abort(); - - return 0; + return 1; } Index: source/dbbe/util/major.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/major.cxx,v retrieving revision 1.1.2.25 diff -u -r1.1.2.25 major.cxx --- source/dbbe/util/major.cxx 17 Jul 2006 12:53:13 -0000 1.1.2.25 +++ source/dbbe/util/major.cxx 11 Aug 2006 08:56:30 -0000 @@ -138,7 +138,6 @@ default: std::cerr << "Encountered illegal conversion char: " << code[c] << std::endl; abort(); - break; } } @@ -222,7 +221,6 @@ default: std::cerr << "Encountered illegal conversion char: " << code[i] << std::endl; abort(); - break; } } fileUrl= URLbuf.makeStringAndClear(); @@ -265,10 +263,10 @@ { const char* asciiSep= "::"; - char* nsSep= strstr(key.getStr(), asciiSep); + char const * nsSep= strstr(key.getStr(), asciiSep); OSL_ASSERT(nsSep); nsSep+= strlen(asciiSep); - char *subSep= strstr(nsSep, asciiSep); + char const *subSep= strstr(nsSep, asciiSep); OSL_ASSERT(subSep); if (!(*subSep)) { @@ -281,10 +279,10 @@ { const char* asciiSep= "::"; - char *nsSep= strstr(key.getStr(), asciiSep); + char const *nsSep= strstr(key.getStr(), asciiSep); OSL_ASSERT(nsSep); nsSep+= strlen(asciiSep); - char *subSep= strstr(nsSep, asciiSep); + char const *subSep= strstr(nsSep, asciiSep); OSL_ASSERT(subSep); subSep+= strlen(asciiSep); if (!(*subSep)) @@ -351,7 +349,6 @@ std::cerr << "Error when trying to set \"" << aChildKey.getStr(); std::cerr << "\" as a child of \"" << aParentKey.getStr() << "\"" << std::endl; abort(); - break; } } @@ -459,7 +456,6 @@ default: abort(); - break; } } else @@ -551,7 +547,6 @@ default: cerr << "Getting an unknown error" << endl; abort(); - break; } nIndex= aDirURL.indexOf('/', nIndex); } while (nIndex >= 0 && nIndex < aDirURL.getLength()); @@ -746,5 +741,5 @@ } } - }; -}; + } +} Index: source/dbbe/util/major.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/major.hxx,v retrieving revision 1.1.2.18 diff -u -r1.1.2.18 major.hxx --- source/dbbe/util/major.hxx 6 Jul 2006 22:45:12 -0000 1.1.2.18 +++ source/dbbe/util/major.hxx 11 Aug 2006 08:56:30 -0000 @@ -318,8 +318,8 @@ friend class graph; }; - }; -}; + } +} #endif Index: source/dbbe/util/minor.cxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/minor.cxx,v retrieving revision 1.1.2.12 diff -u -r1.1.2.12 minor.cxx --- source/dbbe/util/minor.cxx 14 Jul 2006 01:29:09 -0000 1.1.2.12 +++ source/dbbe/util/minor.cxx 11 Aug 2006 08:56:30 -0000 @@ -212,5 +212,5 @@ } return sal_True; } - }; //dbbe -}; //configmgr + } //dbbe +} //configmgr Index: source/dbbe/util/minor.hxx =================================================================== RCS file: /cvs/util/configmgr/source/dbbe/util/Attic/minor.hxx,v retrieving revision 1.1.2.5 diff -u -r1.1.2.5 minor.hxx --- source/dbbe/util/minor.hxx 27 Jun 2006 01:19:54 -0000 1.1.2.5 +++ source/dbbe/util/minor.hxx 11 Aug 2006 08:56:30 -0000 @@ -113,6 +113,6 @@ */ void Stat(Database& aDatabase, const sal_Char* graphFile); - }; //dbbe -}; //configmgr + } //dbbe +} //configmgr #endif//CONFIGMGR_DBBE_UTIL_MINOR_HXX_ Index: source/inc/Record.hxx =================================================================== RCS file: /cvs/util/configmgr/source/inc/Attic/Record.hxx,v retrieving revision 1.1.2.6 diff -u -r1.1.2.6 Record.hxx --- source/inc/Record.hxx 21 Jul 2006 04:40:02 -0000 1.1.2.6 +++ source/inc/Record.hxx 11 Aug 2006 08:56:30 -0000 @@ -158,7 +158,7 @@ friend class RecordTester; #endif }; - }; -}; //namespace + } +} //namespace #endif //CONFIGMGR_DBBE_RECORD_HXX_ Index: source/inc/database.hxx =================================================================== RCS file: /cvs/util/configmgr/source/inc/Attic/database.hxx,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 database.hxx --- source/inc/database.hxx 27 Jun 2006 01:19:53 -0000 1.1.2.4 +++ source/inc/database.hxx 11 Aug 2006 08:56:30 -0000 @@ -220,8 +220,8 @@ /** Assignment not allowed */ Database & operator= (const Database&); }; - }; //dbbe -}; //configmgr + } //dbbe +} //configmgr #endif //CONFIGMGR_DBBE_DATABASE_HXX_