From 7d79423972049b195ba26822e58e34d2d4cf5f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sosth=C3=A8ne=20Gu=C3=A9don?= <sosthene@nitrokey.com>
Date: Wed, 7 May 2025 10:32:03 +0200
Subject: [PATCH] Rename SHRINKIFCHEAP to SHRINKNONRELOCATING

---
 .github/workflows/test.yml  | 2 +-
 lfs.c                       | 6 +++---
 lfs.h                       | 2 +-
 tests/test_shrink.toml      | 4 ++--
 tests/test_superblocks.toml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0815867c..a1af9049 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -388,7 +388,7 @@ jobs:
           python3 --version
       - name: test-no-intrinsics
         run: |
-          CFLAGS="$CFLAGS -DLFS_SHRINKIFCHEAP" make test
+          CFLAGS="$CFLAGS -DLFS_SHRINKNONRELOCATING" make test
 
   # run with all trace options enabled to at least make sure these
   # all compile
diff --git a/lfs.c b/lfs.c
index 3d128ff7..14b44001 100644
--- a/lfs.c
+++ b/lfs.c
@@ -5233,7 +5233,7 @@ static int lfs_fs_gc_(lfs_t *lfs) {
 #endif
 
 #ifndef LFS_READONLY
-#ifdef LFS_SHRINKIFCHEAP
+#ifdef LFS_SHRINKNONRELOCATING
 static int lfs_shrink_checkblock(void * data, lfs_block_t block) {
     lfs_size_t threshold = *((lfs_size_t *) data);
     if (block >= threshold) {
@@ -5251,11 +5251,11 @@ static int lfs_fs_grow_(lfs_t *lfs, lfs_size_t block_count) {
     }
 
     
-#ifndef LFS_SHRINKIFCHEAP
+#ifndef LFS_SHRINKNONRELOCATING
     // shrinking is not supported
     LFS_ASSERT(block_count >= lfs->block_count);
 #endif
-#ifdef LFS_SHRINKIFCHEAP
+#ifdef LFS_SHRINKNONRELOCATING
     lfs_block_t threshold = block_count;
     err = lfs_fs_traverse_(lfs, lfs_shrink_checkblock, &threshold, true);
     if (err) {
diff --git a/lfs.h b/lfs.h
index a8e35eed..3968b5d7 100644
--- a/lfs.h
+++ b/lfs.h
@@ -766,7 +766,7 @@ int lfs_fs_gc(lfs_t *lfs);
 // Grows the filesystem to a new size, updating the superblock with the new
 // block count.
 //
-// If LFS_SHRINKIFCHEAP is defined, this function will also accept
+// If LFS_SHRINKNONRELOCATING is defined, this function will also accept
 // block_counts smaller than the current configuration, after checking
 // that none of the blocks that are being removed are in use.
 // Note that littlefs's pseudorandom block allocation means that
diff --git a/tests/test_shrink.toml b/tests/test_shrink.toml
index 47610485..6efa012c 100644
--- a/tests/test_shrink.toml
+++ b/tests/test_shrink.toml
@@ -5,7 +5,7 @@ defines.AFTER_BLOCK_COUNT = [5, 10, 15, 19]
    
 if = "AFTER_BLOCK_COUNT <= BLOCK_COUNT"
 code = '''
-#ifdef LFS_SHRINKIFCHEAP
+#ifdef LFS_SHRINKNONRELOCATING
     lfs_t lfs;
     lfs_format(&lfs, cfg) => 0;
     lfs_mount(&lfs, cfg) => 0;
@@ -30,7 +30,7 @@ defines.AFTER_BLOCK_COUNT = [5, 7, 10, 12, 15, 17, 20]
 defines.FILES_COUNT = [7, 8, 9, 10]
 if = "AFTER_BLOCK_COUNT <= BLOCK_COUNT && FILES_COUNT + 2 < BLOCK_COUNT"
 code = '''
-#ifdef LFS_SHRINKIFCHEAP
+#ifdef LFS_SHRINKNONRELOCATING
     lfs_t lfs;
     lfs_format(&lfs, cfg) => 0;
     // create FILES_COUNT files of BLOCK_SIZE - 50 bytes (to avoid inlining)
diff --git a/tests/test_superblocks.toml b/tests/test_superblocks.toml
index 188e4339..78050f13 100644
--- a/tests/test_superblocks.toml
+++ b/tests/test_superblocks.toml
@@ -531,7 +531,7 @@ defines.BLOCK_COUNT = 'ERASE_COUNT'
 defines.BLOCK_COUNT_2 = ['ERASE_COUNT/2', 'ERASE_COUNT/4', '2']
 defines.KNOWN_BLOCK_COUNT = [true, false]
 code = '''
-#ifdef LFS_SHRINKIFCHEAP
+#ifdef LFS_SHRINKNONRELOCATING
     lfs_t lfs;
     lfs_format(&lfs, cfg) => 0;