From 92eefe800b8038dce93546fe48e22786cc233080 Mon Sep 17 00:00:00 2001 From: Slendi Date: Fri, 1 Aug 2025 03:01:13 +0300 Subject: [PATCH] Mayhaps I overengineered versioning Signed-off-by: Slendi --- include/dcfg.h | 10 ++++------ src/dcfg.c | 9 +++------ src/meta.h | 8 -------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/include/dcfg.h b/include/dcfg.h index 4834ac6..57a8267 100644 --- a/include/dcfg.h +++ b/include/dcfg.h @@ -53,12 +53,10 @@ typedef enum dcfg_ValueKind { dcfg_ValueType_FunctionCall, } dcfg_ValueType; -typedef struct dcfg_Version { - int major; - int minor; - int patch; - char const *str; -} dcfg_Version; +typedef uint64_t dcfg_Version; +#define DCFG_GET_MAJOR(v) (((v) >> 48) & 0xFFFF) +#define DCFG_GET_MINOR(v) (((v) >> 32) & 0xFFFF) +#define DCFG_GET_PATCH(v) ((v) & 0xFFFFFFFF) dcfg_Version dcfg_get_version(void); diff --git a/src/dcfg.c b/src/dcfg.c index a700b28..786e52d 100644 --- a/src/dcfg.c +++ b/src/dcfg.c @@ -249,12 +249,9 @@ long ftell_(void *f) { return ftell(f); } dcfg_Version dcfg_get_version(void) { - return (dcfg_Version) { - .major = VERSION_MAJOR, - .minor = VERSION_MINOR, - .patch = VERSION_PATCH, - .str = VERSION_STRING, - }; + return (((uint64_t)VERSION_MAJOR & 0xFFFFULL) << 48) + | (((uint64_t)VERSION_MINOR & 0xFFFFULL) << 32) + | ((uint64_t)VERSION_PATCH & 0xFFFFFFFFULL); } dcfg_Instance *dcfg_make_instance(dcfg_InstanceCreateInfo const *create_info) diff --git a/src/meta.h b/src/meta.h index d06c7e6..58e5db4 100644 --- a/src/meta.h +++ b/src/meta.h @@ -5,12 +5,4 @@ #define VERSION_MINOR 1 #define VERSION_PATCH 0 -#define STRINGIFY(x) #x -#define TOSTRING(x) STRINGIFY(x) - -// proper version string -#define VERSION_STRING \ - TOSTRING(VERSION_MAJOR) \ - "." TOSTRING(VERSION_MINOR) "." TOSTRING(VERSION_PATCH) - #endif // META_H