From 22e92014f0dd38c0b621a94af3453a9e15b95609 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 19 Nov 2013 02:01:23 +0100 Subject: [PATCH] s/B_FIND_PATH_IMAGE_PACKAGE_PATH/B_FIND_PATH_PACKAGE_PATH/ It doesn't only work for image files, so make the name more general. --- headers/os/storage/FindDirectory.h | 2 +- src/bin/findpaths.cpp | 2 +- src/system/libroot/os/find_paths.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/headers/os/storage/FindDirectory.h b/headers/os/storage/FindDirectory.h index 5b2fba39d5..4b74cfa9c7 100644 --- a/headers/os/storage/FindDirectory.h +++ b/headers/os/storage/FindDirectory.h @@ -157,7 +157,7 @@ typedef enum path_base_directory { /* find_path() only */ B_FIND_PATH_IMAGE_PATH = 1000, - B_FIND_PATH_IMAGE_PACKAGE_PATH, + B_FIND_PATH_PACKAGE_PATH, } path_base_directory; diff --git a/src/bin/findpaths.cpp b/src/bin/findpaths.cpp index 607f9f4d02..32c3c5fae1 100644 --- a/src/bin/findpaths.cpp +++ b/src/bin/findpaths.cpp @@ -76,7 +76,7 @@ static const DirectoryConstantEntry kDirectoryConstants[] = { "the translator add-ons directory"), DEFINE_CONSTANT(B_FIND_PATH_VAR_DIRECTORY, "the Unix var directory (global writable data)"), - DEFINE_CONSTANT(B_FIND_PATH_IMAGE_PACKAGE_PATH, + DEFINE_CONSTANT(B_FIND_PATH_PACKAGE_PATH, "the path of the package the file specified via -p belongs to"), }; diff --git a/src/system/libroot/os/find_paths.cpp b/src/system/libroot/os/find_paths.cpp index ecda8381e6..1a1f7d9cad 100644 --- a/src/system/libroot/os/find_paths.cpp +++ b/src/system/libroot/os/find_paths.cpp @@ -216,7 +216,7 @@ get_relative_directory_path(size_t installationLocationIndex, return "/var"; case B_FIND_PATH_IMAGE_PATH: - case B_FIND_PATH_IMAGE_PACKAGE_PATH: + case B_FIND_PATH_PACKAGE_PATH: default: return NULL; } @@ -510,11 +510,11 @@ internal_path_for_path(char* referencePath, size_t referencePathSize, if (installationLocation == NULL) return B_ENTRY_NOT_FOUND; - // Handle B_FIND_PATH_IMAGE_PACKAGE_PATH: get the package file name and + // Handle B_FIND_PATH_PACKAGE_PATH: get the package file name and // simply adjust our arguments to look the package file up in the packages // directory. char packageName[B_FILE_NAME_LENGTH]; - if (baseDirectory == B_FIND_PATH_IMAGE_PACKAGE_PATH) { + if (baseDirectory == B_FIND_PATH_PACKAGE_PATH) { error = get_file_attribute(referencePath, "SYS:PACKAGE_FILE", packageName, sizeof(packageName)); if (error != B_OK)