From 636e1186f4ae2937703f41b2926b46dde27fd8f7 Mon Sep 17 00:00:00 2001 From: Peter Andersson Date: Wed, 6 Apr 2016 20:17:44 +0200 Subject: [PATCH] Let api return actual errorcodes #84 --- src/spiffs_nucleus.h | 8 ++++---- src/test/test_bugreports.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/spiffs_nucleus.h b/src/spiffs_nucleus.h index 6e4e8ac..df7a9d8 100644 --- a/src/spiffs_nucleus.h +++ b/src/spiffs_nucleus.h @@ -272,26 +272,26 @@ #define SPIFFS_API_CHECK_MOUNT(fs) \ if (!SPIFFS_CHECK_MOUNT((fs))) { \ (fs)->err_code = SPIFFS_ERR_NOT_MOUNTED; \ - return -1; \ + return SPIFFS_ERR_NOT_MOUNTED; \ } #define SPIFFS_API_CHECK_CFG(fs) \ if (!SPIFFS_CHECK_CFG((fs))) { \ (fs)->err_code = SPIFFS_ERR_NOT_CONFIGURED; \ - return -1; \ + return SPIFFS_ERR_NOT_CONFIGURED; \ } #define SPIFFS_API_CHECK_RES(fs, res) \ if ((res) < SPIFFS_OK) { \ (fs)->err_code = (res); \ - return -1; \ + return (res); \ } #define SPIFFS_API_CHECK_RES_UNLOCK(fs, res) \ if ((res) < SPIFFS_OK) { \ (fs)->err_code = (res); \ SPIFFS_UNLOCK(fs); \ - return -1; \ + return (res); \ } #define SPIFFS_VALIDATE_OBJIX(ph, objid, spix) \ diff --git a/src/test/test_bugreports.c b/src/test/test_bugreports.c index 41a2715..dd85607 100644 --- a/src/test/test_bugreports.c +++ b/src/test/test_bugreports.c @@ -57,10 +57,10 @@ TEST(nodemcu_full_fs_1) { TEST_CHECK(res == SPIFFS_OK); res2 = SPIFFS_fstat(FS, fd, &s); - TEST_CHECK(res2 == -1); + TEST_CHECK(res2 < 0); TEST_CHECK(SPIFFS_errno(FS) == SPIFFS_ERR_FILE_CLOSED); res2 = SPIFFS_stat(FS, "test1.txt", &s); - TEST_CHECK(res2 == -1); + TEST_CHECK(res2 < 0); TEST_CHECK(SPIFFS_errno(FS) == SPIFFS_ERR_NOT_FOUND); printf(" create small file\n");