Improve constexpr to find root of file name

terrillmoore · terrillmoore · commit 3b1134480e41 · 2022-02-18T21:53:54.000-05:00
diff --git a/examples/compliance-otaa-halconfig/compliance-otaa-halconfig.ino b/examples/compliance-otaa-halconfig/compliance-otaa-halconfig.ino
@@ -725,15 +725,15 @@ void setup_printSignOnDashLine(void)
     printNl();
     }
 
-static constexpr const char *filebasename2(const char *s, const char *p) {
+static constexpr const char *filebasename(const char *s, const char *p) {
     return p[0] == '\0'                     ? s                             :
-           (p[0] == '/' || p[0] == '\\')    ? filebasename2(p + 1, p + 1)   :
-                                              filebasename2(s, p + 1)       ;
+           (p[0] == '/' || p[0] == '\\')    ? filebasename(p + 1, p + 1)    :
+                                              filebasename(s, p + 1)        ;
 }
 
 static constexpr const char *filebasename(const char *s)
     {
-    return filebasename2(s, s);
+    return filebasename(s, s);
     }
 
 void printVersionFragment(char sep, uint8_t v) {

Original file line number	Diff line number	Diff line change
`@@ -725,15 +725,15 @@ void setup_printSignOnDashLine(void)`
`725`	`725`	`printNl();`
`726`	`726`	`}`
`727`	`727`
`728`		`-static constexpr const char filebasename2(const char s, const char *p) {`
	`728`	`+static constexpr const char filebasename(const char s, const char *p) {`
`729`	`729`	`return p[0] == '\0' ? s :`
`730`		`- (p[0] == '/' \|\| p[0] == '\\') ? filebasename2(p + 1, p + 1) :`
`731`		`- filebasename2(s, p + 1) ;`
	`730`	`+ (p[0] == '/' \|\| p[0] == '\\') ? filebasename(p + 1, p + 1) :`
	`731`	`+ filebasename(s, p + 1) ;`
`732`	`732`	`}`
`733`	`733`
`734`	`734`	`static constexpr const char filebasename(const char s)`
`735`	`735`	`{`
`736`		`- return filebasename2(s, s);`
	`736`	`+ return filebasename(s, s);`
`737`	`737`	`}`
`738`	`738`
`739`	`739`	`void printVersionFragment(char sep, uint8_t v) {`