RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14341 from theanalyst/cleanup/rgw/str-find

Browse Source 
rgw_common: use string::npos for the results of str.find

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2017-05-26 10:33:35 -04:00 committed by GitHub
commit 456ac50aa7
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/rgw/rgw_common.cc
View File

@ -208,8 +208,8 @@ req_info::req_info(CephContext *cct, class RGWEnv *e) : env(e) {
if (request_uri[0] != '/') {
request_uri = get_abs_path(request_uri);
}
int pos = request_uri.find('?');
if (pos >= 0) {
auto pos = request_uri.find('?');
if (pos != string::npos) {
request_params = request_uri.substr(pos + 1);
request_uri = request_uri.substr(0, pos);
} else {
@ -458,11 +458,11 @@ string rgw_string_unquote(const string& s)
static void trim_whitespace(const string& src, string& dst)
{
const char *spacestr = " \t\n\r\f\v";
int start = src.find_first_not_of(spacestr);
if (start < 0)
auto start = src.find_first_not_of(spacestr);
if (start == string::npos)
return;
int end = src.find_last_not_of(spacestr);
auto end = src.find_last_not_of(spacestr);
dst = src.substr(start, end - start + 1);
}
@ -593,8 +593,8 @@ int parse_key_value(string& in_str, const char *delim, string& key, string& val)
if (delim == NULL)
return -EINVAL;
int pos = in_str.find(delim);
if (pos < 0)
auto pos = in_str.find(delim);
if (pos == string::npos)
return -EINVAL;
trim_whitespace(in_str.substr(0, pos), key);
@ -865,10 +865,10 @@ int gen_rand_alphanumeric_plain(CephContext *cct, char *dest, int size) /* size
int NameVal::parse()
{
int delim_pos = str.find('=');
auto delim_pos = str.find('=');
int ret = 0;
if (delim_pos < 0) {
if (delim_pos == string::npos) {
name = str;
val = "";
ret = 1;
@ -1584,8 +1584,8 @@ int RGWUserCaps::add_from_string(const string& str)
{
int start = 0;
do {
int end = str.find(';', start);
if (end < 0)
auto end = str.find(';', start);
if (end == string::npos)
end = str.size();
int r = add_cap(str.substr(start, end - start));
@ -1602,8 +1602,8 @@ int RGWUserCaps::remove_from_string(const string& str)
{
int start = 0;
do {
int end = str.find(';', start);
if (end < 0)
auto end = str.find(';', start);
if (end == string::npos)
end = str.size();
int r = remove_cap(str.substr(start, end - start));