aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-22 23:26:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Constification of addSlashR and removeSlashR

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-12-02 16:01:43 +01:00
parent dd6cc92035
commit 894151dba8
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/misc/string_common.h
View file

@ -28,8 +28,8 @@ namespace NLMISC
{ {
// get a string and add \r before \n if necessary // get a string and add \r before \n if necessary
std::string addSlashR (std::string str); std::string addSlashR (const std::string &str);
std::string removeSlashR (std::string str); std::string removeSlashR (const std::string &str);
/** /**
* \def MaxCStringSize * \def MaxCStringSize

6
code/nel/src/misc/string_common.cpp
View file

@ -27,7 +27,7 @@ using namespace std;
namespace NLMISC namespace NLMISC
{ {
string addSlashR (string str) string addSlashR (const string &str)
{ {
string formatedStr; string formatedStr;
// replace \n with \r\n // replace \n with \r\n
@ -42,10 +42,10 @@ string addSlashR (string str)
return formatedStr; return formatedStr;
} }
string removeSlashR (string str) string removeSlashR (const string &str)
{ {
string formatedStr; string formatedStr;
// replace \n with \r\n // remove \r
for (uint i = 0; i < str.size(); i++) for (uint i = 0; i < str.size(); i++)
{ {
if (str[i] != '\r') if (str[i] != '\r')

11
code/nel/src/net/email.cpp
View file

@ -196,15 +196,8 @@ bool sendEmail (const string &smtpServer, const string &from, const string &to,
// we must skip the first line // we must skip the first line
formatedBody = "\r\n"; formatedBody = "\r\n";
// replace \n with \r\n // replace \n by \r\n
for (i = 0; i < body.size(); i++) formatedBody += addSlashR(body);
{
if (body[i] == '\n' && i > 0 && body[i-1] != '\r')
{
formatedBody += '\r';
}
formatedBody += body[i];
}
// add attachment if any // add attachment if any
if (!attachedFile.empty()) if (!attachedFile.empty())