0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

addon/validation: Simplify addon_name_legal()

Browse source 
Instead of using generic STL algorithms, use std::basic_string<...>
member methods that are presumably better optimized to work with
strings. In particular, use find_first_of() instead of repeated calls to
the find algorithm.

Also get rid of a redundant and suboptimal check for an empty string.
This commit is contained in:
Ignacio R. Morelle 2012-02-25 19:45:38 +00:00
parent acbfa7d79b
commit 40af2f47d2
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/addon/validation.cpp
View file

@ -19,8 +19,6 @@
#include "config.hpp"
#include "foreach.hpp"
#include <cstring>
const unsigned short default_campaignd_port = 15002;
namespace {
@ -31,19 +29,11 @@ namespace {
};
}
static bool two_dots(char a, char b)
{
return a == '.' && b == '.';
}
bool addon_name_legal(const std::string& name)
{
if(name == "" || strlen(name.c_str()) == 0 || name == "." ||
std::find(name.begin(),name.end(),'/') != name.end() ||
std::find(name.begin(),name.end(),'\\') != name.end() ||
std::find(name.begin(),name.end(),':') != name.end() ||
std::find(name.begin(),name.end(),'~') != name.end() ||
std::adjacent_find(name.begin(),name.end(),two_dots) != name.end()) {
if(name.empty() || name == "." ||
name.find_first_of("/:\\~") != std::string::npos ||
name.find("..") != std::string::npos) {
return false;
} else {
return true;