further log cleanings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-02-10 10:56:54 +00:00
parent be92a7941a
commit b46cf457db
7 changed files with 80 additions and 71 deletions

View file

@ -710,8 +710,7 @@ bool CUPnPService::Execute(
#endif
}
#ifdef UPNP_DEBUG
std::cerr << ")";
std::cerr << std::endl;
std::cerr << ")" << std::endl;
#endif
// Everything is ok, make the action
IXML_Document *ActionDoc = NULL;
@ -739,8 +738,7 @@ bool CUPnPService::Execute(
0, NULL);
if (!ActionDoc) {
#ifdef UPNP_DEBUG
std::cerr << "CUPnPService::Execute() Error: UpnpMakeAction returned NULL.";
std::cerr << std::endl;
std::cerr << "CUPnPService::Execute() Error: UpnpMakeAction returned NULL." << std::endl;
#endif
return false;
}
@ -765,8 +763,7 @@ const std::string CUPnPService::GetStateVariable(
it = propertyMap.find(stateVariableName);
if (it != propertyMap.end()) {
#ifdef UPNP_DEBUG
std::cerr << "CUPnPService::GetStateVariable(" << stateVariableName << ") = ";
std::cerr << (*it).second << std::endl;
std::cerr << "CUPnPService::GetStateVariable(" << stateVariableName << ") = " << (*it).second << std::endl;
#endif
return (*it).second;
} else {
@ -803,14 +800,12 @@ const std::string CUPnPService::GetStateVariable(
it = propertyMap.find(stateVariableName);
if (it != propertyMap.end()) {
#ifdef UPNP_DEBUG
std::cerr << "CUPnPService::GetStateVariable(" << stateVariableName << ") = ";
std::cerr << (*it).second << std::endl;
std::cerr << "CUPnPService::GetStateVariable(" << stateVariableName << ") = " << (*it).second << std::endl;
#endif
return (*it).second;
} else {
#ifdef UPNP_DEBUG
std::cerr << "CUPnPService::GetStateVariable(" << stateVariableName << ") = ";
std::cerr << "Empty String" << std::endl;
std::cerr << "CUPnPService::GetStateVariable(" << stateVariableName << ") = " << "Empty String" << std::endl;
#endif
return stdEmptyString;
}
@ -1326,8 +1321,7 @@ upnpDiscovery:
int ret;
if (d_event->ErrCode != UPNP_E_SUCCESS) {
#ifdef UPNP_DEBUG
std::cerr << upnpCP->m_upnpLib.GetUPnPErrorMessage(d_event->ErrCode) << ".";
std::cerr << std::endl;
std::cerr << upnpCP->m_upnpLib.GetUPnPErrorMessage(d_event->ErrCode) << "." << std::endl;
#endif
}
#ifdef UPNP_DEBUG

View file

@ -315,7 +315,9 @@ void upnphandler::shutdown()
void upnphandler::restart()
{
/* non-blocking call to shutdown upnp, and startup again. */
#ifdef UPNP_DEBUG
std::cerr << "upnphandler::restart() called." << std::endl;
#endif
background_setup_upnp(true, true);
}