From c41bdfefa613de4612240da2b88aab0996a8b8b2 Mon Sep 17 00:00:00 2001
From: Kevin Day <Kevin@kevux.org>
Date: Sun, 9 Mar 2025 17:30:39 -0500
Subject: [PATCH] Cleanup: Use uint8_t instead of bool and reduce calls to
remove() in f_directory_remove().
I am now thinking that `uint8_t` is better than `bool`.
In particular, because this allows for more flags down the road without breaking API or ABI.
Simplify the logic in `f_directory_remove()` to have only a single declaration of `remove()`.
---
level_0/f_directory/c/directory.c | 18 +++++++-----------
level_0/f_directory/c/directory.h | 8 ++++----
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/level_0/f_directory/c/directory.c b/level_0/f_directory/c/directory.c
index 87aa92c..f54a9f9 100644
--- a/level_0/f_directory/c/directory.c
+++ b/level_0/f_directory/c/directory.c
@@ -271,7 +271,7 @@ extern "C" {
#endif // _di_f_directory_list_
#ifndef _di_f_directory_open_
- f_status_t f_directory_open(const f_string_static_t path, const bool dereference, int *id) {
+ f_status_t f_directory_open(const f_string_static_t path, const uint8_t dereference, int *id) {
#ifndef _di_level_0_parameter_checking_
if (!id) return F_status_set_error(F_parameter);
#endif // _di_level_0_parameter_checking_
@@ -310,7 +310,7 @@ extern "C" {
#endif // _di_f_directory_open_
#ifndef _di_f_directory_open_at_
- f_status_t f_directory_open_at(const int at_id, const f_string_static_t path, const bool dereference, int *id) {
+ f_status_t f_directory_open_at(const int at_id, const f_string_static_t path, const uint8_t dereference, int *id) {
#ifndef _di_level_0_parameter_checking_
if (!id) return F_status_set_error(F_parameter);
#endif // _di_level_0_parameter_checking_
@@ -350,7 +350,7 @@ extern "C" {
#endif // _di_f_directory_open_at_
#ifndef _di_f_directory_remove_
- f_status_t f_directory_remove(const f_string_static_t path, const int depth_max, const bool preserve) {
+ f_status_t f_directory_remove(const f_string_static_t path, const int depth_max, const uint8_t preserve) {
#ifndef _di_level_0_parameter_checking_
if (depth_max < 0) return F_status_set_error(F_parameter);
#endif // _di_level_0_parameter_checking_
@@ -361,16 +361,12 @@ extern "C" {
if (depth_max) {
result = nftw(path.string, private_f_directory_remove_recursively, depth_max, FTW_DEPTH | FTW_PHYS);
-
- if (result == 0 && !preserve) {
- result = remove(path.string);
- }
}
- else {
- // Not recursively deleting and the path is requested to be preserved, so there is nothing to delete.
- if (preserve) return F_okay;
+ // Not recursively deleting and the path is requested to be preserved, so there is nothing to delete.
+ else if (preserve) return F_okay;
+ if (result == 0 && !preserve) {
result = remove(path.string);
}
@@ -400,7 +396,7 @@ extern "C" {
#endif // _di_f_directory_remove_
#ifndef _di_f_directory_remove_custom_
- f_status_t f_directory_remove_custom(const f_string_static_t path, const int depth_max, const bool preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *)) {
+ f_status_t f_directory_remove_custom(const f_string_static_t path, const int depth_max, const uint8_t preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *)) {
#ifndef _di_level_0_parameter_checking_
if (depth_max < 0) return F_status_set_error(F_parameter);
#endif // _di_level_0_parameter_checking_
diff --git a/level_0/f_directory/c/directory.h b/level_0/f_directory/c/directory.h
index b1ea679..585f6d6 100644
--- a/level_0/f_directory/c/directory.h
+++ b/level_0/f_directory/c/directory.h
@@ -329,7 +329,7 @@ extern "C" {
* @see open()
*/
#ifndef _di_f_directory_open_
- extern f_status_t f_directory_open(const f_string_static_t path, const bool dereference, int *id);
+ extern f_status_t f_directory_open(const f_string_static_t path, const uint8_t dereference, int *id);
#endif // _di_f_directory_open_
/**
@@ -372,7 +372,7 @@ extern "C" {
* @see openat()
*/
#ifndef _di_f_directory_open_at_
- extern f_status_t f_directory_open_at(const int at_id, const f_string_static_t path, const bool dereference, int *id);
+ extern f_status_t f_directory_open_at(const int at_id, const f_string_static_t path, const uint8_t dereference, int *id);
#endif // _di_f_directory_open_at_
/**
@@ -413,7 +413,7 @@ extern "C" {
* @see remove()
*/
#ifndef _di_f_directory_remove_
- extern f_status_t f_directory_remove(const f_string_static_t path, const int depth_max, const bool preserve);
+ extern f_status_t f_directory_remove(const f_string_static_t path, const int depth_max, const uint8_t preserve);
#endif // _di_f_directory_remove_
/**
@@ -457,7 +457,7 @@ extern "C" {
* @see remove()
*/
#ifndef _di_f_directory_remove_custom_
- extern f_status_t f_directory_remove_custom(const f_string_static_t path, const int depth_max, const bool preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *));
+ extern f_status_t f_directory_remove_custom(const f_string_static_t path, const int depth_max, const uint8_t preserve, int (*custom) (const char *, const struct stat *, int, struct FTW *));
#endif // _di_f_directory_remove_custom_
/**
--
1.8.3.1