From 9c7dd96e75ecbbc9e9260414be9850df0f862f50 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Tue, 20 Jan 2009 16:30:38 +0000 Subject: [PATCH] warns on overwriting configuration git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1233 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/AmConfigReader.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/AmConfigReader.cpp b/core/AmConfigReader.cpp index 2937df0a..407af17c 100644 --- a/core/AmConfigReader.cpp +++ b/core/AmConfigReader.cpp @@ -112,10 +112,18 @@ int AmConfigReader::loadFile(const string& path) val_end = c; } - if((key_beg < key_end) && (val_beg <= val_end)) - keys[string(key_beg,key_end-key_beg)] = + if((key_beg < key_end) && (val_beg <= val_end)) { + string keyname = string(key_beg,key_end-key_beg); + if (hasParameter(keyname)) { + WARN("while loading '%s': overwriting configuration " + "'%s' value '%s' with '%s'\n", + path.c_str(), keyname.c_str(), + getParameter(keyname).c_str(), + string(val_beg,val_end-val_beg).c_str()); + } + keys[keyname] = string(val_beg,val_end-val_beg); - else + } else goto syntax_error; }