Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 53892c778ab918e2874c6faef96dffaa257ce95f (commit)
from 03b0cd6f598cc592e1a28bc6f4a785bf48fc0967 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 53892c778ab918e2874c6faef96dffaa257ce95f
Author: Christian Schuett <gaucho...@hotmail.com>
Date: Sat Nov 8 19:32:58 2014 +0100
nhttpd: reverse commit 8d7215d
passed by reference did result in
throwing an instance of std::out_of_range
Signed-off-by: GetAway <get-a...@t-online.de>
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
index 8e17c03..471eb23 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.cpp
@@ -92,7 +92,7 @@ std::string string_printf(const char *fmt, ...)
// ySplitString: spit string "str" in two strings "left" and "right" at
// one of the chars in "delimiter" returns true if delimiter found
//-------------------------------------------------------------------------
-bool ySplitString(const std::string &str, const std::string &delimiter,
std::string &left, std::string &right)
+bool ySplitString(std::string str, std::string delimiter, std::string& left,
std::string& right)
{
std::string::size_type pos;
if ((pos = str.find_first_of(delimiter)) != std::string::npos)
@@ -111,7 +111,7 @@ bool ySplitString(const std::string &str, const std::string
&delimiter, std::str
// ySplitString: spit string "str" in two strings "left" and "right" at
// one of the chars in "delimiter" returns true if delimiter found
//-------------------------------------------------------------------------
-bool ySplitStringExact(const std::string &str, const std::string &delimiter,
std::string &left, std::string &right)
+bool ySplitStringExact(std::string str, std::string delimiter, std::string&
left, std::string& right)
{
std::string::size_type pos;
if ((pos = str.find(delimiter)) != std::string::npos)
@@ -130,7 +130,7 @@ bool ySplitStringExact(const std::string &str, const
std::string &delimiter, std
// ySplitStringRight: spit string "str" in two strings "left" and "right" at
// one of the chars in "delimiter" returns true if delimiter found
//-------------------------------------------------------------------------
-bool ySplitStringLast(const std::string &str, const std::string &delimiter,
std::string &left, std::string &right)
+bool ySplitStringLast(std::string str, std::string delimiter, std::string&
left, std::string& right)
{
std::string::size_type pos;
if ((pos = str.find_last_of(delimiter)) != std::string::npos)
@@ -148,7 +148,7 @@ bool ySplitStringLast(const std::string &str, const
std::string &delimiter, std:
//-------------------------------------------------------------------------
// ySplitStringVector: spit string "str" and build vector of strings
//-------------------------------------------------------------------------
-CStringArray ySplitStringVector(const std::string &str, const std::string
&delimiter)
+CStringArray ySplitStringVector(std::string str, std::string delimiter)
{
std::string left, right, rest;
bool found;
@@ -203,7 +203,7 @@ bool nocase_compare (char c1, char c2)
//-----------------------------------------------------------------------------
// Decode URLEncoded std::string
//-----------------------------------------------------------------------------
-std::string decodeString(const std::string &encodedString)
+std::string decodeString(std::string encodedString)
{
const char *string = encodedString.c_str();
unsigned int count=0;
@@ -239,7 +239,7 @@ std::string decodeString(const std::string &encodedString)
//-----------------------------------------------------------------------------
// HTMLEncode std::string
//-----------------------------------------------------------------------------
-std::string encodeString(const std::string &decodedString)
+std::string encodeString(std::string decodedString)
{
unsigned int len = sizeof(char) * decodedString.length()*5 + 1;
std::string result( len, '\0' );
@@ -279,7 +279,7 @@ std::string string_tolower(std::string str)
//-----------------------------------------------------------------------------
// write string to a file
//-----------------------------------------------------------------------------
-bool write_to_file(const std::string &filename, const std::string &content)
+bool write_to_file(std::string filename, std::string content)
{
FILE *fd = NULL;
if((fd = fopen(filename.c_str(),"w")) != NULL)
// open file
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h
b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h
index 2b22c66..2d570ac 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/helper.h
@@ -21,8 +21,8 @@ void correctTime(struct tm *zt);
//-----------------------------------------------------------------------------
std::string itoa(unsigned int conv);
std::string itoh(unsigned int conv);
-std::string decodeString(const std::string &encodedString);
-std::string encodeString(const std::string &decodedString);
+std::string decodeString(std::string encodedString);
+std::string encodeString(std::string decodedString);
std::string string_tolower(std::string str);
//-----------------------------------------------------------------------------
@@ -31,12 +31,12 @@ std::string string_tolower(std::string str);
std::string trim(std::string const& source, char const* delims = " \t\r\n");
void replace(std::string &str, const std::string &find_what, const std::string
&replace_with);
std::string string_printf(const char *fmt, ...);
-bool ySplitString(const std::string &str, const std::string &delimiter,
std::string &left, std::string &right);
-bool ySplitStringExact(const std::string &str, const std::string &delimiter,
std::string &left, std::string &right);
-bool ySplitStringLast(const std::string &str, const std::string &delimiter,
std::string &left, std::string &right);
-CStringArray ySplitStringVector(const std::string &str, const std::string
&delimiter);
+bool ySplitString(std::string str, std::string delimiter, std::string& left,
std::string& right);
+bool ySplitStringExact(std::string str, std::string delimiter, std::string&
left, std::string& right);
+bool ySplitStringLast(std::string str, std::string delimiter, std::string&
left, std::string& right);
+CStringArray ySplitStringVector(std::string str, std::string delimiter);
bool nocase_compare (char c1, char c2);
std::string timeString(time_t time);
-bool write_to_file(const std::string &filename, const std::string &content);
+bool write_to_file(std::string filename, std::string content);
#endif /* __yhttpd_helper_h__ */
-----------------------------------------------------------------------
Summary of changes:
.../neutrino/daemons/nhttpd/yhttpd_core/helper.cpp | 14 +++++++-------
.../neutrino/daemons/nhttpd/yhttpd_core/helper.h | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
--
Tuxbox-GIT: apps
------------------------------------------------------------------------------
_______________________________________________
Tuxbox-cvs-commits mailing list
Tuxbox-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
