From a7467079cb3c131d31993d58d06f8a21031e7af3 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 27 Nov 2025 10:15:51 -0600 Subject: [PATCH] Update: The directory status codes and use F_directory_descriptor_not instead of F_directory_descriptor. Add missing "_not" status codes or the inverse. The `F_directory_closed` is not needed now that there are the "_not" status codes. Use `F_directory_descriptor_not` instead of `F_directory_descriptor` for invalid directory descriptors. Replace `F_file_type_not_directory` with `F_directory_not`. --- level_0/f_directory/c/directory.c | 34 +++++----- level_0/f_directory/c/directory.h | 34 +++++----- level_0/f_directory/c/private-directory.c | 2 +- level_0/f_directory/c/private-directory.h | 6 +- .../tests/unit/c/test-directory-create_at.c | 2 +- .../tests/unit/c/test-directory-empty.c | 4 +- .../tests/unit/c/test-directory-exists_at.c | 2 +- .../tests/unit/c/test-directory-is_at.c | 2 +- .../f_directory/tests/unit/c/test-directory-open.c | 2 +- .../tests/unit/c/test-directory-open_at.c | 4 +- .../tests/unit/c/test-directory-stream_close.c | 2 +- .../tests/unit/c/test-directory-stream_open.c | 4 +- .../tests/unit/c/test-directory-stream_open_id.c | 4 +- .../tests/unit/c/test-directory-stream_read.c | 2 +- .../tests/unit/c/test-directory-stream_tell.c | 2 +- .../tests/unit/c/test-directory-touch.c | 2 +- .../tests/unit/c/test-directory-touch_at.c | 2 +- level_0/f_file/c/file.c | 16 ++--- level_0/f_file/c/file.h | 50 +++++++-------- level_0/f_file/c/file/stream.c | 8 +-- level_0/f_file/c/file/stream.h | 11 ++-- level_0/f_file/c/private-file.c | 16 ++--- level_0/f_file/c/private-file.h | 45 +++++++------- level_0/f_file/tests/unit/c/test-file-access_at.c | 4 +- level_0/f_file/tests/unit/c/test-file-clone.c | 6 +- level_0/f_file/tests/unit/c/test-file-copy.c | 6 +- level_0/f_file/tests/unit/c/test-file-create.c | 2 +- level_0/f_file/tests/unit/c/test-file-create_at.c | 4 +- .../tests/unit/c/test-file-create_device_at.c | 2 +- .../f_file/tests/unit/c/test-file-create_fifo_at.c | 2 +- .../f_file/tests/unit/c/test-file-create_node_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-exists_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-is_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-link_at.c | 2 +- .../f_file/tests/unit/c/test-file-link_read_at.c | 2 +- .../f_file/tests/unit/c/test-file-mode_read_at.c | 2 +- .../f_file/tests/unit/c/test-file-mode_set_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-open.c | 2 +- level_0/f_file/tests/unit/c/test-file-open_at.c | 4 +- level_0/f_file/tests/unit/c/test-file-remove_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-rename_at.c | 2 +- .../f_file/tests/unit/c/test-file-role_change_at.c | 8 +-- level_0/f_file/tests/unit/c/test-file-size_at.c | 2 +- level_0/f_file/tests/unit/c/test-file-stat_at.c | 2 +- .../f_file/tests/unit/c/test-file-stream_close.c | 2 +- .../f_file/tests/unit/c/test-file-stream_open.c | 2 +- .../unit/c/test-file-stream_open_descriptor.c | 2 +- .../f_file/tests/unit/c/test-file-stream_reopen.c | 2 +- level_0/f_file/tests/unit/c/test-file-touch.c | 2 +- level_0/f_file/tests/unit/c/test-file-touch_at.c | 4 +- level_0/f_file/tests/unit/c/test-file-type_at.c | 2 +- level_0/f_path/c/path.c | 6 +- level_0/f_path/c/path.h | 10 +-- level_0/f_path/c/private-path.c | 2 +- level_0/f_path/c/private-path.h | 2 +- level_0/f_path/tests/unit/c/test-path-change.c | 2 +- level_0/f_path/tests/unit/c/test-path-change_at.c | 4 +- level_0/f_path/tests/unit/c/test-path-current.c | 2 +- level_0/f_path/tests/unit/c/test-path-real.c | 2 +- level_0/f_status/c/status.h | 13 +++- level_0/f_status_string/c/status_string.c | 72 +++++++++++++++++++++- level_0/f_status_string/c/status_string.h | 39 +++++++++++- .../tests/unit/c/test-status_string-to.c | 28 ++++++++- level_1/fl_directory/c/directory.h | 8 +-- level_1/fl_directory/c/private-directory.c | 4 +- level_1/fl_directory/c/private-directory.h | 3 +- level_1/fl_status_string/c/status_string.c | 70 ++++++++++++++++++++- .../tests/unit/c/test-status_string-from.c | 28 ++++++++- level_2/fll_error/c/error.c | 8 ++- level_2/fll_file/c/file.h | 4 +- level_2/fll_file/c/private-file.c | 4 +- level_2/fll_file/c/private-file.h | 2 +- 72 files changed, 437 insertions(+), 210 deletions(-) diff --git a/level_0/f_directory/c/directory.c b/level_0/f_directory/c/directory.c index 8b5ebdc..725a4f5 100644 --- a/level_0/f_directory/c/directory.c +++ b/level_0/f_directory/c/directory.c @@ -36,7 +36,7 @@ extern "C" { if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENFILE) return F_status_set_error(F_file_open_max); - if (errno == ENOTDIR) return F_status_set_error(F_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == ENOENT) return F_status_set_error(F_directory_found_not); if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -71,7 +71,7 @@ extern "C" { } if (errno) { - status = errno == EBADF ? F_status_set_error(F_directory_descriptor) : F_status_set_error(F_directory_read); + status = errno == EBADF ? F_status_set_error(F_directory_descriptor_not) : F_status_set_error(F_directory_read); } closedir(parent); @@ -119,7 +119,7 @@ extern "C" { if (fstatat(at_id, path.string, &file_stat, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == ELOOP) return F_status_set_error(F_loop); if (errno == ENAMETOOLONG) return F_status_set_error(F_name); @@ -176,7 +176,7 @@ extern "C" { if (fstatat(at_id, path.string, &file_stat, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == ELOOP) return F_status_set_error(F_loop); if (errno == ENAMETOOLONG) return F_status_set_error(F_name); @@ -298,7 +298,7 @@ extern "C" { if (errno == ENOENT) return F_status_set_error(F_directory_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOSPC) return F_status_set_error(F_space_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == EPERM) return F_status_set_error(F_prohibited); if (errno == EROFS) return F_status_set_error(F_read_only); @@ -329,7 +329,7 @@ extern "C" { if (result == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EFBIG || errno == EOVERFLOW) return F_status_set_error(F_number_overflow); if (errno == EINTR) return F_status_set_error(F_interrupt); @@ -339,7 +339,7 @@ extern "C" { if (errno == ENFILE) return F_status_set_error(F_file_open_max); if (errno == ENOENT) return F_status_set_error(F_directory_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == ENOSPC) return F_status_set_error(F_space_not); if (errno == EPERM) return F_status_set_error(F_prohibited); if (errno == EROFS) return F_status_set_error(F_read_only); @@ -453,7 +453,7 @@ extern "C" { f_status_t f_directory_stream_close(const f_directory_stream_t stream) { if (closedir(stream) == -1) { - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); return F_status_set_error(F_failure); } @@ -474,12 +474,12 @@ extern "C" { if (!result) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENFILE) return F_status_set_error(F_file_open_max); if (errno == ENOENT) return F_status_set_error(F_directory_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); return F_status_set_error(F_failure); } @@ -500,12 +500,12 @@ extern "C" { if (!result) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENFILE) return F_status_set_error(F_file_open_max); if (errno == ENOENT) return F_status_set_error(F_directory_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); return F_status_set_error(F_failure); } @@ -528,7 +528,7 @@ extern "C" { f_directory_entity_t * const result = readdir(stream); if (!result && errno) { - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); return F_status_set_error(F_failure); } @@ -570,7 +570,7 @@ extern "C" { const long result = telldir(stream); if (result == -1) { - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); return F_status_set_error(F_failure); } @@ -605,7 +605,7 @@ extern "C" { if (utimensat(F_directory_at_current_working_d, path.string, 0, 0) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == ELOOP) return F_status_set_error(F_loop); @@ -634,7 +634,7 @@ extern "C" { if (fstatat(at_id, path.string, &file_stat, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == ELOOP) return F_status_set_error(F_loop); if (errno == ENAMETOOLONG) return F_status_set_error(F_name); @@ -648,7 +648,7 @@ extern "C" { if (utimensat(at_id, path.string, 0, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == ELOOP) return F_status_set_error(F_loop); diff --git a/level_0/f_directory/c/directory.h b/level_0/f_directory/c/directory.h index 6605cca..9ad133e 100644 --- a/level_0/f_directory/c/directory.h +++ b/level_0/f_directory/c/directory.h @@ -95,7 +95,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_directory_link_max (with error bit) max links limit reached or exceeded. * F_file_found (with error bit) of a directory aleady exists at the path. * F_file_found_not (with error bit) if a file within the path is not found (such as a broken symbolic link). @@ -127,8 +127,8 @@ extern "C" { * F_false on success and directory is not empty. * F_data_not if source.used or destination.used is 0. * - * F_directory (with error bit) if the path is not a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor after opening the path. + * F_directory_not (with error bit) if the path is not a directory. + * F_directory_descriptor_not (with error bit) for bad directory descriptor after opening the path. * F_directory_found_not (with error bit) if there is not file at the path. * F_directory_read (with error bit) if there is an error while reading the directory. * F_file_descriptor_max (with error bit) if max file descriptors is reached. @@ -190,7 +190,7 @@ extern "C" { * F_data_not if path.used is 0. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. * F_name (with error bit) on path name error. @@ -245,7 +245,7 @@ extern "C" { * F_data_not if path.used is 0. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. * F_name (with error bit) on path name error. @@ -315,8 +315,8 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_directory_found_not (with error bit) if directory was not found. + * F_directory_not (with error bit) file is not a directory. * F_file_open_max (with error bit) too many open files. - * F_file_type_not_directory (with error bit) file is not a directory. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -358,9 +358,9 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_directory_found_not (with error bit) if directory was not found. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_not (with error bit) file is not a directory. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_open_max (with error bit) too many open files. - * F_file_type_not_directory (with error bit) file is not a directory. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -472,7 +472,7 @@ extern "C" { * @return * F_okay on success. * - * F_directory_descriptor (with error bit) for bad directory descriptor. + * F_directory_descriptor_not (with error bit) for bad directory descriptor. * F_failure (with error bit) for any other error. * * @see closedir() @@ -496,11 +496,11 @@ extern "C" { * F_data_not if path.used is 0. * * F_access_denied (with error bit) on access denied. - * F_directory_descriptor (with error bit) for bad directory descriptor. + * F_directory_descriptor_not (with error bit) for bad directory descriptor. * F_directory_found_not (with error bit) if directory was not found. + * F_directory_not (with error bit) file is not a directory. * F_file_descriptor_max (with error bit) if max file descriptors is reached. * F_file_open_max (with error bit) too many open files. - * F_file_type_not_directory (with error bit) file is not a directory. * F_memory_not (with error bit) if out of memory. * F_parameter (with error bit) if a parameter is invalid. * F_failure (with error bit) for any other error. @@ -527,11 +527,11 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_directory_descriptor (with error bit) for bad directory descriptor. + * F_directory_descriptor_not (with error bit) for bad directory descriptor. * F_directory_found_not (with error bit) if directory was not found. + * F_directory_not (with error bit) file is not a directory. * F_file_descriptor_max (with error bit) if max file descriptors is reached. * F_file_open_max (with error bit) too many open files. - * F_file_type_not_directory (with error bit) file is not a directory. * F_memory_not (with error bit) if out of memory. * F_parameter (with error bit) if a parameter is invalid. * F_failure (with error bit) for any other error. @@ -556,7 +556,7 @@ extern "C" { * F_okay on success. * F_okay_eos on success and the end of the stream is reached (the entity value will be NULL). * - * F_directory_descriptor (with error bit) for bad directory descriptor. + * F_directory_descriptor_not (with error bit) for bad directory descriptor. * F_parameter (with error bit) if a parameter is invalid. * F_failure (with error bit) for any other error. * @@ -615,7 +615,7 @@ extern "C" { * @return * F_okay on success. * - * F_directory_descriptor (with error bit) for bad directory descriptor. + * F_directory_descriptor_not (with error bit) for bad directory descriptor. * F_parameter (with error bit) if a parameter is invalid. * F_failure (with error bit) for any other error. * @@ -643,7 +643,7 @@ extern "C" { * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found (with error bit) if a file aleady exists at the path. * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -687,7 +687,7 @@ extern "C" { * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found (with error bit) if a file aleady exists at the path (when calling utimensat()). * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. diff --git a/level_0/f_directory/c/private-directory.c b/level_0/f_directory/c/private-directory.c index c5a469e..85d9dd0 100644 --- a/level_0/f_directory/c/private-directory.c +++ b/level_0/f_directory/c/private-directory.c @@ -36,7 +36,7 @@ extern "C" { if (mkdirat(at_id, path.string, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EDQUOT) return F_status_set_error(F_file_system_quota_block); if (errno == EEXIST) return F_status_set_error(F_file_found); if (errno == EFAULT) return F_status_set_error(F_buffer); diff --git a/level_0/f_directory/c/private-directory.h b/level_0/f_directory/c/private-directory.h index 54083bf..017543f 100644 --- a/level_0/f_directory/c/private-directory.h +++ b/level_0/f_directory/c/private-directory.h @@ -28,8 +28,8 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. * F_directory_link_max (with error bit) max links limit reached or exceeded. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) of a directory aleady exists at the path. * F_file_found_not (with error bit) if a file within the path is not found (such as a broken symbolic link). * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -65,8 +65,8 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_directory_link_max (with error bit) max links limit reached or exceeded. * F_file_found (with error bit) of a directory aleady exists at the path. * F_file_found_not (with error bit) if a file within the path is not found (such as a broken symbolic link). diff --git a/level_0/f_directory/tests/unit/c/test-directory-create_at.c b/level_0/f_directory/tests/unit/c/test-directory-create_at.c index da91987..8038885 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-create_at.c +++ b/level_0/f_directory/tests/unit/c/test-directory-create_at.c @@ -33,7 +33,7 @@ void test__f_directory_create_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_file_system_quota_block, F_file_found, F_buffer, diff --git a/level_0/f_directory/tests/unit/c/test-directory-empty.c b/level_0/f_directory/tests/unit/c/test-directory-empty.c index 01a7cbf..0fca9e5 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-empty.c +++ b/level_0/f_directory/tests/unit/c/test-directory-empty.c @@ -25,7 +25,7 @@ void test__f_directory_empty__fails(void **state) { F_status_set_error(F_access_denied), F_status_set_error(F_file_descriptor_max), F_status_set_error(F_file_open_max), - F_status_set_error(F_directory), + F_status_set_error(F_directory_not), F_status_set_error(F_directory_found_not), F_status_set_error(F_memory_not), F_status_set_error(F_directory_open), @@ -52,7 +52,7 @@ void test__f_directory_empty__fails(void **state) { }; f_status_t statuss[] = { - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_directory_read), }; diff --git a/level_0/f_directory/tests/unit/c/test-directory-exists_at.c b/level_0/f_directory/tests/unit/c/test-directory-exists_at.c index 96bf75e..0e225dd 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-exists_at.c +++ b/level_0/f_directory/tests/unit/c/test-directory-exists_at.c @@ -27,7 +27,7 @@ void test__f_directory_exists_at__fails(void **state) { f_status_t statuss[] = { F_status_set_error(F_access_denied), - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_buffer), F_status_set_error(F_loop), F_status_set_error(F_name), diff --git a/level_0/f_directory/tests/unit/c/test-directory-is_at.c b/level_0/f_directory/tests/unit/c/test-directory-is_at.c index 07ca5f9..d16b58e 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-is_at.c +++ b/level_0/f_directory/tests/unit/c/test-directory-is_at.c @@ -27,7 +27,7 @@ void test__f_directory_is_at__fails(void **state) { f_status_t statuss[] = { F_status_set_error(F_access_denied), - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_buffer), F_status_set_error(F_loop), F_status_set_error(F_name), diff --git a/level_0/f_directory/tests/unit/c/test-directory-open.c b/level_0/f_directory/tests/unit/c/test-directory-open.c index df80165..b288702 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-open.c +++ b/level_0/f_directory/tests/unit/c/test-directory-open.c @@ -44,7 +44,7 @@ void test__f_directory_open__fails(void **state) { F_directory_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_prohibited, F_read_only, F_failure, diff --git a/level_0/f_directory/tests/unit/c/test-directory-open_at.c b/level_0/f_directory/tests/unit/c/test-directory-open_at.c index 7b38ed4..f319d00 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-open_at.c +++ b/level_0/f_directory/tests/unit/c/test-directory-open_at.c @@ -35,7 +35,7 @@ void test__f_directory_open_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_number_overflow, F_number_overflow, @@ -47,7 +47,7 @@ void test__f_directory_open_at__fails(void **state) { F_directory_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_prohibited, F_read_only, F_failure, diff --git a/level_0/f_directory/tests/unit/c/test-directory-stream_close.c b/level_0/f_directory/tests/unit/c/test-directory-stream_close.c index 4e25ad2..abbdbd3 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-stream_close.c +++ b/level_0/f_directory/tests/unit/c/test-directory-stream_close.c @@ -21,7 +21,7 @@ void test__f_directory_stream_close__fails(void **state) { }; f_status_t statuss[] = { - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_failure), }; diff --git a/level_0/f_directory/tests/unit/c/test-directory-stream_open.c b/level_0/f_directory/tests/unit/c/test-directory-stream_open.c index 32d4165..92ba8e0 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-stream_open.c +++ b/level_0/f_directory/tests/unit/c/test-directory-stream_open.c @@ -30,12 +30,12 @@ void test__f_directory_stream_open__fails(void **state) { f_status_t statuss[] = { F_status_set_error(F_access_denied), - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_file_descriptor_max), F_status_set_error(F_file_open_max), F_status_set_error(F_directory_found_not), F_status_set_error(F_memory_not), - F_status_set_error(F_file_type_not_directory), + F_status_set_error(F_directory_not), F_status_set_error(F_failure), }; diff --git a/level_0/f_directory/tests/unit/c/test-directory-stream_open_id.c b/level_0/f_directory/tests/unit/c/test-directory-stream_open_id.c index 0b6fd4f..806f8a1 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-stream_open_id.c +++ b/level_0/f_directory/tests/unit/c/test-directory-stream_open_id.c @@ -28,12 +28,12 @@ void test__f_directory_stream_open_id__fails(void **state) { f_status_t statuss[] = { F_status_set_error(F_access_denied), - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_file_descriptor_max), F_status_set_error(F_file_open_max), F_status_set_error(F_directory_found_not), F_status_set_error(F_memory_not), - F_status_set_error(F_file_type_not_directory), + F_status_set_error(F_directory_not), F_status_set_error(F_failure), }; diff --git a/level_0/f_directory/tests/unit/c/test-directory-stream_read.c b/level_0/f_directory/tests/unit/c/test-directory-stream_read.c index b9c6ea8..99aa5a8 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-stream_read.c +++ b/level_0/f_directory/tests/unit/c/test-directory-stream_read.c @@ -21,7 +21,7 @@ void test__f_directory_stream_read__fails(void **state) { }; f_status_t statuss[] = { - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_failure), }; diff --git a/level_0/f_directory/tests/unit/c/test-directory-stream_tell.c b/level_0/f_directory/tests/unit/c/test-directory-stream_tell.c index 0981622..27a4d37 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-stream_tell.c +++ b/level_0/f_directory/tests/unit/c/test-directory-stream_tell.c @@ -21,7 +21,7 @@ void test__f_directory_stream_tell__fails(void **state) { }; f_status_t statuss[] = { - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_failure), }; diff --git a/level_0/f_directory/tests/unit/c/test-directory-touch.c b/level_0/f_directory/tests/unit/c/test-directory-touch.c index 6891bbe..b43e22a 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-touch.c +++ b/level_0/f_directory/tests/unit/c/test-directory-touch.c @@ -114,7 +114,7 @@ void test__f_directory_touch__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_loop, diff --git a/level_0/f_directory/tests/unit/c/test-directory-touch_at.c b/level_0/f_directory/tests/unit/c/test-directory-touch_at.c index a18908f..5a27cc9 100644 --- a/level_0/f_directory/tests/unit/c/test-directory-touch_at.c +++ b/level_0/f_directory/tests/unit/c/test-directory-touch_at.c @@ -114,7 +114,7 @@ void test__f_directory_touch_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_loop, diff --git a/level_0/f_file/c/file.c b/level_0/f_file/c/file.c index cb1cbb3..40e908d 100644 --- a/level_0/f_file/c/file.c +++ b/level_0/f_file/c/file.c @@ -51,7 +51,7 @@ extern "C" { } if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == ELOOP) return F_status_set_error(F_loop); @@ -322,7 +322,7 @@ extern "C" { if (mkfifoat(directory.id, path.string, mode) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EDQUOT) return F_status_set_error(F_file_system_quota_block); if (errno == EEXIST) return F_status_set_error(F_file_found); if (errno == ENAMETOOLONG) return F_status_set_error(F_name); @@ -489,7 +489,7 @@ extern "C" { if (fstatat(directory.id, path.string, &stat_file, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == ELOOP) return F_status_set_error(F_loop); if (errno == ENAMETOOLONG) return F_status_set_error(F_name); @@ -1331,7 +1331,7 @@ extern "C" { if (fchmodat(directory.id, path.string, mode, 0) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EIO) return F_status_set_error(F_input_output); if (errno == ELOOP) return F_status_set_error(F_loop); @@ -1710,7 +1710,7 @@ extern "C" { if (unlinkat(directory.id, path.string, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EBUSY) return F_status_set_error(F_busy); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EIO) return F_status_set_error(F_input_output); @@ -1774,7 +1774,7 @@ extern "C" { if (renameat(directory_source.id, source.string, directory_destination.id, destination.string) < 0) { #endif // _f_file_rename_use_renameat2_ if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EBUSY) return F_status_set_error(F_busy); if (errno == EDQUOT) return F_status_set_error(F_file_system_quota_block); if (errno == EFAULT) return F_status_set_error(F_buffer); @@ -2010,7 +2010,7 @@ extern "C" { if (utimensat(F_file_at_current_working_d, path.string, 0, dereference ? 0 : F_file_at_symlink_follow_no_d) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == ELOOP) return F_status_set_error(F_loop); @@ -2050,7 +2050,7 @@ extern "C" { if (utimensat(directory.id, path.string, 0, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == ELOOP) return F_status_set_error(F_loop); diff --git a/level_0/f_file/c/file.h b/level_0/f_file/c/file.h index 687da30..fdc7ef6 100644 --- a/level_0/f_file/c/file.h +++ b/level_0/f_file/c/file.h @@ -102,7 +102,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) on access denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) the file does not exist. * F_loop (with error bit) on loop error. @@ -264,7 +264,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. + * F_directory (with error bit) if either path is a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_read (with error bit) on file read error. @@ -305,7 +305,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. + * F_directory (with error bit) if the path is a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -348,7 +348,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_open_max (with error bit) when system-wide max open files is reached. @@ -434,7 +434,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) on access denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -501,7 +501,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) on access denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_system_quota_block (with error bit) if file system's disk blocks or ififos are exhausted. @@ -573,7 +573,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) on access denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -663,7 +663,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) on access denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_false (with error bit) on unknown/unhandled errors. * F_loop (with error bit) on loop error. @@ -786,7 +786,7 @@ extern "C" { * F_file_found_not if the path was not found. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -878,7 +878,7 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. * F_buffer (with error bit) if the buffer is invalid. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file aleady exists at the path. * F_file_found_not (with error bit) if a parent path in point does not exist or is a broken symlink. @@ -960,7 +960,7 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory_descriptor (with error bit) when either at_id_target or at_id_point is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when either at_id_target or at_id_point is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_descriptor_not (with error bit) if file descriptor is invalid. * F_file_found (with error bit) if a file aleady exists at the path. @@ -1050,7 +1050,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if the file at path was not found. * F_input_output (with error bit) on I/O error. @@ -1291,7 +1291,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) if the file was not found. * F_loop (with error bit) on loop error. @@ -1360,7 +1360,7 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_access_mode (with error bit) if the current user does not have access to assign the file mode. * F_file_found_not (with error bit) if file at path was not found. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. @@ -1480,10 +1480,10 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory (with error bit) if path is a directory and is unable to access a directory (read, write, already exists, etc.. depending on requested open action). + * F_directory (with error bit) if the path is a directory. * F_file_found_not (with error bit) if the file was not found. * F_file_open_max (with error bit) when system-wide max open files is reached. - * F_file_type_not_directory (with error bit) if F_NOTIFY was specified and file.id is not a directory. + * F_directory_not (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_loop (with error bit) on loop error. @@ -1523,7 +1523,7 @@ extern "C" { * F_data_not if path.used is 0. * F_file_descriptor_not if file.id is -1. * - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found_not (with error bit) if the file was not found. * F_file_open (with error bit) if the file is already open. * F_parameter (with error bit) if a parameter is invalid. @@ -1753,7 +1753,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file is busy. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if file not found. * F_file_type_directory (with error bit) file is a directory (directories cannot be removed via this function). @@ -1849,7 +1849,7 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_directory_empty_not (with error bit) if the destination is a non-empty directory. * F_file_found_not (with error bit) if file at path was not found. @@ -1937,7 +1937,7 @@ extern "C" { * F_access_group (with error bit) if the current user does not have access to assign the specified group. * F_access_owner (with error bit) if the current user does not have access to assign the specified owner. * F_buffer (with error bit) if the buffer is invalid. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) if file at path was not found. * F_input_output (with error bit) on I/O error. @@ -2125,7 +2125,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) if the file was not found. * F_loop (with error bit) on loop error. @@ -2222,7 +2222,7 @@ extern "C" { * F_file_descriptor_not if file.id is -1. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) if the file was not found. * F_loop (with error bit) on loop error. @@ -2288,7 +2288,7 @@ extern "C" { * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found (with error bit) if a file aleady exists at the path. * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -2331,7 +2331,7 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file aleady exists at the path (when calling utimensat()). * F_file_open_max (with error bit) when system-wide max open files is reached. @@ -2404,7 +2404,7 @@ extern "C" { * F_file_found_not if the path was not found. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory_descriptor (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). + * F_directory_descriptor_not (with error bit) when at_id is not a valid file descriptor (at_id must point to a directory). * F_directory_not (with error bit) on invalid directory. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. diff --git a/level_0/f_file/c/file/stream.c b/level_0/f_file/c/file/stream.c index 8f34d41..54be83f 100644 --- a/level_0/f_file/c/file/stream.c +++ b/level_0/f_file/c/file/stream.c @@ -33,7 +33,7 @@ extern "C" { if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENOLCK) return F_status_set_error(F_lock); if (errno == ENOSPC) return F_status_set_error(F_space_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == EPERM) return F_status_set_error(F_prohibited); if (errno == EPIPE) return F_status_set_error(F_pipe_not); @@ -117,7 +117,7 @@ extern "C" { if (errno == ELOOP) return F_status_set_error(F_loop); if (errno == ENFILE) return F_status_set_error(F_file_open_max); if (errno == ENOENT) return F_status_set_error(F_file_found_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOSPC) return F_status_set_error(F_space_not); if (errno == EPERM) return F_status_set_error(F_prohibited); @@ -165,7 +165,7 @@ extern "C" { if (errno == ENOLCK) return F_status_set_error(F_lock); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOSPC) return F_status_set_error(F_space_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == EPERM) return F_status_set_error(F_prohibited); if (errno == EPIPE) return F_status_set_error(F_pipe_not); @@ -390,7 +390,7 @@ extern "C" { if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENOLCK) return F_status_set_error(F_lock); if (errno == ENOSPC) return F_status_set_error(F_space_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == EPERM) return F_status_set_error(F_prohibited); if (errno == EPIPE) return F_status_set_error(F_pipe_not); diff --git a/level_0/f_file/c/file/stream.h b/level_0/f_file/c/file/stream.h index 21174bf..4a4063d 100644 --- a/level_0/f_file/c/file/stream.h +++ b/level_0/f_file/c/file/stream.h @@ -31,10 +31,10 @@ extern "C" { * F_block (with error bit) if the action would block and non-blocking is set on the stream. * F_buffer (with error bit) if the buffer is invalid. * F_deadlock (with error bit) if operation would cause a deadlock. + * F_directory_not (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_file_descriptor_max (with error bit) if max file descriptors is reached. * F_file_descriptor_not (with error bit) if file descriptor is invalid. * F_file_overflow (with error bit) if the write exceeds some implementation defined maximum file size. - * F_file_type_not_directory (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_input_output (with error bit) on I/O error. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_lock (with error bit) if failed to lock, such as lock table is full or too many open segments. @@ -151,10 +151,11 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_busy (with error bit) if file system is too busy to perform write. + * F_directory (with error bit) if the path is a directory. + * F_directory_not (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_file_descriptor_not (with error bit) if unable to load the file descriptor. * F_file_found_not (with error bit) if the file was not found. * F_file_open_max (with error bit) when system-wide max open files is reached. - * F_file_type_not_directory (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_loop (with error bit) on loop error. @@ -192,10 +193,10 @@ extern "C" { * F_block (with error bit) if the action would block and non-blocking is set on the stream. * F_buffer (with error bit) if the buffer is invalid. * F_deadlock (with error bit) if operation would cause a deadlock. + * F_directory_not (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_file_descriptor_max (with error bit) if max file descriptors is reached. * F_file_descriptor_not (with error bit) if file descriptor is invalid. * F_file_overflow (with error bit) if the write exceeds some implementation defined maximum file size. - * F_file_type_not_directory (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_lock (with error bit) if failed to lock, such as lock table is full or too many open segments. * F_parameter (with error bit) if a parameter is invalid. @@ -345,11 +346,11 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. - * F_busy (with error bit) if file system is too busy to perform write. + * F_busy (with error bit) if file system is too busy to perform write + * F_directory_not (with error bit) if F_NOTIFY was specified and file.id is not a directory.. * F_file_descriptor_not (with error bit) if unable to load the file descriptor. * F_file_found_not (with error bit) if the file was not found. * F_file_open_max (with error bit) when system-wide max open files is reached. - * F_file_type_not_directory (with error bit) if F_NOTIFY was specified and file.id is not a directory. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_loop (with error bit) on loop error. diff --git a/level_0/f_file/c/private-file.c b/level_0/f_file/c/private-file.c index 7ce7fb7..d46bf7e 100644 --- a/level_0/f_file/c/private-file.c +++ b/level_0/f_file/c/private-file.c @@ -212,7 +212,7 @@ extern "C" { if (mknodat(file.id, path.string, mode, device) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EDQUOT) return F_status_set_error(F_file_system_quota_block); if (errno == EEXIST) return F_status_set_error(F_file_found); if (errno == EFAULT) return F_status_set_error(F_buffer); @@ -285,7 +285,7 @@ extern "C" { if (symlinkat(target.string, directory.id, point.string) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EDQUOT) return F_status_set_error(F_file_system_quota_block); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EEXIST) return F_status_set_error(F_file_found); @@ -353,7 +353,7 @@ extern "C" { if (size) { if (readlinkat(file.id, path.string, target->string, size) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == EIO) return F_status_set_error(F_input_output); @@ -418,7 +418,7 @@ extern "C" { if (errno == ENOENT) return F_status_set_error(F_file_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOSPC) return F_status_set_error(F_space_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == EOPNOTSUPP) return F_status_set_error(F_support_not); if (errno == EPERM) return F_status_set_error(F_prohibited); if (errno == EROFS) return F_status_set_error(F_read_only); @@ -438,7 +438,7 @@ extern "C" { if (file->id == -1) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EDQUOT) return F_status_set_error(F_file_system_quota_block); if (errno == EEXIST) return F_status_set_error(F_file_found); if (errno == EFAULT) return F_status_set_error(F_buffer); @@ -452,7 +452,7 @@ extern "C" { if (errno == ENOENT) return F_status_set_error(F_file_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == ENOSPC) return F_status_set_error(F_space_not); - if (errno == ENOTDIR) return F_status_set_error(F_file_type_not_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == EOPNOTSUPP) return F_status_set_error(F_support_not); if (errno == EPERM) return F_status_set_error(F_prohibited); if (errno == EROFS) return F_status_set_error(F_read_only); @@ -537,7 +537,7 @@ extern "C" { if (result < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EIO) return F_status_set_error(F_input_output); if (errno == ELOOP) return F_status_set_error(F_loop); @@ -580,7 +580,7 @@ extern "C" { if (fstatat(file.id, path.string, file_stat, flag) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EINVAL) return F_status_set_error(F_parameter); if (errno == ELOOP) return F_status_set_error(F_loop); diff --git a/level_0/f_file/c/private-file.h b/level_0/f_file/c/private-file.h index 8d6eb96..da1f80f 100644 --- a/level_0/f_file/c/private-file.h +++ b/level_0/f_file/c/private-file.h @@ -74,7 +74,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory (with error bit) if either path is a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_read (with error bit) on file read error. @@ -123,7 +123,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory (with error bit) if the path is a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -171,7 +171,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_open_max (with error bit) when system-wide max open files is reached. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -209,7 +209,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_directory_link_max (with error bit) max links limit reached or exceeded. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_found_not (with error bit) if file at path was not found. @@ -245,7 +245,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_system_quota_block (with error bit) if file system's disk blocks or ififos are exhausted. * F_loop (with error bit) on loop error. @@ -286,7 +286,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. * F_loop (with error bit) on loop error. @@ -330,8 +330,8 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found (with error bit) if a file was found while exclusive is TRUE. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. * F_loop (with error bit) on loop error. @@ -404,7 +404,7 @@ extern "C" { * F_file_found (with error bit) if a file aleady exists at the path. * F_file_found_not (with error bit) if a parent path in point does not exist or is a broken symlink. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_interrupt (with error bit) when program received an interrupt signal, halting operation. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -442,8 +442,8 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_busy (with error bit) if file system is too busy to perform write. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found (with error bit) if a file aleady exists at the path. * F_file_found_not (with error bit) if a parent path in point does not exist or is a broken symlink. * F_file_system_quota_block (with error bit) if file system's disk blocks or inodes are exhausted. @@ -483,7 +483,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if the file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. @@ -524,8 +524,8 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found_not (with error bit) if the file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. @@ -560,7 +560,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_access_mode (with error bit) if the current user does not have access to assign the file mode. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. @@ -595,6 +595,7 @@ extern "C" { * @return * F_okay on success. * + * F_directory (with error bit) if the path is a directory. * F_file_descriptor_not (with error bit) if unable to load the file descriptor (the file pointer may still be valid). * F_file_found_not (with error bit) if the file was not found. * F_file_open (with error bit) if the file is already open. @@ -627,7 +628,7 @@ extern "C" { * @return * F_okay on success. * - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found_not (with error bit) if the file was not found. * F_file_open (with error bit) if the file is already open. * F_parameter (with error bit) if a parameter is invalid. @@ -663,7 +664,7 @@ extern "C" { * F_access_group (with error bit) if the current user does not have access to assign the specified group. * F_access_owner (with error bit) if the current user does not have access to assign the specified owner. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. @@ -706,8 +707,8 @@ extern "C" { * F_access_group (with error bit) if the current user does not have access to assign the specified group. * F_access_owner (with error bit) if the current user does not have access to assign the specified owner. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) on invalid directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_file_found_not (with error bit) if file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. @@ -742,7 +743,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if the file was not found. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -788,7 +789,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if the file was not found. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -824,7 +825,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) if access to the file was denied. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_file_found_not (with error bit) if the file was not found. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. diff --git a/level_0/f_file/tests/unit/c/test-file-access_at.c b/level_0/f_file/tests/unit/c/test-file-access_at.c index f53f381..e2c93ef 100644 --- a/level_0/f_file/tests/unit/c/test-file-access_at.c +++ b/level_0/f_file/tests/unit/c/test-file-access_at.c @@ -27,7 +27,7 @@ void test__f_file_access_at__fails(void **state) { f_status_t statuss[] = { F_status_set_error(F_access_denied), - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_buffer), F_status_set_error(F_parameter), F_status_set_error(F_loop), @@ -67,7 +67,7 @@ void test__f_file_access_at__fails(void **state) { f_status_t statuss[] = { F_false, - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_buffer), F_status_set_error(F_parameter), F_status_set_error(F_loop), diff --git a/level_0/f_file/tests/unit/c/test-file-clone.c b/level_0/f_file/tests/unit/c/test-file-clone.c index 483c7fd..ae06d73 100644 --- a/level_0/f_file/tests/unit/c/test-file-clone.c +++ b/level_0/f_file/tests/unit/c/test-file-clone.c @@ -452,7 +452,7 @@ void test__f_file_clone__fails_for_regular(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, @@ -754,7 +754,7 @@ void test__f_file_clone__fails_for_regular(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, @@ -836,7 +836,7 @@ void test__f_file_clone__fails_for_regular(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, diff --git a/level_0/f_file/tests/unit/c/test-file-copy.c b/level_0/f_file/tests/unit/c/test-file-copy.c index fab1694..2128a3c 100644 --- a/level_0/f_file/tests/unit/c/test-file-copy.c +++ b/level_0/f_file/tests/unit/c/test-file-copy.c @@ -818,7 +818,7 @@ void test__f_file_copy__fails_for_regular(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, @@ -996,7 +996,7 @@ void test__f_file_copy__fails_for_regular(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, @@ -1079,7 +1079,7 @@ void test__f_file_copy__fails_for_regular(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, diff --git a/level_0/f_file/tests/unit/c/test-file-create.c b/level_0/f_file/tests/unit/c/test-file-create.c index c27b6f2..349a46b 100644 --- a/level_0/f_file/tests/unit/c/test-file-create.c +++ b/level_0/f_file/tests/unit/c/test-file-create.c @@ -49,7 +49,7 @@ void test__f_file_create__fails(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, diff --git a/level_0/f_file/tests/unit/c/test-file-create_at.c b/level_0/f_file/tests/unit/c/test-file-create_at.c index 7227769..9f16bb1 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_at.c +++ b/level_0/f_file/tests/unit/c/test-file-create_at.c @@ -38,7 +38,7 @@ void test__f_file_create_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_file_system_quota_block, F_file_found, F_buffer, @@ -52,7 +52,7 @@ void test__f_file_create_at__fails(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, diff --git a/level_0/f_file/tests/unit/c/test-file-create_device_at.c b/level_0/f_file/tests/unit/c/test-file-create_device_at.c index 875b622..a61f214 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_device_at.c +++ b/level_0/f_file/tests/unit/c/test-file-create_device_at.c @@ -32,7 +32,7 @@ void test__f_file_create_device_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_file_system_quota_block, F_file_found, F_buffer, diff --git a/level_0/f_file/tests/unit/c/test-file-create_fifo_at.c b/level_0/f_file/tests/unit/c/test-file-create_fifo_at.c index 9c95ffe..160e8f5 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_fifo_at.c +++ b/level_0/f_file/tests/unit/c/test-file-create_fifo_at.c @@ -27,7 +27,7 @@ void test__f_file_create_fifo_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_file_system_quota_block, F_file_found, F_name, diff --git a/level_0/f_file/tests/unit/c/test-file-create_node_at.c b/level_0/f_file/tests/unit/c/test-file-create_node_at.c index cf5a456..3847fd7 100644 --- a/level_0/f_file/tests/unit/c/test-file-create_node_at.c +++ b/level_0/f_file/tests/unit/c/test-file-create_node_at.c @@ -32,7 +32,7 @@ void test__f_file_create_node_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_file_system_quota_block, F_file_found, F_buffer, diff --git a/level_0/f_file/tests/unit/c/test-file-exists_at.c b/level_0/f_file/tests/unit/c/test-file-exists_at.c index 1160c8e..eec1108 100644 --- a/level_0/f_file/tests/unit/c/test-file-exists_at.c +++ b/level_0/f_file/tests/unit/c/test-file-exists_at.c @@ -25,7 +25,7 @@ void test__f_file_exists_at__fails(void **state) { f_status_t statuss[] = { F_status_set_error(F_access_denied), - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_buffer), F_status_set_error(F_loop), F_status_set_error(F_name), diff --git a/level_0/f_file/tests/unit/c/test-file-is_at.c b/level_0/f_file/tests/unit/c/test-file-is_at.c index 34e65fa..017a27d 100644 --- a/level_0/f_file/tests/unit/c/test-file-is_at.c +++ b/level_0/f_file/tests/unit/c/test-file-is_at.c @@ -25,7 +25,7 @@ void test__f_file_is_at__fails(void **state) { f_status_t statuss[] = { F_status_set_error(F_access_denied), - F_status_set_error(F_directory_descriptor), + F_status_set_error(F_directory_descriptor_not), F_status_set_error(F_buffer), F_status_set_error(F_loop), F_status_set_error(F_name), diff --git a/level_0/f_file/tests/unit/c/test-file-link_at.c b/level_0/f_file/tests/unit/c/test-file-link_at.c index 4f3e9e1..77d00dc 100644 --- a/level_0/f_file/tests/unit/c/test-file-link_at.c +++ b/level_0/f_file/tests/unit/c/test-file-link_at.c @@ -34,7 +34,7 @@ void test__f_file_link_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_file_system_quota_block, F_file_found, F_buffer, diff --git a/level_0/f_file/tests/unit/c/test-file-link_read_at.c b/level_0/f_file/tests/unit/c/test-file-link_read_at.c index 147424a..d2d01df 100644 --- a/level_0/f_file/tests/unit/c/test-file-link_read_at.c +++ b/level_0/f_file/tests/unit/c/test-file-link_read_at.c @@ -26,7 +26,7 @@ void test__f_file_link_read_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_input_output, diff --git a/level_0/f_file/tests/unit/c/test-file-mode_read_at.c b/level_0/f_file/tests/unit/c/test-file-mode_read_at.c index 654f42a..f4bd76b 100644 --- a/level_0/f_file/tests/unit/c/test-file-mode_read_at.c +++ b/level_0/f_file/tests/unit/c/test-file-mode_read_at.c @@ -25,7 +25,7 @@ void test__f_file_mode_read_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_loop, F_name, diff --git a/level_0/f_file/tests/unit/c/test-file-mode_set_at.c b/level_0/f_file/tests/unit/c/test-file-mode_set_at.c index 2dc659b..51e9c90 100644 --- a/level_0/f_file/tests/unit/c/test-file-mode_set_at.c +++ b/level_0/f_file/tests/unit/c/test-file-mode_set_at.c @@ -29,7 +29,7 @@ void test__f_file_mode_set_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_input_output, F_loop, diff --git a/level_0/f_file/tests/unit/c/test-file-open.c b/level_0/f_file/tests/unit/c/test-file-open.c index cd4c912..716d7af 100644 --- a/level_0/f_file/tests/unit/c/test-file-open.c +++ b/level_0/f_file/tests/unit/c/test-file-open.c @@ -48,7 +48,7 @@ void test__f_file_open__fails(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, diff --git a/level_0/f_file/tests/unit/c/test-file-open_at.c b/level_0/f_file/tests/unit/c/test-file-open_at.c index eaacd30..5eeaacd 100644 --- a/level_0/f_file/tests/unit/c/test-file-open_at.c +++ b/level_0/f_file/tests/unit/c/test-file-open_at.c @@ -36,7 +36,7 @@ void test__f_file_open_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_file_system_quota_block, F_file_found, F_buffer, @@ -50,7 +50,7 @@ void test__f_file_open_at__fails(void **state) { F_file_found_not, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_support_not, F_number_overflow, F_prohibited, diff --git a/level_0/f_file/tests/unit/c/test-file-remove_at.c b/level_0/f_file/tests/unit/c/test-file-remove_at.c index 0a5c6bc..8980db7 100644 --- a/level_0/f_file/tests/unit/c/test-file-remove_at.c +++ b/level_0/f_file/tests/unit/c/test-file-remove_at.c @@ -29,7 +29,7 @@ void test__f_file_remove_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_busy, F_buffer, F_input_output, diff --git a/level_0/f_file/tests/unit/c/test-file-rename_at.c b/level_0/f_file/tests/unit/c/test-file-rename_at.c index 74f617a..60f18d7 100644 --- a/level_0/f_file/tests/unit/c/test-file-rename_at.c +++ b/level_0/f_file/tests/unit/c/test-file-rename_at.c @@ -36,7 +36,7 @@ void test__f_file_rename_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_busy, F_file_system_quota_block, F_buffer, diff --git a/level_0/f_file/tests/unit/c/test-file-role_change_at.c b/level_0/f_file/tests/unit/c/test-file-role_change_at.c index 999ef92..db328dd 100644 --- a/level_0/f_file/tests/unit/c/test-file-role_change_at.c +++ b/level_0/f_file/tests/unit/c/test-file-role_change_at.c @@ -27,7 +27,7 @@ void test__f_file_role_change_at__fails_for_dereference(void **state) { f_status_t status_owners[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_input_output, F_loop, @@ -42,7 +42,7 @@ void test__f_file_role_change_at__fails_for_dereference(void **state) { f_status_t status_groups[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_input_output, F_loop, @@ -121,7 +121,7 @@ void test__f_file_role_change_at__fails_for_reference(void **state) { f_status_t status_owners[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_input_output, F_loop, @@ -136,7 +136,7 @@ void test__f_file_role_change_at__fails_for_reference(void **state) { f_status_t status_groups[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_input_output, F_loop, diff --git a/level_0/f_file/tests/unit/c/test-file-size_at.c b/level_0/f_file/tests/unit/c/test-file-size_at.c index 7f30c80..f8d1dfa 100644 --- a/level_0/f_file/tests/unit/c/test-file-size_at.c +++ b/level_0/f_file/tests/unit/c/test-file-size_at.c @@ -26,7 +26,7 @@ void test__f_file_size_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_loop, diff --git a/level_0/f_file/tests/unit/c/test-file-stat_at.c b/level_0/f_file/tests/unit/c/test-file-stat_at.c index a5add47..a3a1293 100644 --- a/level_0/f_file/tests/unit/c/test-file-stat_at.c +++ b/level_0/f_file/tests/unit/c/test-file-stat_at.c @@ -26,7 +26,7 @@ void test__f_file_stat_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_loop, diff --git a/level_0/f_file/tests/unit/c/test-file-stream_close.c b/level_0/f_file/tests/unit/c/test-file-stream_close.c index 38bbc22..507c4e9 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_close.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_close.c @@ -44,7 +44,7 @@ void test__f_file_stream_close__fails(void **state) { F_file_descriptor_max, F_lock, F_space_not, - F_file_type_not_directory, + F_directory_not, F_prohibited, F_pipe_not, F_block, diff --git a/level_0/f_file/tests/unit/c/test-file-stream_open.c b/level_0/f_file/tests/unit/c/test-file-stream_open.c index 0ead511..22177df 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_open.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_open.c @@ -45,7 +45,7 @@ void test__f_file_stream_open__fails(void **state) { F_loop, F_file_open_max, F_file_found_not, - F_file_type_not_directory, + F_directory_not, F_memory_not, F_space_not, F_prohibited, diff --git a/level_0/f_file/tests/unit/c/test-file-stream_open_descriptor.c b/level_0/f_file/tests/unit/c/test-file-stream_open_descriptor.c index ec36b44..eaee796 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_open_descriptor.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_open_descriptor.c @@ -48,7 +48,7 @@ void test__f_file_stream_open_descriptor__fails(void **state) { F_lock, F_memory_not, F_space_not, - F_file_type_not_directory, + F_directory_not, F_prohibited, F_pipe_not, F_block, diff --git a/level_0/f_file/tests/unit/c/test-file-stream_reopen.c b/level_0/f_file/tests/unit/c/test-file-stream_reopen.c index 9a1f2b6..862f64f 100644 --- a/level_0/f_file/tests/unit/c/test-file-stream_reopen.c +++ b/level_0/f_file/tests/unit/c/test-file-stream_reopen.c @@ -46,7 +46,7 @@ void test__f_file_stream_reopen__fails(void **state) { F_file_descriptor_max, F_lock, F_space_not, - F_file_type_not_directory, + F_directory_not, F_prohibited, F_pipe_not, F_block, diff --git a/level_0/f_file/tests/unit/c/test-file-touch.c b/level_0/f_file/tests/unit/c/test-file-touch.c index f11c049..df28b94 100644 --- a/level_0/f_file/tests/unit/c/test-file-touch.c +++ b/level_0/f_file/tests/unit/c/test-file-touch.c @@ -82,7 +82,7 @@ void test__f_file_touch__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_loop, diff --git a/level_0/f_file/tests/unit/c/test-file-touch_at.c b/level_0/f_file/tests/unit/c/test-file-touch_at.c index f5458e0..b458c64 100644 --- a/level_0/f_file/tests/unit/c/test-file-touch_at.c +++ b/level_0/f_file/tests/unit/c/test-file-touch_at.c @@ -28,7 +28,7 @@ void test__f_file_touch_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_loop, @@ -85,7 +85,7 @@ void test__f_file_touch_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_parameter, F_loop, diff --git a/level_0/f_file/tests/unit/c/test-file-type_at.c b/level_0/f_file/tests/unit/c/test-file-type_at.c index 123d7e4..a0c5774 100644 --- a/level_0/f_file/tests/unit/c/test-file-type_at.c +++ b/level_0/f_file/tests/unit/c/test-file-type_at.c @@ -25,7 +25,7 @@ void test__f_file_type_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_loop, F_name, diff --git a/level_0/f_path/c/path.c b/level_0/f_path/c/path.c index ea1be72..ed045ae 100644 --- a/level_0/f_path/c/path.c +++ b/level_0/f_path/c/path.c @@ -16,7 +16,7 @@ extern "C" { if (errno == ENAMETOOLONG) return F_status_set_error(F_name); if (errno == ENOENT) return F_status_set_error(F_file_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); - if (errno == ENOTDIR) return F_status_set_error(F_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); return F_status_set_error(F_failure); } @@ -33,14 +33,14 @@ extern "C" { if (fchdir(at_id) < 0) { if (errno == EACCES) return F_status_set_error(F_access_denied); - if (errno == EBADF) return F_status_set_error(F_directory_descriptor); + if (errno == EBADF) return F_status_set_error(F_directory_descriptor_not); if (errno == EFAULT) return F_status_set_error(F_buffer); if (errno == EIO) return F_status_set_error(F_input_output); if (errno == ELOOP) return F_status_set_error(F_loop); if (errno == ENAMETOOLONG) return F_status_set_error(F_name); if (errno == ENOENT) return F_status_set_error(F_file_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); - if (errno == ENOTDIR) return F_status_set_error(F_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); return F_status_set_error(F_failure); } diff --git a/level_0/f_path/c/path.h b/level_0/f_path/c/path.h index 948658e..ffd030d 100644 --- a/level_0/f_path/c/path.h +++ b/level_0/f_path/c/path.h @@ -46,7 +46,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -72,8 +72,8 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. - * F_directory_descriptor (with error bit) for bad directory descriptor for at_id. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_descriptor_not (with error bit) for bad directory descriptor for at_id. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -105,7 +105,7 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_buffer_too_small (with error bit) if the buffer is too small to store the path. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. @@ -258,7 +258,7 @@ extern "C" { * F_access_denied (with error bit) on access denied. * F_buffer (with error bit) if the buffer is invalid. * F_buffer_too_small (with error bit) if the buffer is too small to store the path. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. diff --git a/level_0/f_path/c/private-path.c b/level_0/f_path/c/private-path.c index 15f19dc..2c5b630 100644 --- a/level_0/f_path/c/private-path.c +++ b/level_0/f_path/c/private-path.c @@ -23,7 +23,7 @@ extern "C" { if (errno == ENAMETOOLONG) return F_status_set_error(F_name); if (errno == ENOENT) return F_status_set_error(F_file_found_not); if (errno == ENOMEM) return F_status_set_error(F_memory_not); - if (errno == ENOTDIR) return F_status_set_error(F_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); return F_status_set_error(F_failure); } diff --git a/level_0/f_path/c/private-path.h b/level_0/f_path/c/private-path.h index 40e97c9..786fe8f 100644 --- a/level_0/f_path/c/private-path.h +++ b/level_0/f_path/c/private-path.h @@ -31,7 +31,7 @@ extern "C" { * F_okay on success. * * F_access_denied (with error bit) on access denied. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. * F_memory_not (with error bit) if out of memory. diff --git a/level_0/f_path/tests/unit/c/test-path-change.c b/level_0/f_path/tests/unit/c/test-path-change.c index 2c21902..d297a0d 100644 --- a/level_0/f_path/tests/unit/c/test-path-change.c +++ b/level_0/f_path/tests/unit/c/test-path-change.c @@ -29,7 +29,7 @@ void test__f_path_change__fails(void **state) { F_name, F_file_found_not, F_memory_not, - F_directory, + F_directory_not, F_failure, }; diff --git a/level_0/f_path/tests/unit/c/test-path-change_at.c b/level_0/f_path/tests/unit/c/test-path-change_at.c index 2794aa0..ec0014f 100644 --- a/level_0/f_path/tests/unit/c/test-path-change_at.c +++ b/level_0/f_path/tests/unit/c/test-path-change_at.c @@ -24,14 +24,14 @@ void test__f_path_change_at__fails(void **state) { f_status_t statuss[] = { F_access_denied, - F_directory_descriptor, + F_directory_descriptor_not, F_buffer, F_input_output, F_loop, F_name, F_file_found_not, F_memory_not, - F_directory, + F_directory_not, F_failure, }; diff --git a/level_0/f_path/tests/unit/c/test-path-current.c b/level_0/f_path/tests/unit/c/test-path-current.c index 21a777c..afacd29 100644 --- a/level_0/f_path/tests/unit/c/test-path-current.c +++ b/level_0/f_path/tests/unit/c/test-path-current.c @@ -66,7 +66,7 @@ void test__f_path_current__fails(void **state) { F_name, F_file_found_not, F_memory_not, - F_directory, + F_directory_not, F_failure, }; diff --git a/level_0/f_path/tests/unit/c/test-path-real.c b/level_0/f_path/tests/unit/c/test-path-real.c index fdaa32e..9a85b98 100644 --- a/level_0/f_path/tests/unit/c/test-path-real.c +++ b/level_0/f_path/tests/unit/c/test-path-real.c @@ -31,7 +31,7 @@ void test__f_path_real__fails(void **state) { F_name, F_file_found_not, F_memory_not, - F_directory, + F_directory_not, F_failure, }; diff --git a/level_0/f_status/c/status.h b/level_0/f_status/c/status.h index 5b42eb2..0420701 100644 --- a/level_0/f_status/c/status.h +++ b/level_0/f_status/c/status.h @@ -405,24 +405,35 @@ extern "C" { F_device_not, F_directory, F_directory_close, - F_directory_closed, + F_directory_close_not, F_directory_descriptor, + F_directory_descriptor_not, F_directory_empty, F_directory_empty_not, F_directory_found, F_directory_found_not, F_directory_flush, + F_directory_flush_not, + F_directory_link, F_directory_link_max, + F_directory_link_not, F_directory_not, F_directory_open, + F_directory_open_not, F_directory_purge, + F_directory_purge_not, F_directory_read, + F_directory_read_not, F_directory_stream, + F_directory_stream_not, + F_directory_support, F_directory_support_not, F_directory_synchronize, + F_directory_synchronize_not, F_directory_utf, F_directory_utf_not, F_directory_write, + F_directory_write_not, F_disable, F_disable_not, F_discard, diff --git a/level_0/f_status_string/c/status_string.c b/level_0/f_status_string/c/status_string.c index 20cd513..09c3dd4 100644 --- a/level_0/f_status_string/c/status_string.c +++ b/level_0/f_status_string/c/status_string.c @@ -246,24 +246,35 @@ extern "C" { const f_string_static_t f_status_device_not_s = macro_f_string_static_t_initialize_1(F_status_device_not_s, 0, F_status_device_not_s_length); const f_string_static_t f_status_directory_s = macro_f_string_static_t_initialize_1(F_status_directory_s, 0, F_status_directory_s_length); const f_string_static_t f_status_directory_close_s = macro_f_string_static_t_initialize_1(F_status_directory_close_s, 0, F_status_directory_close_s_length); - const f_string_static_t f_status_directory_closed_s = macro_f_string_static_t_initialize_1(F_status_directory_closed_s, 0, F_status_directory_closed_s_length); + const f_string_static_t f_status_directory_close_not_s = macro_f_string_static_t_initialize_1(F_status_directory_close_not_s, 0, F_status_directory_close_not_s_length); const f_string_static_t f_status_directory_descriptor_s = macro_f_string_static_t_initialize_1(F_status_directory_descriptor_s, 0, F_status_directory_descriptor_s_length); + const f_string_static_t f_status_directory_descriptor_not_s = macro_f_string_static_t_initialize_1(F_status_directory_descriptor_not_s, 0, F_status_directory_descriptor_not_s_length); const f_string_static_t f_status_directory_empty_s = macro_f_string_static_t_initialize_1(F_status_directory_empty_s, 0, F_status_directory_empty_s_length); const f_string_static_t f_status_directory_empty_not_s = macro_f_string_static_t_initialize_1(F_status_directory_empty_not_s, 0, F_status_directory_empty_not_s_length); const f_string_static_t f_status_directory_found_s = macro_f_string_static_t_initialize_1(F_status_directory_found_s, 0, F_status_directory_found_s_length); const f_string_static_t f_status_directory_found_not_s = macro_f_string_static_t_initialize_1(F_status_directory_found_not_s, 0, F_status_directory_found_not_s_length); const f_string_static_t f_status_directory_flush_s = macro_f_string_static_t_initialize_1(F_status_directory_flush_s, 0, F_status_directory_flush_s_length); + const f_string_static_t f_status_directory_flush_not_s = macro_f_string_static_t_initialize_1(F_status_directory_flush_not_s, 0, F_status_directory_flush_not_s_length); + const f_string_static_t f_status_directory_link_s = macro_f_string_static_t_initialize_1(F_status_directory_link_s, 0, F_status_directory_link_s_length); const f_string_static_t f_status_directory_link_max_s = macro_f_string_static_t_initialize_1(F_status_directory_link_max_s, 0, F_status_directory_link_max_s_length); + const f_string_static_t f_status_directory_link_not_s = macro_f_string_static_t_initialize_1(F_status_directory_link_not_s, 0, F_status_directory_link_not_s_length); const f_string_static_t f_status_directory_not_s = macro_f_string_static_t_initialize_1(F_status_directory_not_s, 0, F_status_directory_not_s_length); const f_string_static_t f_status_directory_open_s = macro_f_string_static_t_initialize_1(F_status_directory_open_s, 0, F_status_directory_open_s_length); + const f_string_static_t f_status_directory_open_not_s = macro_f_string_static_t_initialize_1(F_status_directory_open_not_s, 0, F_status_directory_open_not_s_length); const f_string_static_t f_status_directory_purge_s = macro_f_string_static_t_initialize_1(F_status_directory_purge_s, 0, F_status_directory_purge_s_length); + const f_string_static_t f_status_directory_purge_not_s = macro_f_string_static_t_initialize_1(F_status_directory_purge_not_s, 0, F_status_directory_purge_not_s_length); const f_string_static_t f_status_directory_read_s = macro_f_string_static_t_initialize_1(F_status_directory_read_s, 0, F_status_directory_read_s_length); + const f_string_static_t f_status_directory_read_not_s = macro_f_string_static_t_initialize_1(F_status_directory_read_not_s, 0, F_status_directory_read_not_s_length); const f_string_static_t f_status_directory_stream_s = macro_f_string_static_t_initialize_1(F_status_directory_stream_s, 0, F_status_directory_stream_s_length); + const f_string_static_t f_status_directory_stream_not_s = macro_f_string_static_t_initialize_1(F_status_directory_stream_not_s, 0, F_status_directory_stream_not_s_length); + const f_string_static_t f_status_directory_support_s = macro_f_string_static_t_initialize_1(F_status_directory_support_s, 0, F_status_directory_support_s_length); const f_string_static_t f_status_directory_support_not_s = macro_f_string_static_t_initialize_1(F_status_directory_support_not_s, 0, F_status_directory_support_not_s_length); const f_string_static_t f_status_directory_synchronize_s = macro_f_string_static_t_initialize_1(F_status_directory_synchronize_s, 0, F_status_directory_synchronize_s_length); + const f_string_static_t f_status_directory_synchronize_not_s = macro_f_string_static_t_initialize_1(F_status_directory_synchronize_not_s, 0, F_status_directory_synchronize_not_s_length); const f_string_static_t f_status_directory_utf_s = macro_f_string_static_t_initialize_1(F_status_directory_utf_s, 0, F_status_directory_utf_s_length); const f_string_static_t f_status_directory_utf_not_s = macro_f_string_static_t_initialize_1(F_status_directory_utf_not_s, 0, F_status_directory_utf_not_s_length); const f_string_static_t f_status_directory_write_s = macro_f_string_static_t_initialize_1(F_status_directory_write_s, 0, F_status_directory_write_s_length); + const f_string_static_t f_status_directory_write_not_s = macro_f_string_static_t_initialize_1(F_status_directory_write_not_s, 0, F_status_directory_write_not_s_length); const f_string_static_t f_status_disable_s = macro_f_string_static_t_initialize_1(F_status_disable_s, 0, F_status_disable_s_length); const f_string_static_t f_status_disable_not_s = macro_f_string_static_t_initialize_1(F_status_disable_not_s, 0, F_status_disable_not_s_length); const f_string_static_t f_status_discard_s = macro_f_string_static_t_initialize_1(F_status_discard_s, 0, F_status_discard_s_length); @@ -2023,8 +2034,8 @@ extern "C" { break; - case F_directory_closed: - *name = f_status_directory_closed_s; + case F_directory_close_not: + *name = f_status_directory_close_not_s; break; @@ -2033,6 +2044,11 @@ extern "C" { break; + case F_directory_descriptor_not: + *name = f_status_directory_descriptor_not_s; + + break; + case F_directory_empty: *name = f_status_directory_empty_s; @@ -2058,11 +2074,26 @@ extern "C" { break; + case F_directory_flush_not: + *name = f_status_directory_flush_not_s; + + break; + + case F_directory_link: + *name = f_status_directory_link_s; + + break; + case F_directory_link_max: *name = f_status_directory_link_max_s; break; + case F_directory_link_not: + *name = f_status_directory_link_not_s; + + break; + case F_directory_not: *name = f_status_directory_not_s; @@ -2073,26 +2104,56 @@ extern "C" { break; + case F_directory_open_not: + *name = f_status_directory_open_not_s; + + break; + case F_directory_purge: *name = f_status_directory_purge_s; break; + case F_directory_purge_not: + *name = f_status_directory_purge_not_s; + + break; + case F_directory_read: *name = f_status_directory_read_s; break; + case F_directory_read_not: + *name = f_status_directory_read_not_s; + + break; + case F_directory_stream: *name = f_status_directory_stream_s; break; + case F_directory_stream_not: + *name = f_status_directory_stream_not_s; + + break; + case F_directory_synchronize: *name = f_status_directory_synchronize_s; break; + case F_directory_synchronize_not: + *name = f_status_directory_synchronize_not_s; + + break; + + case F_directory_support: + *name = f_status_directory_support_s; + + break; + case F_directory_support_not: *name = f_status_directory_support_not_s; @@ -2113,6 +2174,11 @@ extern "C" { break; + case F_directory_write_not: + *name = f_status_directory_write_not_s; + + break; + case F_disable: *name = f_status_disable_s; diff --git a/level_0/f_status_string/c/status_string.h b/level_0/f_status_string/c/status_string.h index 6dd5533..9b7197d 100644 --- a/level_0/f_status_string/c/status_string.h +++ b/level_0/f_status_string/c/status_string.h @@ -406,24 +406,35 @@ extern "C" { #define F_status_device_not_s "F_device_not" #define F_status_directory_s "F_directory" #define F_status_directory_close_s "F_directory_close" - #define F_status_directory_closed_s "F_directory_closed" + #define F_status_directory_close_not_s "F_directory_close_not" #define F_status_directory_descriptor_s "F_directory_descriptor" + #define F_status_directory_descriptor_not_s "F_directory_descriptor_not" #define F_status_directory_empty_s "F_directory_empty" #define F_status_directory_empty_not_s "F_directory_empty_not" #define F_status_directory_found_s "F_directory_found" #define F_status_directory_found_not_s "F_directory_found_not" #define F_status_directory_flush_s "F_directory_flush" + #define F_status_directory_flush_not_s "F_directory_flush_not" + #define F_status_directory_link_s "F_directory_link" #define F_status_directory_link_max_s "F_directory_link_max" + #define F_status_directory_link_not_s "F_directory_link_not" #define F_status_directory_not_s "F_directory_not" #define F_status_directory_open_s "F_directory_open" + #define F_status_directory_open_not_s "F_directory_open_not" #define F_status_directory_purge_s "F_directory_purge" + #define F_status_directory_purge_not_s "F_directory_purge_not" #define F_status_directory_read_s "F_directory_read" + #define F_status_directory_read_not_s "F_directory_read_not" #define F_status_directory_stream_s "F_directory_stream" + #define F_status_directory_stream_not_s "F_directory_stream_not" + #define F_status_directory_support_s "F_directory_support" #define F_status_directory_support_not_s "F_directory_support_not" #define F_status_directory_synchronize_s "F_directory_synchronize" + #define F_status_directory_synchronize_not_s "F_directory_synchronize_not" #define F_status_directory_utf_s "F_directory_utf" #define F_status_directory_utf_not_s "F_directory_utf_not" #define F_status_directory_write_s "F_directory_write" + #define F_status_directory_write_not_s "F_directory_write_not" #define F_status_disable_s "F_disable" #define F_status_disable_not_s "F_disable_not" #define F_status_discard_s "F_discard" @@ -1132,24 +1143,35 @@ extern "C" { #define F_status_device_not_s_length 12 #define F_status_directory_s_length 11 #define F_status_directory_close_s_length 17 - #define F_status_directory_closed_s_length 18 + #define F_status_directory_close_not_s_length 21 #define F_status_directory_descriptor_s_length 22 + #define F_status_directory_descriptor_not_s_length 26 #define F_status_directory_empty_s_length 17 #define F_status_directory_empty_not_s_length 21 #define F_status_directory_found_s_length 17 #define F_status_directory_found_not_s_length 21 #define F_status_directory_flush_s_length 17 + #define F_status_directory_flush_not_s_length 21 + #define F_status_directory_link_s_length 16 #define F_status_directory_link_max_s_length 20 + #define F_status_directory_link_not_s_length 20 #define F_status_directory_not_s_length 15 #define F_status_directory_open_s_length 16 + #define F_status_directory_open_not_s_length 20 #define F_status_directory_purge_s_length 17 + #define F_status_directory_purge_not_s_length 21 #define F_status_directory_read_s_length 16 + #define F_status_directory_read_not_s_length 20 #define F_status_directory_stream_s_length 18 + #define F_status_directory_stream_not_s_length 22 + #define F_status_directory_support_s_length 19 #define F_status_directory_support_not_s_length 23 #define F_status_directory_synchronize_s_length 23 + #define F_status_directory_synchronize_not_s_length 27 #define F_status_directory_utf_s_length 15 #define F_status_directory_utf_not_s_length 19 #define F_status_directory_write_s_length 17 + #define F_status_directory_write_not_s_length 21 #define F_status_disable_s_length 9 #define F_status_disable_not_s_length 13 #define F_status_discard_s_length 9 @@ -1858,24 +1880,35 @@ extern "C" { extern const f_string_static_t f_status_device_not_s; extern const f_string_static_t f_status_directory_s; extern const f_string_static_t f_status_directory_close_s; - extern const f_string_static_t f_status_directory_closed_s; + extern const f_string_static_t f_status_directory_close_not_s; extern const f_string_static_t f_status_directory_descriptor_s; + extern const f_string_static_t f_status_directory_descriptor_not_s; extern const f_string_static_t f_status_directory_empty_s; extern const f_string_static_t f_status_directory_empty_not_s; extern const f_string_static_t f_status_directory_found_s; extern const f_string_static_t f_status_directory_found_not_s; extern const f_string_static_t f_status_directory_flush_s; + extern const f_string_static_t f_status_directory_flush_not_s; + extern const f_string_static_t f_status_directory_link_s; extern const f_string_static_t f_status_directory_link_max_s; + extern const f_string_static_t f_status_directory_link_not_s; extern const f_string_static_t f_status_directory_not_s; extern const f_string_static_t f_status_directory_open_s; + extern const f_string_static_t f_status_directory_open_not_s; extern const f_string_static_t f_status_directory_purge_s; + extern const f_string_static_t f_status_directory_purge_not_s; extern const f_string_static_t f_status_directory_read_s; + extern const f_string_static_t f_status_directory_read_not_s; extern const f_string_static_t f_status_directory_stream_s; + extern const f_string_static_t f_status_directory_stream_not_s; + extern const f_string_static_t f_status_directory_support_s; extern const f_string_static_t f_status_directory_support_not_s; extern const f_string_static_t f_status_directory_synchronize_s; + extern const f_string_static_t f_status_directory_synchronize_not_s; extern const f_string_static_t f_status_directory_utf_s; extern const f_string_static_t f_status_directory_utf_not_s; extern const f_string_static_t f_status_directory_write_s; + extern const f_string_static_t f_status_directory_write_not_s; extern const f_string_static_t f_status_disable_s; extern const f_string_static_t f_status_disable_not_s; extern const f_string_static_t f_status_discard_s; diff --git a/level_0/f_status_string/tests/unit/c/test-status_string-to.c b/level_0/f_status_string/tests/unit/c/test-status_string-to.c index 1913177..c5f2415 100644 --- a/level_0/f_status_string/tests/unit/c/test-status_string-to.c +++ b/level_0/f_status_string/tests/unit/c/test-status_string-to.c @@ -272,24 +272,35 @@ void test__f_status_string_to__works(void **state) { F_device_not, F_directory, F_directory_close, - F_directory_closed, + F_directory_close_not, F_directory_descriptor, + F_directory_descriptor_not, F_directory_empty, F_directory_empty_not, F_directory_found, F_directory_found_not, F_directory_flush, + F_directory_flush_not, + F_directory_link, F_directory_link_max, + F_directory_link_not, F_directory_not, F_directory_open, + F_directory_open_not, F_directory_purge, + F_directory_purge_not, F_directory_read, + F_directory_read_not, F_directory_stream, + F_directory_stream_not, + F_directory_support, F_directory_support_not, F_directory_synchronize, + F_directory_synchronize_not, F_directory_utf, F_directory_utf_not, F_directory_write, + F_directory_write_not, F_disable, F_disable_not, F_discard, @@ -1067,24 +1078,35 @@ void test__f_status_string_to__works(void **state) { f_status_device_not_s, f_status_directory_s, f_status_directory_close_s, - f_status_directory_closed_s, + f_status_directory_close_not_s, f_status_directory_descriptor_s, + f_status_directory_descriptor_not_s, f_status_directory_empty_s, f_status_directory_empty_not_s, f_status_directory_found_s, f_status_directory_found_not_s, f_status_directory_flush_s, + f_status_directory_flush_not_s, + f_status_directory_link_s, f_status_directory_link_max_s, + f_status_directory_link_not_s, f_status_directory_not_s, f_status_directory_open_s, + f_status_directory_open_not_s, f_status_directory_purge_s, + f_status_directory_purge_not_s, f_status_directory_read_s, + f_status_directory_read_not_s, f_status_directory_stream_s, + f_status_directory_stream_not_s, + f_status_directory_support_s, f_status_directory_support_not_s, f_status_directory_synchronize_s, + f_status_directory_synchronize_not_s, f_status_directory_utf_s, f_status_directory_utf_not_s, f_status_directory_write_s, + f_status_directory_write_not_s, f_status_disable_s, f_status_disable_not_s, f_status_discard_s, @@ -1622,7 +1644,7 @@ void test__f_status_string_to__works(void **state) { { uint16_t i = 0; - for (; i < 792; ++i) { + for (; i < 803; ++i) { f_string_static_t result = f_string_static_t_initialize; diff --git a/level_1/fl_directory/c/directory.h b/level_1/fl_directory/c/directory.h index e337f56..7dfbfca 100644 --- a/level_1/fl_directory/c/directory.h +++ b/level_1/fl_directory/c/directory.h @@ -65,7 +65,7 @@ extern "C" { * F_directory_found on success, but the directory already exists. * * F_access_denied (with error bit) on access denied. - * F_directory (with error bit) if a supposed directory in path is not actually a directory. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_directory_link_max (with error bit) max links limit reached or exceeded. * F_file_found (with error bit) of a directory aleady exists at the path. * F_file_found_not (with error bit) if a file within the path is not found (such as a broken symbolic link). @@ -152,7 +152,7 @@ extern "C" { * F_okay on success. * F_data_not if source.used or destination.used is 0. * - * F_directory_descriptor (with error bit) on directory file descriptor error. + * F_directory_descriptor_not (with error bit) on directory file descriptor error. * F_directory_not (with error bit) if the directory does not exist. * F_directory_open (with error bit) on directory open error. * F_directory_stream (with error bit) on directory stream error. @@ -229,9 +229,9 @@ extern "C" { * F_data_not if source.used or destination.used is 0. * F_directory_empty if directory is empty. * - * F_directory (with error bit) if the path is not a directory. - * F_directory_descriptor (with error bit) on directory file descriptor error. + * F_directory_descriptor_not (with error bit) on directory file descriptor error. * F_directory_found_not (with error bit) if there is not file at the path. + * F_directory_not (with error bit) if the path is not a directory. * F_directory_open (with error bit) on directory open error. * F_directory_stream (with error bit) on directory stream error. * F_directory_support_not (with error bit) on directory file descriptor not supported. diff --git a/level_1/fl_directory/c/private-directory.c b/level_1/fl_directory/c/private-directory.c index e79b255..8f2da9d 100644 --- a/level_1/fl_directory/c/private-directory.c +++ b/level_1/fl_directory/c/private-directory.c @@ -224,7 +224,7 @@ extern "C" { if (errno == ENOMEM) return F_status_set_error(F_memory_not); if (errno == EMFILE) return F_status_set_error(F_file_descriptor_max); if (errno == ENFILE) return F_status_set_error(F_file_open_max); - if (errno == ENOTDIR) return F_status_set_error(F_directory); + if (errno == ENOTDIR) return F_status_set_error(F_directory_not); if (errno == ENOENT) return F_status_set_error(F_directory_found_not); if (errno == EACCES) return F_status_set_error(F_access_denied); @@ -243,7 +243,7 @@ extern "C" { if (err == EINVAL) return F_status_set_error(F_directory_stream); if (err == ENOTSUP) return F_status_set_error(F_directory_support_not); - return F_status_set_error(F_directory_descriptor); + return F_status_set_error(F_directory_descriptor_not); } const size_t length = scandir(path.string, &entity, filter, sort); diff --git a/level_1/fl_directory/c/private-directory.h b/level_1/fl_directory/c/private-directory.h index 4f0de69..b686082 100644 --- a/level_1/fl_directory/c/private-directory.h +++ b/level_1/fl_directory/c/private-directory.h @@ -106,7 +106,8 @@ extern "C" { * F_okay on success. * F_data_not if directory is empty. * - * F_directory_descriptor (with error bit) on directory file descriptor error. + * F_directory_descriptor_not (with error bit) on directory file descriptor error. + * F_directory_not (with error bit) if a supposed directory in path is not actually a directory. * F_directory_open (with error bit) on directory open error. * F_directory_stream (with error bit) on directory stream error. * F_directory_support_not (with error bit) on directory file descriptor not supported. diff --git a/level_1/fl_status_string/c/status_string.c b/level_1/fl_status_string/c/status_string.c index 59fc5e4..80befa6 100644 --- a/level_1/fl_status_string/c/status_string.c +++ b/level_1/fl_status_string/c/status_string.c @@ -1489,8 +1489,8 @@ extern "C" { return F_okay; } - if (f_compare_dynamic(name, f_status_directory_closed_s) == F_equal_to) { - *code = F_directory_closed; + if (f_compare_dynamic(name, f_status_directory_close_not_s) == F_equal_to) { + *code = F_directory_close_not; return F_okay; } @@ -1501,6 +1501,12 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_directory_descriptor_not_s) == F_equal_to) { + *code = F_directory_descriptor_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_empty_s) == F_equal_to) { *code = F_directory_empty; @@ -1531,12 +1537,30 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_directory_flush_not_s) == F_equal_to) { + *code = F_directory_flush_not; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_directory_link_s) == F_equal_to) { + *code = F_directory_link; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_link_max_s) == F_equal_to) { *code = F_directory_link_max; return F_okay; } + if (f_compare_dynamic(name, f_status_directory_link_not_s) == F_equal_to) { + *code = F_directory_link_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_not_s) == F_equal_to) { *code = F_directory_not; @@ -1549,24 +1573,54 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_directory_open_not_s) == F_equal_to) { + *code = F_directory_open_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_purge_s) == F_equal_to) { *code = F_directory_purge; return F_okay; } + if (f_compare_dynamic(name, f_status_directory_purge_not_s) == F_equal_to) { + *code = F_directory_purge_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_read_s) == F_equal_to) { *code = F_directory_read; return F_okay; } + if (f_compare_dynamic(name, f_status_directory_read_not_s) == F_equal_to) { + *code = F_directory_read_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_stream_s) == F_equal_to) { *code = F_directory_stream; return F_okay; } + if (f_compare_dynamic(name, f_status_directory_stream_not_s) == F_equal_to) { + *code = F_directory_stream_not; + + return F_okay; + } + + if (f_compare_dynamic(name, f_status_directory_support_s) == F_equal_to) { + *code = F_directory_support; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_support_not_s) == F_equal_to) { *code = F_directory_support_not; @@ -1579,6 +1633,12 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_directory_synchronize_not_s) == F_equal_to) { + *code = F_directory_synchronize_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_directory_utf_s) == F_equal_to) { *code = F_directory_utf; @@ -1597,6 +1657,12 @@ extern "C" { return F_okay; } + if (f_compare_dynamic(name, f_status_directory_write_not_s) == F_equal_to) { + *code = F_directory_write_not; + + return F_okay; + } + if (f_compare_dynamic(name, f_status_disable_s) == F_equal_to) { *code = F_disable; diff --git a/level_1/fl_status_string/tests/unit/c/test-status_string-from.c b/level_1/fl_status_string/tests/unit/c/test-status_string-from.c index 8e47680..9498d29 100644 --- a/level_1/fl_status_string/tests/unit/c/test-status_string-from.c +++ b/level_1/fl_status_string/tests/unit/c/test-status_string-from.c @@ -288,24 +288,35 @@ void test__fl_status_string_from__works(void **state) { F_device_not, F_directory, F_directory_close, - F_directory_closed, + F_directory_close_not, F_directory_descriptor, + F_directory_descriptor_not, F_directory_empty, F_directory_empty_not, F_directory_found, F_directory_found_not, F_directory_flush, + F_directory_flush_not, + F_directory_link, F_directory_link_max, + F_directory_link_not, F_directory_not, F_directory_open, + F_directory_open_not, F_directory_purge, + F_directory_purge_not, F_directory_read, + F_directory_read_not, F_directory_stream, + F_directory_stream_not, + F_directory_support, F_directory_support_not, F_directory_synchronize, + F_directory_synchronize_not, F_directory_utf, F_directory_utf_not, F_directory_write, + F_directory_write_not, F_disable, F_disable_not, F_discard, @@ -1083,24 +1094,35 @@ void test__fl_status_string_from__works(void **state) { f_status_device_not_s, f_status_directory_s, f_status_directory_close_s, - f_status_directory_closed_s, + f_status_directory_close_not_s, f_status_directory_descriptor_s, + f_status_directory_descriptor_not_s, f_status_directory_empty_s, f_status_directory_empty_not_s, f_status_directory_found_s, f_status_directory_found_not_s, f_status_directory_flush_s, + f_status_directory_flush_not_s, + f_status_directory_link_s, f_status_directory_link_max_s, + f_status_directory_link_not_s, f_status_directory_not_s, f_status_directory_open_s, + f_status_directory_open_not_s, f_status_directory_purge_s, + f_status_directory_purge_not_s, f_status_directory_read_s, + f_status_directory_read_not_s, f_status_directory_stream_s, + f_status_directory_stream_not_s, + f_status_directory_support_s, f_status_directory_support_not_s, f_status_directory_synchronize_s, + f_status_directory_synchronize_not_s, f_status_directory_utf_s, f_status_directory_utf_not_s, f_status_directory_write_s, + f_status_directory_write_not_s, f_status_disable_s, f_status_disable_not_s, f_status_discard_s, @@ -1638,7 +1660,7 @@ void test__fl_status_string_from__works(void **state) { { uint16_t i = 0; - for (; i < 792; ++i) { + for (; i < 803; ++i) { f_status_t result = F_okay; diff --git a/level_2/fll_error/c/error.c b/level_2/fll_error/c/error.c index ad288dd..69d37bf 100644 --- a/level_2/fll_error/c/error.c +++ b/level_2/fll_error/c/error.c @@ -35,10 +35,14 @@ extern "C" { return private_fll_error_file_print_simple(print, name, operation, type_name, debug, macro_fll_error_s(026_user_not_allowed_owner)); } - if (status == F_directory || status == F_directory_not) { + if (status == F_directory_not) { return private_fll_error_file_print_simple(print, name, operation, type_name, debug, macro_fll_error_s(027_invalid_dir_while)); } + if (status == F_directory) { + return private_fll_error_file_print_simple(print, name, operation, type_name, debug, macro_fll_error_s(064_is_directory)); + } + if (status == F_error) { return private_fll_error_file_print_before_after_simple(print, name, operation, type_name, debug, macro_fll_error_s(028_failed_to), macro_fll_error_s(029_already_in_error)); } @@ -201,7 +205,7 @@ extern "C" { } if (type == fll_error_file_type_file_e) { - if (status == F_file_type_not_directory) { + if (status == F_directory_not) { return private_fll_error_file_print_simple(print, name, operation, type_name, debug, macro_fll_error_s(063_invalid_dir_path_while)); } diff --git a/level_2/fll_file/c/file.h b/level_2/fll_file/c/file.h index 0fd7acb..4d2576c 100644 --- a/level_2/fll_file/c/file.h +++ b/level_2/fll_file/c/file.h @@ -54,7 +54,7 @@ extern "C" { * * F_access_denied (with error bit) on access denied. * F_access_mode (with error bit) if the current user does not have access to assign the file mode. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) if file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. @@ -100,7 +100,7 @@ extern "C" { * F_access_group (with error bit) if the current user does not have access to assign the specified group. * F_access_owner (with error bit) if the current user does not have access to assign the specified owner. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) if file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. diff --git a/level_2/fll_file/c/private-file.c b/level_2/fll_file/c/private-file.c index 655a281..1fcf55f 100644 --- a/level_2/fll_file/c/private-file.c +++ b/level_2/fll_file/c/private-file.c @@ -85,7 +85,7 @@ extern "C" { if (F_status_is_error(status)) break; if (status == F_false) { - status = F_status_set_error(F_directory); + status = F_status_set_error(F_directory_not); break; } @@ -183,7 +183,7 @@ extern "C" { if (F_status_is_error(status)) break; if (status == F_false) { - status = F_status_set_error(F_directory); + status = F_status_set_error(F_directory_not); break; } diff --git a/level_2/fll_file/c/private-file.h b/level_2/fll_file/c/private-file.h index 2f36661..b511086 100644 --- a/level_2/fll_file/c/private-file.h +++ b/level_2/fll_file/c/private-file.h @@ -78,7 +78,7 @@ extern "C" { * F_access_group (with error bit) if the current user does not have access to assign the specified group. * F_access_owner (with error bit) if the current user does not have access to assign the specified owner. * F_buffer (with error bit) if the buffer is invalid. - * F_directory (with error bit) on invalid directory. + * F_directory_not (with error bit) on invalid directory. * F_file_found_not (with error bit) if file at path was not found. * F_input_output (with error bit) on I/O error. * F_loop (with error bit) on loop error. -- 1.8.3.1