merge if statements

mattwittwer · mattwittwer · commit 86a61ed85bf8 · 2025-07-18T12:50:14.000-07:00
diff --git a/src/pb_utils.cc b/src/pb_utils.cc
@@ -327,12 +327,9 @@ WrapTritonErrorInSharedPtr(TRITONSERVER_Error* error)
 bool
 IsValidIdentifier(const std::string& input)
 {
-  if (input.empty()) {
-    return false;
-  }
-
   // Check for invalid characters
-  if (input.find_first_of(INVALID_CHARS) != std::string::npos) {
+  if (input.empty() ||
+      input.find_first_of(INVALID_CHARS) != std::string::npos) {
     return false;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -327,12 +327,9 @@ WrapTritonErrorInSharedPtr(TRITONSERVER_Error* error)`
`327`	`327`	`bool`
`328`	`328`	`IsValidIdentifier(const std::string& input)`
`329`	`329`	`{`
`330`		`- if (input.empty()) {`
`331`		`- return false;`
`332`		`- }`
`333`		`-`
`334`	`330`	`// Check for invalid characters`
`335`		`- if (input.find_first_of(INVALID_CHARS) != std::string::npos) {`
	`331`	`+ if (input.empty() \|\|`
	`332`	`+ input.find_first_of(INVALID_CHARS) != std::string::npos) {`
`336`	`333`	`return false;`
`337`	`334`	`}`
`338`	`335`