hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed extra newlines from several debug messages.

Browse source
This commit is contained in:
Thulinma 2014-01-23 11:33:02 +01:00
parent 0fe0c1fb4f
commit 92b7a7534d
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/dtsc.cpp
View file

@ -530,7 +530,7 @@ DTSC::File::File(std::string filename, bool create){
} }
created = create; created = create;
if ( !F){ if ( !F){
DEBUG_MSG(DLVL_ERROR, "Could not open file %s\n", filename.c_str()); DEBUG_MSG(DLVL_ERROR, "Could not open file %s", filename.c_str());
return; return;
} }
fseek(F, 0, SEEK_END); fseek(F, 0, SEEK_END);

2
lib/json.cpp
View file

@ -1085,7 +1085,7 @@ void JSON::fromDTMI(const unsigned char * data, unsigned int len, unsigned int &
break; break;
} }
} }
DEBUG_MSG(DLVL_FAIL, "Unimplemented DTMI type %hhx, @ %i / %i - returning.\n", data[i], i, len); DEBUG_MSG(DLVL_FAIL, "Unimplemented DTMI type %hhx, @ %i / %i - returning.", data[i], i, len);
i += 1; i += 1;
return; return;
} //fromOneDTMI } //fromOneDTMI

20
lib/socket.cpp
View file

@ -521,7 +521,7 @@ unsigned int Socket::Connection::iwrite(const void * buffer, int len){
if (errno != EPIPE){ if (errno != EPIPE){
Error = true; Error = true;
remotehost = strerror(errno); remotehost = strerror(errno);
DEBUG_MSG(DLVL_WARN, "Could not iwrite data! Error: %s\n", remotehost.c_str()); DEBUG_MSG(DLVL_WARN, "Could not iwrite data! Error: %s", remotehost.c_str());
} }
close(); close();
return 0; return 0;
@ -559,7 +559,7 @@ int Socket::Connection::iread(void * buffer, int len){
if (errno != EPIPE){ if (errno != EPIPE){
Error = true; Error = true;
remotehost = strerror(errno); remotehost = strerror(errno);
DEBUG_MSG(DLVL_WARN, "Could not iread data! Error: %s\n", remotehost.c_str()); DEBUG_MSG(DLVL_WARN, "Could not iread data! Error: %s", remotehost.c_str());
} }
close(); close();
return 0; return 0;
@ -683,17 +683,17 @@ bool Socket::Server::IPv6bind(int port, std::string hostname, bool nonblock){
if (ret == 0){ if (ret == 0){
ret = listen(sock, 100); //start listening, backlog of 100 allowed ret = listen(sock, 100); //start listening, backlog of 100 allowed
if (ret == 0){ if (ret == 0){
DEBUG_MSG(DLVL_DEVEL, "IPv6 socket success @ %s:%i\n", hostname.c_str(), port); DEBUG_MSG(DLVL_DEVEL, "IPv6 socket success @ %s:%i", hostname.c_str(), port);
return true; return true;
}else{ }else{
errors = strerror(errno); errors = strerror(errno);
DEBUG_MSG(DLVL_ERROR, "IPv6 listen failed! Error: %s\n", errors.c_str()); DEBUG_MSG(DLVL_ERROR, "IPv6 listen failed! Error: %s", errors.c_str());
close(); close();
return false; return false;
} }
}else{ }else{
errors = strerror(errno); errors = strerror(errno);
DEBUG_MSG(DLVL_ERROR, "IPv6 Binding %s:%i failed (%s)\n", hostname.c_str(), port, errors.c_str()); DEBUG_MSG(DLVL_ERROR, "IPv6 Binding %s:%i failed (%s)", hostname.c_str(), port, errors.c_str());
close(); close();
return false; return false;
} }
@ -730,17 +730,17 @@ bool Socket::Server::IPv4bind(int port, std::string hostname, bool nonblock){
if (ret == 0){ if (ret == 0){
ret = listen(sock, 100); //start listening, backlog of 100 allowed ret = listen(sock, 100); //start listening, backlog of 100 allowed
if (ret == 0){ if (ret == 0){
DEBUG_MSG(DLVL_DEVEL, "IPv4 socket success @ %s:%i\n", hostname.c_str(), port); DEBUG_MSG(DLVL_DEVEL, "IPv4 socket success @ %s:%i", hostname.c_str(), port);
return true; return true;
}else{ }else{
errors = strerror(errno); errors = strerror(errno);
DEBUG_MSG(DLVL_ERROR, "IPv4 listen failed! Error: %s\n", errors.c_str()); DEBUG_MSG(DLVL_ERROR, "IPv4 listen failed! Error: %s", errors.c_str());
close(); close();
return false; return false;
} }
}else{ }else{
errors = strerror(errno); errors = strerror(errno);
DEBUG_MSG(DLVL_ERROR, "IPv4 Binding %s:%i failed (%s)\n", hostname.c_str(), port, errors.c_str()); DEBUG_MSG(DLVL_ERROR, "IPv4 Binding %s:%i failed (%s)", hostname.c_str(), port, errors.c_str());
close(); close();
return false; return false;
} }
@ -775,13 +775,13 @@ Socket::Server::Server(std::string address, bool nonblock){
return; return;
}else{ }else{
errors = strerror(errno); errors = strerror(errno);
DEBUG_MSG(DLVL_ERROR, "Unix listen failed! Error: %s\n", errors.c_str()); DEBUG_MSG(DLVL_ERROR, "Unix listen failed! Error: %s", errors.c_str());
close(); close();
return; return;
} }
}else{ }else{
errors = strerror(errno); errors = strerror(errno);
DEBUG_MSG(DLVL_ERROR, "Unix Binding %s failed (%s)\n", address.c_str(), errors.c_str()); DEBUG_MSG(DLVL_ERROR, "Unix Binding %s failed (%s)", address.c_str(), errors.c_str());
close(); close();
return; return;
} }