Global: uses typed enums

This commit is contained in:
Carter Li
2026-07-10 16:35:46 +08:00
committed by 李通洲
parent f8908b9a36
commit 873454191f
32 changed files with 45 additions and 61 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ typedef struct FFTempValue {
double value;
} FFTempValue;
enum FFTempType {
enum FFTempType: uint8_t {
FF_TEMP_CPU_X64,
FF_TEMP_CPU_M1X,
FF_TEMP_CPU_M2X,
+1 -1
View File
@@ -10,7 +10,7 @@ typedef struct FFArgBuffer {
uint32_t length;
} FFArgBuffer;
typedef enum FF_A_PACKED FFArgType {
typedef enum FFArgType: uint8_t {
FF_ARG_TYPE_NULL = 0,
FF_ARG_TYPE_UINT,
FF_ARG_TYPE_UINT64,
+1 -1
View File
@@ -2,7 +2,7 @@
#include "common/FFstrbuf.h"
typedef enum FF_A_PACKED FFDataResultDocType {
typedef enum FFDataResultDocType: uint8_t {
FF_RESULT_DOC_TYPE_DEFAULT = 0,
FF_RESULT_DOC_TYPE_JSON,
FF_RESULT_DOC_TYPE_CONFIG,
+1 -2
View File
@@ -169,11 +169,10 @@ FF_A_NONNULL(2, 3) static inline bool ffReadFileBufferRelative(FFNativeFD dfd, c
return ffAppendFileBufferRelative(dfd, fileName, buffer);
}
typedef enum FF_A_PACKED FFPathType {
typedef enum FFPathType: uint8_t {
FF_PATHTYPE_FILE = 1 << 0,
FF_PATHTYPE_DIRECTORY = 1 << 1,
FF_PATHTYPE_ANY = FF_PATHTYPE_FILE | FF_PATHTYPE_DIRECTORY,
FF_PATHTYPE_FORCE_UNSIGNED = UINT8_MAX,
} FFPathType;
FF_A_NONNULL(1) static inline bool ffPathExists(const char* path, FFPathType pathType) {
+1 -1
View File
@@ -7,7 +7,7 @@
#include <netinet/in.h>
#endif
typedef enum FF_A_PACKED FFNetifDefaultRouteResultStatus {
typedef enum FFNetifDefaultRouteResultStatus: uint8_t {
FF_NETIF_UNINITIALIZED,
FF_NETIF_INVALID,
FF_NETIF_OK
+1 -2
View File
@@ -36,7 +36,7 @@ typedef struct FFModuleBaseInfo {
FFModuleFormatArgList formatArgs;
} FFModuleBaseInfo;
typedef enum FF_A_PACKED FFModuleKeyType {
typedef enum FFModuleKeyType: uint8_t {
FF_MODULE_KEY_TYPE_NONE = 0,
FF_MODULE_KEY_TYPE_STRING = 1 << 0,
FF_MODULE_KEY_TYPE_ICON = 1 << 1,
@@ -47,7 +47,6 @@ typedef enum FF_A_PACKED FFModuleKeyType {
FF_MODULE_KEY_TYPE_BOTH_2 = FF_MODULE_KEY_TYPE_BOTH_0 | (2 << FF_MODULE_KEY_TYPE_SPACE_SHIFT),
FF_MODULE_KEY_TYPE_BOTH_3 = FF_MODULE_KEY_TYPE_BOTH_0 | (3 << FF_MODULE_KEY_TYPE_SPACE_SHIFT),
FF_MODULE_KEY_TYPE_BOTH_4 = FF_MODULE_KEY_TYPE_BOTH_0 | (4 << FF_MODULE_KEY_TYPE_SPACE_SHIFT),
FF_MODULE_KEY_TYPE_FORCE_UNSIGNED = UINT8_MAX,
} FFModuleKeyType;
typedef struct FFModuleArgs {
+1 -2
View File
@@ -4,14 +4,13 @@
#include "common/parsing.h"
#include "common/option.h"
typedef enum FF_A_PACKED FFPercentageTypeFlags {
typedef enum FFPercentageTypeFlags: uint8_t {
FF_PERCENTAGE_TYPE_NONE = 0,
FF_PERCENTAGE_TYPE_NUM_BIT = 1 << 0,
FF_PERCENTAGE_TYPE_BAR_BIT = 1 << 1,
FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT = 1 << 2,
FF_PERCENTAGE_TYPE_NUM_COLOR_BIT = 1 << 3,
FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT = 1 << 4,
FF_PERCENTAGE_TYPE_FORCE_UNSIGNED_ = UINT8_MAX,
} FFPercentageTypeFlags;
static_assert(sizeof(FFPercentageTypeFlags) == 1, "");
+1 -2
View File
@@ -3,13 +3,12 @@
#include "fastfetch.h"
#include "common/format.h"
typedef enum FF_A_PACKED FFPrintType {
typedef enum FFPrintType: uint8_t {
FF_PRINT_TYPE_DEFAULT = 0,
FF_PRINT_TYPE_NO_CUSTOM_KEY = 1 << 0, // key has been formatted outside
FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR = 1 << 1,
FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH = 1 << 2,
FF_PRINT_TYPE_NO_CUSTOM_OUTPUT_FORMAT = 1 << 3, // reserved
FF_PRINT_TYPE_FORCE_UNSIGNED = UINT8_MAX,
} FFPrintType;
void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType);
+2 -2
View File
@@ -2,10 +2,10 @@
#include "fastfetch.h"
typedef enum FF_A_PACKED FFvarianttype {
typedef enum FFvarianttype: uint8_t {
FF_VARIANT_TYPE_STRING,
FF_VARIANT_TYPE_BOOL,
FF_VARIANT_TYPE_INT
FF_VARIANT_TYPE_INT,
} FFvarianttype;
typedef union FFvariant {
+1 -2
View File
@@ -12,8 +12,7 @@ static inline void ffCleanUpSmbiosValue(FFstrbuf* value) {
// https://github.com/KunYi/DumpSMBIOS
// https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.9.0.pdf
typedef enum FF_A_PACKED FFSmbiosType // : uint8_t
{
typedef enum FFSmbiosType : uint8_t {
FF_SMBIOS_TYPE_BIOS = 0,
FF_SMBIOS_TYPE_SYSTEM_INFO = 1,
FF_SMBIOS_TYPE_BASEBOARD_INFO = 2,