duplicate registry attempts are not errors

This commit is contained in:
David Rose 2003-10-09 18:34:18 +00:00
parent fb17effa20
commit 5b780a9c62

View File

@ -170,7 +170,7 @@ void LoaderFileTypeRegistry::
register_type(LoaderFileType *type) { register_type(LoaderFileType *type) {
// Make sure we haven't already registered this type. // Make sure we haven't already registered this type.
if (find(_types.begin(), _types.end(), type) != _types.end()) { if (find(_types.begin(), _types.end(), type) != _types.end()) {
loader_cat->info() loader_cat->debug()
<< "Attempt to register LoaderFileType " << type->get_name() << "Attempt to register LoaderFileType " << type->get_name()
<< " (" << type->get_type() << ") more than once.\n"; << " (" << type->get_type() << ") more than once.\n";
return; return;
@ -207,7 +207,7 @@ register_deferred_type(const string &extension, const string &library) {
if (ei != _extensions.end()) { if (ei != _extensions.end()) {
// We already have a loader for this type; no need to register // We already have a loader for this type; no need to register
// another one. // another one.
loader_cat->info() loader_cat->debug()
<< "Attempt to register loader library " << library << "Attempt to register loader library " << library
<< " (" << dcextension << ") when extension is already known.\n"; << " (" << dcextension << ") when extension is already known.\n";
return; return;
@ -217,12 +217,12 @@ register_deferred_type(const string &extension, const string &library) {
di = _deferred_types.find(dcextension); di = _deferred_types.find(dcextension);
if (di != _deferred_types.end()) { if (di != _deferred_types.end()) {
if ((*di).second == library) { if ((*di).second == library) {
loader_cat->info() loader_cat->debug()
<< "Attempt to register loader library " << library << "Attempt to register loader library " << library
<< " (" << dcextension << ") more than once.\n"; << " (" << dcextension << ") more than once.\n";
return; return;
} else { } else {
loader_cat->info() loader_cat->debug()
<< "Multiple libraries registered that use the extension " << "Multiple libraries registered that use the extension "
<< dcextension << "\n"; << dcextension << "\n";
} }
@ -243,7 +243,7 @@ record_extension(const string &extension, LoaderFileType *type) {
Extensions::const_iterator ei; Extensions::const_iterator ei;
ei = _extensions.find(dcextension); ei = _extensions.find(dcextension);
if (ei != _extensions.end()) { if (ei != _extensions.end()) {
loader_cat->info() loader_cat->debug()
<< "Multiple LoaderFileTypes registered that use the extension " << "Multiple LoaderFileTypes registered that use the extension "
<< dcextension << "\n"; << dcextension << "\n";
} else { } else {