Skip to content

Fix findFileDef incorrectly flagging ambiguities #11657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix findFileDef incorrectly flagging ambiguities
Fix issues when comparing stripped paths due to improper handling of
empty stripped paths.

Fixes: #6178
Fixes: #11261
Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
  • Loading branch information
kartben committed Jul 9, 2025
commit a13284e3f14946c1f9b8bd1fe57c90fd990f9b54
4 changes: 3 additions & 1 deletion src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3474,7 +3474,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;
Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy