From f7a270edd651700ea50c8444d0f1beac2a0f6e40 Mon Sep 17 00:00:00 2001 From: geky-bot Date: Tue, 31 Oct 2023 19:03:59 +0000 Subject: [PATCH] Squashed 'littlefs/' changes from f77214d..c733d9e c733d9e Merge pull request #884 from DvdGiessen/static-functions 8f3f32d Added -Wmissing-prototypes 92fc780 lfs_fs_raw* functions should be static git-subtree-dir: littlefs git-subtree-split: c733d9ec5776dfc949ec6dc71fa9ce3ff71de6e5 --- Makefile | 3 +++ lfs.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 24865e5..51e9f98 100644 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ CFLAGS += -fcallgraph-info=su CFLAGS += -g3 CFLAGS += -I. CFLAGS += -std=c99 -Wall -Wextra -pedantic +CFLAGS += -Wmissing-prototypes CFLAGS += -ftrack-macro-expansion=0 ifdef DEBUG CFLAGS += -O0 @@ -354,6 +355,7 @@ summary-diff sizes-diff: $(OBJ) $(CI) ## Build the test-runner .PHONY: test-runner build-test +test-runner build-test: CFLAGS+=-Wno-missing-prototypes ifndef NO_COV test-runner build-test: CFLAGS+=--coverage endif @@ -405,6 +407,7 @@ testmarks-diff: $(TEST_CSV) ## Build the bench-runner .PHONY: bench-runner build-bench +bench-runner build-bench: CFLAGS+=-Wno-missing-prototypes ifdef YES_COV bench-runner build-bench: CFLAGS+=--coverage endif diff --git a/lfs.c b/lfs.c index 0827331..aed1b07 100644 --- a/lfs.c +++ b/lfs.c @@ -4999,7 +4999,7 @@ static int lfs_fs_forceconsistency(lfs_t *lfs) { #endif #ifndef LFS_READONLY -int lfs_fs_rawmkconsistent(lfs_t *lfs) { +static int lfs_fs_rawmkconsistent(lfs_t *lfs) { // lfs_fs_forceconsistency does most of the work here int err = lfs_fs_forceconsistency(lfs); if (err) { @@ -5046,7 +5046,7 @@ static lfs_ssize_t lfs_fs_rawsize(lfs_t *lfs) { } #ifndef LFS_READONLY -int lfs_fs_rawgrow(lfs_t *lfs, lfs_size_t block_count) { +static int lfs_fs_rawgrow(lfs_t *lfs, lfs_size_t block_count) { // shrinking is not supported LFS_ASSERT(block_count >= lfs->block_count);