From 191d98d306d48ba36d5a5a2eb3583b805a03b2c3 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Tue, 18 Mar 2025 10:56:12 -0400
Subject: Cleanup

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 src/cache/backings/file.c        |  4 +---
 src/cache/backings/file.h        |  2 +-
 src/cache/backings/file_common.c | 24 ------------------------
 src/cache/backings/file_common.h | 37 +++++++++++++++++++++++++++++++++++++
 src/cache/backings/file_mapped.c |  4 +---
 5 files changed, 40 insertions(+), 31 deletions(-)
 delete mode 100644 src/cache/backings/file_common.c
 create mode 100644 src/cache/backings/file_common.h

(limited to 'src/cache/backings')

diff --git a/src/cache/backings/file.c b/src/cache/backings/file.c
index f421623..9b905ac 100644
--- a/src/cache/backings/file.c
+++ b/src/cache/backings/file.c
@@ -1,7 +1,5 @@
-#include "../range.h"
-
 #include "file.h"
-#include "file_common.c"
+#include "file_common.h"
 
 static void file_backing_lock(struct cch_backing *backing)
 {
diff --git a/src/cache/backings/file.h b/src/cache/backings/file.h
index 9ffd650..06daac9 100644
--- a/src/cache/backings/file.h
+++ b/src/cache/backings/file.h
@@ -12,8 +12,8 @@ struct cch_backing_file {
     struct nn_file file;
     off_t size;
     union {
-        void *map; // CACHE_BACKING_MAPPED
         off_t pointer; // CACHE_BACKING_READ
+        void *map;     // CACHE_BACKING_MAPPED
     } u;
     struct nn_mutex mutex;
 };
diff --git a/src/cache/backings/file_common.c b/src/cache/backings/file_common.c
deleted file mode 100644
index e8bd2ca..0000000
--- a/src/cache/backings/file_common.c
+++ /dev/null
@@ -1,24 +0,0 @@
-static off_t file_backing_get_size_estimate(struct cch_backing *backing)
-{
-    struct cch_backing_file *file = (struct cch_backing_file *)backing;
-    nn_mutex_lock(&file->mutex);
-    off_t size = file->size;
-    nn_mutex_unlock(&file->mutex);
-    return size;
-}
-
-static bool file_open_internal(struct cch_backing_file *file, str *path, size_t size)
-{
-    s32 flags = size != 0 ? NNWT_FILE_CREATE : NNWT_FILE_READONLY;
-    if (!nn_file_open(&file->file, path, flags)) return false;
-    if (!size) {
-        file->size = file->file.size;
-        cch_backing_fill_range(&file->backing, 0, file->size);
-    } else {
-        file->size = -1;
-        if (file->file.size < size) {
-            nn_file_truncate(&file->file, size);
-        }
-    }
-    return true;
-}
diff --git a/src/cache/backings/file_common.h b/src/cache/backings/file_common.h
new file mode 100644
index 0000000..98bd420
--- /dev/null
+++ b/src/cache/backings/file_common.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "../backing.h"
+#include "../range.h"
+
+#include "file.h"
+
+AL_UNUSED_FUNCTION_PUSH
+
+static off_t file_backing_get_size_estimate(struct cch_backing *backing)
+{
+    struct cch_backing_file *file = (struct cch_backing_file *)backing;
+    nn_mutex_lock(&file->mutex);
+    off_t size = file->size;
+    nn_mutex_unlock(&file->mutex);
+    return size;
+}
+
+static bool file_open_internal(struct cch_backing_file *file, str *path, size_t size)
+{
+    s32 flags = size != 0 ? NNWT_FILE_CREATE : NNWT_FILE_READONLY;
+    if (!nn_file_open(&file->file, path, flags)) {
+        return false;
+    }
+    if (!size) {
+        file->size = file->file.size;
+        cch_backing_fill_range(&file->backing, 0, file->size);
+    } else {
+        file->size = -1;
+        if (file->file.size < size) {
+            nn_file_truncate(&file->file, size);
+        }
+    }
+    return true;
+}
+
+AL_UNUSED_FUNCTION_POP
diff --git a/src/cache/backings/file_mapped.c b/src/cache/backings/file_mapped.c
index e13d602..17620d0 100644
--- a/src/cache/backings/file_mapped.c
+++ b/src/cache/backings/file_mapped.c
@@ -1,7 +1,5 @@
-#include "../range.h"
-
 #include "file.h"
-#include "file_common.c"
+#include "file_common.h"
 
 static void file_backing_lock(struct cch_backing *backing)
 {
-- 
cgit v1.2.3-101-g0448