Merge pull request #11657 from kartben/fix_strip_issue

doxygen · web-flow · commit 5c41a914f6f5 · 2025-07-12T12:49:11.000+02:00
Fix findFileDef incorrectly flagging ambiguities
diff --git a/src/util.cpp b/src/util.cpp
@@ -3475,7 +3475,9 @@ FileDef *findFileDef(const FileNameLinkedMap *fnMap,const QCString &n,bool &ambi
       {
         FileDef *fd = fd_p.get();
         QCString fdStripPath = stripFromIncludePath(fd->getPath());
-        if (path.isEmpty() || fdStripPath.right(pathStripped.length())==pathStripped)
+        if (path.isEmpty() ||
+            (!pathStripped.isEmpty() && fdStripPath.endsWith(pathStripped)) ||
+            (pathStripped.isEmpty() && fdStripPath.isEmpty()))
         {
           count++;
           lastMatch=fd;

Original file line number	Diff line number	Diff line change
`@@ -3475,7 +3475,9 @@ FileDef findFileDef(const FileNameLinkedMap fnMap,const QCString &n,bool &ambi`
`3475`	`3475`	`{`
`3476`	`3476`	`FileDef *fd = fd_p.get();`
`3477`	`3477`	`QCString fdStripPath = stripFromIncludePath(fd->getPath());`
`3478`		`- if (path.isEmpty() \|\| fdStripPath.right(pathStripped.length())==pathStripped)`
	`3478`	`+ if (path.isEmpty() \|\|`
	`3479`	`+ (!pathStripped.isEmpty() && fdStripPath.endsWith(pathStripped)) \|\|`
	`3480`	`+ (pathStripped.isEmpty() && fdStripPath.isEmpty()))`
`3479`	`3481`	`{`
`3480`	`3482`	`count++;`
`3481`	`3483`	`lastMatch=fd;`