From 680261fbb7c3c0a4cde4321c35ce3fe0e6b0cce8 Mon Sep 17 00:00:00 2001
From: Aidan MacDonald <amachronic@protonmail.com>
Date: Mon, 2 Jan 2023 19:45:59 +0000
Subject: [PATCH] buflib: Prep for multiple backend support, rename to
 buflib_mempool

Rename the current buflib implementation to buflib_mempool.

Change-Id: Iefdf74be1f7d8fcd19e6ce2289c3d1459b54d013
---
 apps/plugin.h                                   | 2 +-
 firmware/SOURCES                                | 2 +-
 firmware/{buflib.c => buflib_mempool.c}         | 2 +-
 firmware/core_alloc.c                           | 2 +-
 firmware/include/{buflib.h => buflib_mempool.h} | 6 +++---
 firmware/include/chunk_alloc.h                  | 2 +-
 firmware/include/core_alloc.h                   | 2 +-
 lib/rbcodec/test/SOURCES                        | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename firmware/{buflib.c => buflib_mempool.c} (99%)
 rename firmware/include/{buflib.h => buflib_mempool.h} (99%)

diff --git a/apps/plugin.h b/apps/plugin.h
index 850e7484d9..ea69cbe2b2 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -100,7 +100,7 @@ int plugin_open(const char *plugin, const char *parameter);
 #include "list.h"
 #include "tree.h"
 #include "color_picker.h"
-#include "buflib.h"
+#include "buflib_mempool.h"
 #include "buffering.h"
 #include "tagcache.h"
 #include "viewport.h"
diff --git a/firmware/SOURCES b/firmware/SOURCES
index fca6fdf573..c8789756aa 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -4,7 +4,7 @@
 ata_idle_notify.c
 events.c
 backlight.c
-buflib.c
+buflib_mempool.c
 core_alloc.c
 general.c
 powermgmt.c
diff --git a/firmware/buflib.c b/firmware/buflib_mempool.c
similarity index 99%
rename from firmware/buflib.c
rename to firmware/buflib_mempool.c
index cb35290c03..18e4f118ff 100644
--- a/firmware/buflib.c
+++ b/firmware/buflib_mempool.c
@@ -29,7 +29,7 @@
 #include <stdlib.h> /* for abs() */
 #include <stdio.h> /* for snprintf() */
 #include <stddef.h> /* for ptrdiff_t */
-#include "buflib.h"
+#include "buflib_mempool.h"
 #include "string-extra.h" /* strmemccpy() */
 #include "debug.h"
 #include "panic.h"
diff --git a/firmware/core_alloc.c b/firmware/core_alloc.c
index 948911b973..6f6c385597 100644
--- a/firmware/core_alloc.c
+++ b/firmware/core_alloc.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include "system.h"
 #include "core_alloc.h"
-#include "buflib.h"
+#include "buflib_mempool.h"
 
 /* not static so it can be discovered by core_get_data() */
 struct buflib_context core_ctx;
diff --git a/firmware/include/buflib.h b/firmware/include/buflib_mempool.h
similarity index 99%
rename from firmware/include/buflib.h
rename to firmware/include/buflib_mempool.h
index 49e4db11c0..61fe2168b0 100644
--- a/firmware/include/buflib.h
+++ b/firmware/include/buflib_mempool.h
@@ -23,8 +23,8 @@
 * KIND, either express or implied.
 *
 ****************************************************************************/
-#ifndef _BUFLIB_H_
-#define _BUFLIB_H_
+#ifndef _BUFLIB_MEMPOOL_H_
+#define _BUFLIB_MEMPOOL_H_
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -378,4 +378,4 @@ bool buflib_print_block_at(struct buflib_context *ctx, int block_num,
 void buflib_check_valid(struct buflib_context *ctx);
 #endif
 
-#endif /* _BUFLIB_H_ */
+#endif /* _BUFLIB_MEMPOOL_H_ */
diff --git a/firmware/include/chunk_alloc.h b/firmware/include/chunk_alloc.h
index 7d64d4b591..f589cc0870 100644
--- a/firmware/include/chunk_alloc.h
+++ b/firmware/include/chunk_alloc.h
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "config.h"
-#include "buflib.h"
+#include "buflib_mempool.h"
 
 #define CHUNK_ALLOC_INVALID ((size_t)-1)
 
diff --git a/firmware/include/core_alloc.h b/firmware/include/core_alloc.h
index 22cc1988da..382200dd75 100644
--- a/firmware/include/core_alloc.h
+++ b/firmware/include/core_alloc.h
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "config.h"
-#include "buflib.h"
+#include "buflib_mempool.h"
 #include "chunk_alloc.h"
 
 /* All functions below are wrappers for functions in buflib.h, except
diff --git a/lib/rbcodec/test/SOURCES b/lib/rbcodec/test/SOURCES
index 416bbed266..c2a3914a5e 100644
--- a/lib/rbcodec/test/SOURCES
+++ b/lib/rbcodec/test/SOURCES
@@ -5,5 +5,5 @@ warble.c
 ../../../firmware/common/structec.c
 ../../../firmware/common/pathfuncs.c
 ../../../firmware/common/crc32.c
-../../../firmware/buflib.c
+../../../firmware/buflib_mempool.c
 ../../../firmware/core_alloc.c