From eb1d596ff6bbe81d5828f6a3881e82b7ebc4255f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 19 Oct 2021 11:36:46 -0400 Subject: [PATCH] Remove B_FILE_NOT_FOUND from public headers. Now that it is not used anywhere in the source tree following previous commits. Change-Id: Id2fc417a0658d09148e99587c613a928f1fbe4c2 Reviewed-on: https://review.haiku-os.org/c/haiku/+/4611 Reviewed-by: Adrien Destugues --- headers/build/os/support/Errors.h | 3 +-- headers/os/support/Errors.h | 3 +-- headers/private/fs_shell/fssh_api_wrapper.h | 1 - headers/private/fs_shell/fssh_errors.h | 1 - src/bin/error.c | 5 +++-- src/system/libroot/posix/string/strerror.c | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/headers/build/os/support/Errors.h b/headers/build/os/support/Errors.h index 2e8e2c5f1a..24c94be6e9 100644 --- a/headers/build/os/support/Errors.h +++ b/headers/build/os/support/Errors.h @@ -100,8 +100,7 @@ /* Storage Kit/File System Errors */ #define B_FILE_ERROR (B_STORAGE_ERROR_BASE + 0) -#define B_FILE_NOT_FOUND (B_STORAGE_ERROR_BASE + 1) - /* deprecated: use B_ENTRY_NOT_FOUND instead */ +/* 1 was B_FILE_NOT_FOUND (deprecated) */ #define B_FILE_EXISTS (B_STORAGE_ERROR_BASE + 2) #define B_ENTRY_NOT_FOUND (B_STORAGE_ERROR_BASE + 3) #define B_NAME_TOO_LONG (B_STORAGE_ERROR_BASE + 4) diff --git a/headers/os/support/Errors.h b/headers/os/support/Errors.h index 151c0fbe35..38a206130c 100644 --- a/headers/os/support/Errors.h +++ b/headers/os/support/Errors.h @@ -99,8 +99,7 @@ /* Storage Kit/File System Errors */ #define B_FILE_ERROR (B_STORAGE_ERROR_BASE + 0) -#define B_FILE_NOT_FOUND (B_STORAGE_ERROR_BASE + 1) - /* deprecated: use B_ENTRY_NOT_FOUND instead */ +/* 1 was B_FILE_NOT_FOUND (deprecated) */ #define B_FILE_EXISTS (B_STORAGE_ERROR_BASE + 2) #define B_ENTRY_NOT_FOUND (B_STORAGE_ERROR_BASE + 3) #define B_NAME_TOO_LONG (B_STORAGE_ERROR_BASE + 4) diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h index 4e8b5eb966..26898a7cb5 100644 --- a/headers/private/fs_shell/fssh_api_wrapper.h +++ b/headers/private/fs_shell/fssh_api_wrapper.h @@ -564,7 +564,6 @@ /* Storage Kit/File System Errors */ #define B_FILE_ERROR FSSH_B_FILE_ERROR -#define B_FILE_NOT_FOUND FSSH_B_FILE_NOT_FOUND #define B_FILE_EXISTS FSSH_B_FILE_EXISTS #define B_ENTRY_NOT_FOUND FSSH_B_ENTRY_NOT_FOUND #define B_NAME_TOO_LONG FSSH_B_NAME_TOO_LONG diff --git a/headers/private/fs_shell/fssh_errors.h b/headers/private/fs_shell/fssh_errors.h index 8a9b61f42f..17acbf52f4 100644 --- a/headers/private/fs_shell/fssh_errors.h +++ b/headers/private/fs_shell/fssh_errors.h @@ -96,7 +96,6 @@ enum { /* Storage Kit/File System Errors */ #define FSSH_B_FILE_ERROR (FSSH_B_STORAGE_ERROR_BASE + 0) -#define FSSH_B_FILE_NOT_FOUND (FSSH_B_STORAGE_ERROR_BASE + 1) #define FSSH_B_FILE_EXISTS (FSSH_B_STORAGE_ERROR_BASE + 2) #define FSSH_B_ENTRY_NOT_FOUND (FSSH_B_STORAGE_ERROR_BASE + 3) #define FSSH_B_NAME_TOO_LONG (FSSH_B_STORAGE_ERROR_BASE + 4) diff --git a/src/bin/error.c b/src/bin/error.c index d0340aaa51..eb6acd34b3 100644 --- a/src/bin/error.c +++ b/src/bin/error.c @@ -92,10 +92,11 @@ struct error_pair { E(B_ERRORS_END), E(B_FILE_ERROR), E(B_FILE_EXISTS), +#ifdef _BEOS_R5_COMPATIBLE_ +#define B_FILE_NOT_FOUND (B_STORAGE_ERROR_BASE + 1) E(B_FILE_NOT_FOUND), -#ifdef B_FILE_TOO_LARGE - E(B_FILE_TOO_LARGE), #endif + E(B_FILE_TOO_LARGE), E(B_GENERAL_ERROR_BASE), E(B_INTERFACE_ERROR_BASE), E(B_INTERRUPTED), diff --git a/src/system/libroot/posix/string/strerror.c b/src/system/libroot/posix/string/strerror.c index 15b4cc8449..bc52cb19d9 100644 --- a/src/system/libroot/posix/string/strerror.c +++ b/src/system/libroot/posix/string/strerror.c @@ -183,7 +183,7 @@ error_description(int error) case B_FILE_ERROR: // EBADF return "Bad file descriptor"; - case B_FILE_NOT_FOUND: + case (B_STORAGE_ERROR_BASE + 1): /* B_FILE_NOT_FOUND (deprecated) */ case B_ENTRY_NOT_FOUND: // ENOENT return "No such file or directory";