Tweak string comparisons

Author: mikee47

src/String.cpp

@@ -23,17 +23,18 @@
 
 namespace FSTR
 {
-bool String::equals(const char* cstr, size_t len) const
+bool String::equals(const char* cstr, size_t clen) const
 {
 	// Unlikely we'd want an empty flash string, but check anyway
 	if(cstr == nullptr) {
 		return length() == 0;
 	}
 	// Don't use strcmp as our data may contain nuls
-	if(len == 0) {
-		len = strlen(cstr);
+	if(clen == 0) {
+		clen = strlen(cstr);
 	}
-	if(len != length()) {
+	auto len = length();
+	if(clen != len) {
 		return false;
 	}
 	LOAD_FSTR(buf, *this);
@@ -42,13 +43,15 @@ bool String::equals(const char* cstr, size_t len) const
 
 bool String::equals(const String& str) const
 {
-	if(data() == str.data()) {
+	auto dataptr = data();
+	if(dataptr == str.data()) {
 		return true;
 	}
-	if(length() != str.length()) {
+	auto len = length();
+	if(len != str.length()) {
 		return false;
 	}
-	return memcmp_aligned(data(), str.data(), length()) == 0;
+	return memcmp_aligned(dataptr, str.data(), len) == 0;
 }
 
 /* Wiring String support */