From 54f8b3ae5df6736c58b2a8398f9ac85da425c96d Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 22 Apr 2015 11:30:19 +0200 Subject: moved all to std::string (nw) --- src/lib/util/corestr.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/lib/util/corestr.h') diff --git a/src/lib/util/corestr.h b/src/lib/util/corestr.h index e9750b5f85f..b875b25db02 100644 --- a/src/lib/util/corestr.h +++ b/src/lib/util/corestr.h @@ -62,4 +62,19 @@ char *core_i64_format(UINT64 value, UINT8 mindigits, bool is_octal); char *core_i64_hex_format(UINT64 value, UINT8 mindigits); char *core_i64_oct_format(UINT64 value, UINT8 mindigits); +#include + +int strvprintf(std::string &str, const char *format, va_list args); +int strcatvprintf(std::string &str, const char *format, va_list args); +int strprintf(std::string &str, const char *format, ...) ATTR_PRINTF(2, 3); +int strcatprintf(std::string &str, const char *format, ...) ATTR_PRINTF(2, 3); +std::string strformat(std::string &str, const char *format, ...) ATTR_PRINTF(2, 3); + +void strdelchr(std::string& str, char chr); +void strreplacechr(std::string& str, char ch, char newch); +std::string strtrimspace(std::string& str); +std::string strmakeupper(std::string& str); +std::string strmakelower(std::string& str); +int strreplace(std::string str, const std::string& search, const std::string& replace); + #endif /* __CORESTR_H__ */ -- cgit v1.2.3-70-g09d2 From ee0328ba37ff8d637dd9e2283ee271453bdf6bce Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 23 Apr 2015 07:13:08 +0200 Subject: Fix strreplace, fixes snapshot and dtd issue (nw) --- src/lib/util/corestr.c | 2 +- src/lib/util/corestr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/util/corestr.h') diff --git a/src/lib/util/corestr.c b/src/lib/util/corestr.c index 84feda50939..7e42e235065 100644 --- a/src/lib/util/corestr.c +++ b/src/lib/util/corestr.c @@ -300,7 +300,7 @@ std::string strmakelower(std::string& str) return str; } -int strreplace(std::string str, const std::string& search, const std::string& replace) +int strreplace(std::string &str, const std::string& search, const std::string& replace) { int searchlen = search.length(); int replacelen = replace.length(); diff --git a/src/lib/util/corestr.h b/src/lib/util/corestr.h index b875b25db02..519e1edc849 100644 --- a/src/lib/util/corestr.h +++ b/src/lib/util/corestr.h @@ -75,6 +75,6 @@ void strreplacechr(std::string& str, char ch, char newch); std::string strtrimspace(std::string& str); std::string strmakeupper(std::string& str); std::string strmakelower(std::string& str); -int strreplace(std::string str, const std::string& search, const std::string& replace); +int strreplace(std::string &str, const std::string& search, const std::string& replace); #endif /* __CORESTR_H__ */ -- cgit v1.2.3-70-g09d2