From 1d1ff58aa4c54c4d262f56976924156f80957e6c Mon Sep 17 00:00:00 2001 From: CismonX Date: Sun, 2 Feb 2025 21:35:12 +0800 Subject: [PATCH] ioctl: move type definitions to common.h --- src/backend.h | 2 -- src/backend_chromium.c | 1 - src/backend_firefox.c | 1 - src/backend_util.c | 2 +- src/common.h | 38 +++++++++++++++++++++++++++++++++ src/fsck.c | 2 +- src/fsck_handler.h | 2 -- src/fsck_handler_simple.c | 1 - src/fsck_offline.c | 1 - src/fsck_util.h | 2 +- src/ioctl.h | 44 ++++++--------------------------------- 11 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/backend.h b/src/backend.h index 67a4964..ff6d19a 100644 --- a/src/backend.h +++ b/src/backend.h @@ -30,10 +30,8 @@ #ifdef BUILDING_BOOKMARKFS # include "common.h" -# include "ioctl.h" #else # include -# include #endif // backend_create() flags diff --git a/src/backend_chromium.c b/src/backend_chromium.c index 7481b54..f979fe6 100644 --- a/src/backend_chromium.c +++ b/src/backend_chromium.c @@ -49,7 +49,6 @@ #include "backend_util.h" #include "hash.h" #include "hashmap.h" -#include "ioctl.h" #include "json.h" #include "lib.h" #include "macros.h" diff --git a/src/backend_firefox.c b/src/backend_firefox.c index e4e5e8f..98bb5ed 100644 --- a/src/backend_firefox.c +++ b/src/backend_firefox.c @@ -48,7 +48,6 @@ #include "db.h" #include "hash.h" #include "hashmap.h" -#include "ioctl.h" #include "lib.h" #include "macros.h" #include "prng.h" diff --git a/src/backend_util.c b/src/backend_util.c index f8b3712..246db3d 100644 --- a/src/backend_util.c +++ b/src/backend_util.c @@ -32,7 +32,7 @@ #include -#include "ioctl.h" +#include "common.h" #include "xstd.h" int diff --git a/src/common.h b/src/common.h index dd05896..b8bb3e5 100644 --- a/src/common.h +++ b/src/common.h @@ -23,6 +23,9 @@ #ifndef BOOKMARKFS_COMMON_H_ #define BOOKMARKFS_COMMON_H_ +#include +#include + struct bookmarkfs_conf_opt { char *key; char *val; @@ -30,4 +33,39 @@ struct bookmarkfs_conf_opt { struct bookmarkfs_conf_opt *next; }; +enum bookmarkfs_fsck_result { + BOOKMARKFS_FSCK_RESULT_END = 0, // must be 0 + BOOKMARKFS_FSCK_RESULT_NAME_DUPLICATE, + BOOKMARKFS_FSCK_RESULT_NAME_BADCHAR, + BOOKMARKFS_FSCK_RESULT_NAME_BADLEN, + BOOKMARKFS_FSCK_RESULT_NAME_DOTDOT, + BOOKMARKFS_FSCK_RESULT_NAME_INVALID, +}; + +/** + * Predefined reason codes for BOOKMARKFS_FSCK_RESULT_NAME_INVALID. + */ +enum { + BOOKMARKFS_NAME_INVALID_REASON_NOTUTF8 = 256, +}; + +enum bookmarkfs_permd_op { + BOOKMARKFS_PERMD_OP_SWAP, + BOOKMARKFS_PERMD_OP_MOVE_BEFORE, + BOOKMARKFS_PERMD_OP_MOVE_AFTER, +}; + +struct bookmarkfs_fsck_data { + uint64_t id; + uint64_t extra; + char name[NAME_MAX + 1]; +}; + +struct bookmarkfs_permd_data { + enum bookmarkfs_permd_op op; + + char name1[NAME_MAX + 1]; + char name2[NAME_MAX + 1]; +}; + #endif /* !defined(BOOKMARKFS_COMMON_H_) */ diff --git a/src/fsck.c b/src/fsck.c index 04f5bae..3e8bc83 100644 --- a/src/fsck.c +++ b/src/fsck.c @@ -26,6 +26,7 @@ # include "config.h" #endif +#include #include #include #include @@ -40,7 +41,6 @@ #include "frontend_util.h" #include "fsck_handler.h" #include "fsck_ops.h" -#include "ioctl.h" #include "lib.h" #include "xstd.h" diff --git a/src/fsck_handler.h b/src/fsck_handler.h index e07091c..353ac4b 100644 --- a/src/fsck_handler.h +++ b/src/fsck_handler.h @@ -27,10 +27,8 @@ #ifdef BUILDING_BOOKMARKFS # include "common.h" -# include "ioctl.h" #else # include -# include #endif // init() flags diff --git a/src/fsck_handler_simple.c b/src/fsck_handler_simple.c index b4aa527..97c7001 100644 --- a/src/fsck_handler_simple.c +++ b/src/fsck_handler_simple.c @@ -31,7 +31,6 @@ #include "backend_util.h" #include "fsck_handler.h" #include "fsck_util.h" -#include "ioctl.h" #include "xstd.h" #define FSCK_HANDLER_EXPECT_INPUT ( 1u << 16 ) diff --git a/src/fsck_offline.c b/src/fsck_offline.c index f6f0a20..7a9976d 100644 --- a/src/fsck_offline.c +++ b/src/fsck_offline.c @@ -29,7 +29,6 @@ #include #include "fsck_ops.h" -#include "ioctl.h" #include "version.h" #include "xstd.h" diff --git a/src/fsck_util.h b/src/fsck_util.h index 1b25e25..767f703 100644 --- a/src/fsck_util.h +++ b/src/fsck_util.h @@ -25,7 +25,7 @@ #include -#include "ioctl.h" +#include "common.h" int explain_fsck_result ( diff --git a/src/ioctl.h b/src/ioctl.h index e687ed3..c1d9cdb 100644 --- a/src/ioctl.h +++ b/src/ioctl.h @@ -23,11 +23,14 @@ #ifndef BOOKMARKFS_IOCTL_H_ #define BOOKMARKFS_IOCTL_H_ -#include -#include - #include +#ifdef BUILDING_BOOKMARKFS +# include "common.h" +#else +# include +#endif + #define BOOKMARKFS_IOC_MAGIC_ 0xbf #define BOOKMARKFS_IOC_(rw, ...) _IO##rw(BOOKMARKFS_IOC_MAGIC_, __VA_ARGS__) #define BOOKMARKFS_IOC_RW_(rw, nr, name) \ @@ -38,39 +41,4 @@ #define BOOKMARKFS_IOC_FSCK_APPLY BOOKMARKFS_IOC_RW_(WR, 2, fsck) #define BOOKMARKFS_IOC_PERMD BOOKMARKFS_IOC_RW_(W, 3, permd) -enum bookmarkfs_fsck_result { - BOOKMARKFS_FSCK_RESULT_END = 0, // must be 0 - BOOKMARKFS_FSCK_RESULT_NAME_DUPLICATE, - BOOKMARKFS_FSCK_RESULT_NAME_BADCHAR, - BOOKMARKFS_FSCK_RESULT_NAME_BADLEN, - BOOKMARKFS_FSCK_RESULT_NAME_DOTDOT, - BOOKMARKFS_FSCK_RESULT_NAME_INVALID, -}; - -/** - * Predefined reason codes for BOOKMARKFS_FSCK_RESULT_NAME_INVALID. - */ -enum { - BOOKMARKFS_NAME_INVALID_REASON_NOTUTF8 = 256, -}; - -enum bookmarkfs_permd_op { - BOOKMARKFS_PERMD_OP_SWAP, - BOOKMARKFS_PERMD_OP_MOVE_BEFORE, - BOOKMARKFS_PERMD_OP_MOVE_AFTER, -}; - -struct bookmarkfs_fsck_data { - uint64_t id; - uint64_t extra; - char name[NAME_MAX + 1]; -}; - -struct bookmarkfs_permd_data { - enum bookmarkfs_permd_op op; - - char name1[NAME_MAX + 1]; - char name2[NAME_MAX + 1]; -}; - #endif /* !defined(BOOKMARKFS_IOCTL_H_) */