scripted-diff: Rename ValidAsCString to ContainsNoNUL

MacroFake · MacroFake · commit fa7078d84fc2 · 2022-04-27T14:16:35.000+02:00
-BEGIN VERIFY SCRIPT-
 sed -i 's,ValidAsCString,ContainsNoNUL,g' $(git grep -l ValidAsCString)
-END VERIFY SCRIPT-
diff --git a/src/base58.cpp b/src/base58.cpp
@@ -126,7 +126,7 @@ std::string EncodeBase58(Span<const unsigned char> input)
 
 bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet, int max_ret_len)
 {
-    if (!ValidAsCString(str)) {
+    if (!ContainsNoNUL(str)) {
         return false;
     }
     return DecodeBase58(str.c_str(), vchRet, max_ret_len);
@@ -160,7 +160,7 @@ std::string EncodeBase58Check(Span<const unsigned char> input)
 
 bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet, int max_ret)
 {
-    if (!ValidAsCString(str)) {
+    if (!ContainsNoNUL(str)) {
         return false;
     }
     return DecodeBase58Check(str.c_str(), vchRet, max_ret);
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -210,7 +210,7 @@ static void Checksum(Span<const uint8_t> addr_pubkey, uint8_t (&checksum)[CHECKS
 
 bool CNetAddr::SetSpecial(const std::string& addr)
 {
-    if (!ValidAsCString(addr)) {
+    if (!ContainsNoNUL(addr)) {
         return false;
     }
 
diff --git a/src/netbase.cpp b/src/netbase.cpp
@@ -136,7 +136,7 @@ static bool LookupIntern(const std::string& name, std::vector<CNetAddr>& vIP, un
 {
     vIP.clear();
 
-    if (!ValidAsCString(name)) {
+    if (!ContainsNoNUL(name)) {
         return false;
     }
 
@@ -169,7 +169,7 @@ static bool LookupIntern(const std::string& name, std::vector<CNetAddr>& vIP, un
 
 bool LookupHost(const std::string& name, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup, DNSLookupFn dns_lookup_function)
 {
-    if (!ValidAsCString(name)) {
+    if (!ContainsNoNUL(name)) {
         return false;
     }
     std::string strHost = name;
@@ -184,7 +184,7 @@ bool LookupHost(const std::string& name, std::vector<CNetAddr>& vIP, unsigned in
 
 bool LookupHost(const std::string& name, CNetAddr& addr, bool fAllowLookup, DNSLookupFn dns_lookup_function)
 {
-    if (!ValidAsCString(name)) {
+    if (!ContainsNoNUL(name)) {
         return false;
     }
     std::vector<CNetAddr> vIP;
@@ -197,7 +197,7 @@ bool LookupHost(const std::string& name, CNetAddr& addr, bool fAllowLookup, DNSL
 
 bool Lookup(const std::string& name, std::vector<CService>& vAddr, uint16_t portDefault, bool fAllowLookup, unsigned int nMaxSolutions, DNSLookupFn dns_lookup_function)
 {
-    if (name.empty() || !ValidAsCString(name)) {
+    if (name.empty() || !ContainsNoNUL(name)) {
         return false;
     }
     uint16_t port{portDefault};
@@ -216,7 +216,7 @@ bool Lookup(const std::string& name, std::vector<CService>& vAddr, uint16_t port
 
 bool Lookup(const std::string& name, CService& addr, uint16_t portDefault, bool fAllowLookup, DNSLookupFn dns_lookup_function)
 {
-    if (!ValidAsCString(name)) {
+    if (!ContainsNoNUL(name)) {
         return false;
     }
     std::vector<CService> vService;
@@ -229,7 +229,7 @@ bool Lookup(const std::string& name, CService& addr, uint16_t portDefault, bool
 
 CService LookupNumeric(const std::string& name, uint16_t portDefault, DNSLookupFn dns_lookup_function)
 {
-    if (!ValidAsCString(name)) {
+    if (!ContainsNoNUL(name)) {
         return {};
     }
     CService addr;
@@ -684,7 +684,7 @@ bool ConnectThroughProxy(const Proxy& proxy, const std::string& strDest, uint16_
 
 bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out)
 {
-    if (!ValidAsCString(subnet_str)) {
+    if (!ContainsNoNUL(subnet_str)) {
         return false;
     }
 
diff --git a/src/test/fuzz/string.cpp b/src/test/fuzz/string.cpp
@@ -42,7 +42,7 @@ bool LegacyParsePrechecks(const std::string& str)
         return false;
     if (str.size() >= 1 && (IsSpace(str[0]) || IsSpace(str[str.size() - 1]))) // No padding allowed
         return false;
-    if (!ValidAsCString(str)) // No embedded NUL characters allowed
+    if (!ContainsNoNUL(str)) // No embedded NUL characters allowed
         return false;
     return true;
 }
@@ -188,7 +188,7 @@ FUZZ_TARGET(string)
     (void)TrimString(random_string_1);
     (void)TrimString(random_string_1, random_string_2);
     (void)urlDecode(random_string_1);
-    (void)ValidAsCString(random_string_1);
+    (void)ContainsNoNUL(random_string_1);
     (void)_(random_string_1.c_str());
     try {
         throw scriptnum_error{random_string_1};
diff --git a/src/util/moneystr.cpp b/src/util/moneystr.cpp
@@ -40,7 +40,7 @@ std::string FormatMoney(const CAmount n)
 
 std::optional<CAmount> ParseMoney(const std::string& money_string)
 {
-    if (!ValidAsCString(money_string)) {
+    if (!ContainsNoNUL(money_string)) {
         return std::nullopt;
     }
     const std::string str = TrimString(money_string);
diff --git a/src/util/string.h b/src/util/string.h
@@ -91,7 +91,7 @@ inline std::string MakeUnorderedList(const std::vector<std::string>& items)
 /**
  * Check if a string does not contain any embedded NUL (\0) characters
  */
-[[nodiscard]] inline bool ValidAsCString(std::string_view str) noexcept
+[[nodiscard]] inline bool ContainsNoNUL(std::string_view str) noexcept
 {
     for (auto c : str) {
         if (c == 0) return false;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ std::string EncodeBase58(Span<const unsigned char> input)`
`126`	`126`
`127`	`127`	`bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet, int max_ret_len)`
`128`	`128`	`{`
`129`		`- if (!ValidAsCString(str)) {`
	`129`	`+ if (!ContainsNoNUL(str)) {`
`130`	`130`	`return false;`
`131`	`131`	`}`
`132`	`132`	`return DecodeBase58(str.c_str(), vchRet, max_ret_len);`
`@@ -160,7 +160,7 @@ std::string EncodeBase58Check(Span<const unsigned char> input)`
`160`	`160`
`161`	`161`	`bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet, int max_ret)`
`162`	`162`	`{`
`163`		`- if (!ValidAsCString(str)) {`
	`163`	`+ if (!ContainsNoNUL(str)) {`
`164`	`164`	`return false;`
`165`	`165`	`}`
`166`	`166`	`return DecodeBase58Check(str.c_str(), vchRet, max_ret);`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ static void Checksum(Span<const uint8_t> addr_pubkey, uint8_t (&checksum)[CHECKS`
`210`	`210`
`211`	`211`	`bool CNetAddr::SetSpecial(const std::string& addr)`
`212`	`212`	`{`
`213`		`- if (!ValidAsCString(addr)) {`
	`213`	`+ if (!ContainsNoNUL(addr)) {`
`214`	`214`	`return false;`
`215`	`215`	`}`
`216`	`216`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ static bool LookupIntern(const std::string& name, std::vector<CNetAddr>& vIP, un`
`136`	`136`	`{`
`137`	`137`	`vIP.clear();`
`138`	`138`
`139`		`- if (!ValidAsCString(name)) {`
	`139`	`+ if (!ContainsNoNUL(name)) {`
`140`	`140`	`return false;`
`141`	`141`	`}`
`142`	`142`
`@@ -169,7 +169,7 @@ static bool LookupIntern(const std::string& name, std::vector<CNetAddr>& vIP, un`
`169`	`169`
`170`	`170`	`bool LookupHost(const std::string& name, std::vector<CNetAddr>& vIP, unsigned int nMaxSolutions, bool fAllowLookup, DNSLookupFn dns_lookup_function)`
`171`	`171`	`{`
`172`		`- if (!ValidAsCString(name)) {`
	`172`	`+ if (!ContainsNoNUL(name)) {`
`173`	`173`	`return false;`
`174`	`174`	`}`
`175`	`175`	`std::string strHost = name;`
`@@ -184,7 +184,7 @@ bool LookupHost(const std::string& name, std::vector<CNetAddr>& vIP, unsigned in`
`184`	`184`
`185`	`185`	`bool LookupHost(const std::string& name, CNetAddr& addr, bool fAllowLookup, DNSLookupFn dns_lookup_function)`
`186`	`186`	`{`
`187`		`- if (!ValidAsCString(name)) {`
	`187`	`+ if (!ContainsNoNUL(name)) {`
`188`	`188`	`return false;`
`189`	`189`	`}`
`190`	`190`	`std::vector<CNetAddr> vIP;`
`@@ -197,7 +197,7 @@ bool LookupHost(const std::string& name, CNetAddr& addr, bool fAllowLookup, DNSL`
`197`	`197`
`198`	`198`	`bool Lookup(const std::string& name, std::vector<CService>& vAddr, uint16_t portDefault, bool fAllowLookup, unsigned int nMaxSolutions, DNSLookupFn dns_lookup_function)`
`199`	`199`	`{`
`200`		`- if (name.empty() \|\| !ValidAsCString(name)) {`
	`200`	`+ if (name.empty() \|\| !ContainsNoNUL(name)) {`
`201`	`201`	`return false;`
`202`	`202`	`}`
`203`	`203`	`uint16_t port{portDefault};`
`@@ -216,7 +216,7 @@ bool Lookup(const std::string& name, std::vector<CService>& vAddr, uint16_t port`
`216`	`216`
`217`	`217`	`bool Lookup(const std::string& name, CService& addr, uint16_t portDefault, bool fAllowLookup, DNSLookupFn dns_lookup_function)`
`218`	`218`	`{`
`219`		`- if (!ValidAsCString(name)) {`
	`219`	`+ if (!ContainsNoNUL(name)) {`
`220`	`220`	`return false;`
`221`	`221`	`}`
`222`	`222`	`std::vector<CService> vService;`
`@@ -229,7 +229,7 @@ bool Lookup(const std::string& name, CService& addr, uint16_t portDefault, bool`
`229`	`229`
`230`	`230`	`CService LookupNumeric(const std::string& name, uint16_t portDefault, DNSLookupFn dns_lookup_function)`
`231`	`231`	`{`
`232`		`- if (!ValidAsCString(name)) {`
	`232`	`+ if (!ContainsNoNUL(name)) {`
`233`	`233`	`return {};`
`234`	`234`	`}`
`235`	`235`	`CService addr;`
`@@ -684,7 +684,7 @@ bool ConnectThroughProxy(const Proxy& proxy, const std::string& strDest, uint16_`
`684`	`684`
`685`	`685`	`bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out)`
`686`	`686`	`{`
`687`		`- if (!ValidAsCString(subnet_str)) {`
	`687`	`+ if (!ContainsNoNUL(subnet_str)) {`
`688`	`688`	`return false;`
`689`	`689`	`}`
`690`	`690`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ std::string FormatMoney(const CAmount n)`
`40`	`40`
`41`	`41`	`std::optional<CAmount> ParseMoney(const std::string& money_string)`
`42`	`42`	`{`
`43`		`- if (!ValidAsCString(money_string)) {`
	`43`	`+ if (!ContainsNoNUL(money_string)) {`
`44`	`44`	`return std::nullopt;`
`45`	`45`	`}`
`46`	`46`	`const std::string str = TrimString(money_string);`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ inline std::string MakeUnorderedList(const std::vector<std::string>& items)`
`91`	`91`	`/**`
`92`	`92`	`* Check if a string does not contain any embedded NUL (\0) characters`
`93`	`93`	`*/`
`94`		`-[[nodiscard]] inline bool ValidAsCString(std::string_view str) noexcept`
	`94`	`+[[nodiscard]] inline bool ContainsNoNUL(std::string_view str) noexcept`
`95`	`95`	`{`
`96`	`96`	`for (auto c : str) {`
`97`	`97`	`if (c == 0) return false;`