orthanc: Core/Toolbox.cpp comparison

optimization

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 29 Jun 2015 13:26:34 +0200
parents	fe384a9d3b51
children	ad94a3583b07

comparison

equal deleted inserted replaced

-:d710ea64f0fd
+:0a355eeeb351
 digest[4]);
 }
 bool Toolbox::IsSHA1(const std::string& str)
 {
-if (str.size() != 44)
+if (str.size() == 0)
+{
+return false;
+}
+const char* start = &str[0];
+const char* end = start + str.size();
+// Trim the beginning of the string
+while (start < end)
+{
+if (*start == '\0' ||
+isspace(*start))
+{
+start++;
+}
+else
+{
+break;
+}
+}
+// Trim the trailing of the string
+while (start < end)
+{
+if (*(end - 1) == '\0' ||
+isspace(*(end - 1)))
+{
+end--;
+}
+else
+{
+break;
+}
+}
+if (end - start != 44)
 {
 return false;
 }
 for (unsigned int i = 0; i < 44; i++)
 if (i == 8 ||
 i == 17 ||
 i == 26 ||
 i == 35)
 {
-if (str[i] != '-')
+if (start[i] != '-')
 return false;
 }
 else
 {
-if (!isalnum(str[i]))
+if (!isalnum(start[i]))
 return false;
 }
 }
 return true;

Mercurial > hg > orthanc