cleanup: String::strstr() const
This commit is contained in:
parent
f6e488cc6d
commit
a4817e1520
@ -677,7 +677,7 @@ bool String::append_with_prefill(const char *s,uint32 arg_length,
|
||||
}
|
||||
|
||||
|
||||
int Binary_string::strstr(const char *search, uint32 search_length, uint32 offset)
|
||||
int Binary_string::strstr(const char *search, uint32 search_length, uint32 offset) const
|
||||
{
|
||||
if (search_length + offset <= str_length)
|
||||
{
|
||||
@ -703,7 +703,7 @@ skip:
|
||||
return -1;
|
||||
}
|
||||
|
||||
int Binary_string::strstr(const Binary_string &s, uint32 offset)
|
||||
int Binary_string::strstr(const Binary_string &s, uint32 offset) const
|
||||
{
|
||||
return strstr(s.ptr(), s.length(), offset);
|
||||
}
|
||||
@ -712,7 +712,7 @@ int Binary_string::strstr(const Binary_string &s, uint32 offset)
|
||||
** Search string from end. Offset is offset to the end of string
|
||||
*/
|
||||
|
||||
int Binary_string::strrstr(const Binary_string &s, uint32 offset)
|
||||
int Binary_string::strrstr(const Binary_string &s, uint32 offset) const
|
||||
{
|
||||
if (s.length() <= offset && offset <= str_length)
|
||||
{
|
||||
|
@ -406,10 +406,10 @@ public:
|
||||
}
|
||||
|
||||
// Returns offset to substring or -1
|
||||
int strstr(const Binary_string &search, uint32 offset=0);
|
||||
int strstr(const char *search, uint32 search_length, uint32 offset=0);
|
||||
int strstr(const Binary_string &search, uint32 offset=0) const;
|
||||
int strstr(const char *search, uint32 search_length, uint32 offset=0) const;
|
||||
// Returns offset to substring or -1
|
||||
int strrstr(const Binary_string &search, uint32 offset=0);
|
||||
int strrstr(const Binary_string &search, uint32 offset=0) const;
|
||||
|
||||
/*
|
||||
The following append operations do not extend the strings and in production
|
||||
|
Loading…
x
Reference in New Issue
Block a user