i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugger: Refactor DwarfFile to use BPathFinder.

Browse Source
This commit is contained in:
Rene Gollent
2013-12-04 18:12:32 -05:00
parent be012e2122
commit acaa4271a2
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/dwarf/DwarfFile.cpp
+10 -13
View File
@@ -14,6 +14,8 @@
#include <Entry.h> #include <Entry.h>
#include <FindDirectory.h> #include <FindDirectory.h>
#include <Path.h> #include <Path.h>
#include <PathFinder.h>
#include <StringList.h>
#include "AttributeClasses.h" #include "AttributeClasses.h"
#include "AttributeValue.h" #include "AttributeValue.h"
@@ -2748,13 +2750,6 @@ status_t
DwarfFile::_GetDebugInfoPath(const char* debugFileName, DwarfFile::_GetDebugInfoPath(const char* debugFileName,
BString& _infoPath) const BString& _infoPath) const
{ {
const directory_which dirLocations[] = {
B_USER_NONPACKAGED_DEVELOP_DIRECTORY,
B_USER_DEVELOP_DIRECTORY,
B_SYSTEM_NONPACKAGED_DEVELOP_DIRECTORY,
B_SYSTEM_DEVELOP_DIRECTORY
};
// first, see if we have a relative match to our local directory // first, see if we have a relative match to our local directory
BPath basePath; BPath basePath;
status_t result = basePath.SetTo(fName); status_t result = basePath.SetTo(fName);
@@ -2777,13 +2772,15 @@ DwarfFile::_GetDebugInfoPath(const char* debugFileName,
// See if our image is in any of the system locations. // See if our image is in any of the system locations.
// if so, look for its debug info in the corresponding location. // if so, look for its debug info in the corresponding location.
for (uint16 i = 0; i < sizeof(dirLocations) / sizeof(directory_which); BPathFinder finder;
i++) { BStringList paths;
result = find_directory(dirLocations[i], &basePath); result = finder.FindPaths(B_FIND_PATH_DEVELOP_DIRECTORY, paths);
if (result != B_OK) if (result != B_OK)
return result; return result;
for (int32 i = 0; i < paths.CountStrings(); i++) {
BString tempPath = paths.StringAt(i);
if (strncmp(fName, basePath.Path(), strlen(basePath.Path())) == 0) { if (tempPath.Compare(fName, tempPath.Length()) == 0) {
_infoPath.SetToFormat("%s/debug/%s", basePath.Path(), _infoPath.SetToFormat("%s/debug/%s", basePath.Path(),
debugFileName); debugFileName);
entry.SetTo(_infoPath.String()); entry.SetTo(_infoPath.String());