From 5e633aa554fe13739d7430cc5c5accf765e68f74 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Sun, 28 Jan 2024 03:01:39 -0600 Subject: [PATCH] Switched from decimal to hexidecimal for test name suffixes This compresses a bit better, which is useful since our dbg scripts truncate into tight prefixes: - 3 decimals => 999 = <1000 - 3 hexidecimals => fff = <4096 - 4 decimals => 9999 = <10000 --- tests/test_alloc.toml | 20 +- tests/test_dirs.toml | 424 +++++++++++++++++++++--------------------- tests/test_dread.toml | 164 ++++++++-------- tests/test_files.toml | 76 ++++---- 4 files changed, 342 insertions(+), 342 deletions(-) diff --git a/tests/test_alloc.toml b/tests/test_alloc.toml index 0bf1f56d..9618ca61 100644 --- a/tests/test_alloc.toml +++ b/tests/test_alloc.toml @@ -117,14 +117,14 @@ code = ''' // create this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_mkdir(&lfs, name) => 0; } // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -145,7 +145,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -219,7 +219,7 @@ code = ''' // then check that we can read our directories after clobbering for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -238,7 +238,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -274,7 +274,7 @@ code = ''' uint32_t prng = 42; for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "file%04d", i); + sprintf(name, "file%03x", i); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { @@ -293,7 +293,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { // check with stat char name[256]; - sprintf(name, "file%04d", i); + sprintf(name, "file%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -391,7 +391,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { // check with stat char name[256]; - sprintf(name, "file%04d", i); + sprintf(name, "file%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -441,7 +441,7 @@ code = ''' uint32_t prng = 42; for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "file%04d", i); + sprintf(name, "file%03x", i); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { @@ -563,7 +563,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { // check with stat char name[256]; - sprintf(name, "file%04d", i); + sprintf(name, "file%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); diff --git a/tests/test_dirs.toml b/tests/test_dirs.toml index a268b7a7..cf88ec82 100644 --- a/tests/test_dirs.toml +++ b/tests/test_dirs.toml @@ -756,7 +756,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); @@ -772,7 +772,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -793,7 +793,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -804,7 +804,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -839,7 +839,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-1-i)); + sprintf(name, "dir%03x", (int)(N-1-i)); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); @@ -855,7 +855,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -876,7 +876,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -887,7 +887,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -922,13 +922,13 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t j = 0; j < N; j++) { - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); @@ -945,7 +945,7 @@ code = ''' // check that our mkdirs worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -954,10 +954,10 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -977,7 +977,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -988,7 +988,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1000,7 +1000,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1013,7 +1013,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1049,19 +1049,19 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t j = 0; j < N; j++) { - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t k = 0; k < N; k++) { - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); @@ -1079,7 +1079,7 @@ code = ''' // check that our mkdirs worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -1088,20 +1088,20 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "grandchild%04d", k); + sprintf(name, "grandchild%03x", k); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -1122,7 +1122,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1133,7 +1133,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1145,7 +1145,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1156,7 +1156,7 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1168,7 +1168,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "grandchild%04d", k); + sprintf(name, "grandchild%03x", k); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1183,7 +1183,7 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -1221,7 +1221,7 @@ code = ''' char name[4096]; memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); @@ -1237,11 +1237,11 @@ code = ''' // check that our mkdir worked memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", i); + sprintf(name2, "dir%03x", i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -1249,7 +1249,7 @@ code = ''' memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); lfsr_dir_t dir; lfsr_dir_open(&lfs, &dir, name) => 0; struct lfs_info info; @@ -1263,7 +1263,7 @@ code = ''' assert(info.size == 0); if (i < N-1) { char name2[256]; - sprintf(name2, "dir%04d", i+1); + sprintf(name2, "dir%03x", i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1304,8 +1304,8 @@ code = ''' uint32_t prng = SEED; for (lfs_size_t i = 0; i < N; i++) { - // choose a pseudo-random number, truncate to 4 decimals - lfs_size_t x = TEST_PRNG(&prng) % 10000; + // choose a pseudo-random number, truncate to 3 hexadecimals + lfs_size_t x = TEST_PRNG(&prng) % 0x1000; // insert into our sim for (lfs_size_t j = 0;; j++) { @@ -1326,7 +1326,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); } @@ -1342,11 +1342,11 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", sim[j]); + sprintf(name2, "dir%03x", sim[j]); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -1365,7 +1365,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "dir%04d", sim[j]); + sprintf(name, "dir%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1376,7 +1376,7 @@ code = ''' for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), sim[j]); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -3298,7 +3298,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -3314,7 +3314,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -3335,7 +3335,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3347,7 +3347,7 @@ code = ''' // now remove some number of directories for (lfs_size_t i = 0; i < N-REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_remove(&lfs, name) => 0; // remount? @@ -3362,13 +3362,13 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N-REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; } for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-REMAINING + i)); + sprintf(name, "dir%03x", (int)(N-REMAINING + i)); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -3387,7 +3387,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-REMAINING + i)); + sprintf(name, "dir%03x", (int)(N-REMAINING + i)); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3421,7 +3421,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-1-i)); + sprintf(name, "dir%03x", (int)(N-1-i)); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -3437,7 +3437,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -3458,7 +3458,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3470,7 +3470,7 @@ code = ''' // now remove some number of directories for (lfs_size_t i = 0; i < N-REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-1-i)); + sprintf(name, "dir%03x", (int)(N-1-i)); lfsr_remove(&lfs, name) => 0; // remount? @@ -3485,13 +3485,13 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N-REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-1-i)); + sprintf(name, "dir%03x", (int)(N-1-i)); struct lfs_info info; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; } for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -3510,7 +3510,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3548,13 +3548,13 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t j = 0; j < N; j++) { - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -3571,7 +3571,7 @@ code = ''' // check that our mkdirs worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -3580,10 +3580,10 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -3603,7 +3603,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3614,7 +3614,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -3626,7 +3626,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3641,7 +3641,7 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { if (i < N-REMAINING || j < N-REMAINING) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); lfsr_remove(&lfs, name) => 0; } @@ -3656,7 +3656,7 @@ code = ''' if (i < N-REMAINING) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_remove(&lfs, name) => 0; } @@ -3672,7 +3672,7 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; if (i < N-REMAINING) { lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; @@ -3684,13 +3684,13 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; if (j < N-REMAINING) { lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; } else { lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -3710,7 +3710,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-REMAINING + i)); + sprintf(name, "dir%03x", (int)(N-REMAINING + i)); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3721,7 +3721,7 @@ code = ''' for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-REMAINING + i)); + sprintf(name, "dir%03x", (int)(N-REMAINING + i)); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -3733,7 +3733,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < REMAINING; j++) { char name[256]; - sprintf(name, "child%04d", (int)(N-REMAINING + j)); + sprintf(name, "child%03x", (int)(N-REMAINING + j)); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3768,19 +3768,19 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t j = 0; j < N; j++) { - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t k = 0; k < N; k++) { - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -3798,7 +3798,7 @@ code = ''' // check that our mkdirs worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -3807,20 +3807,20 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "grandchild%04d", k); + sprintf(name, "grandchild%03x", k); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -3841,7 +3841,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3852,7 +3852,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -3864,7 +3864,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3875,7 +3875,7 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -3887,7 +3887,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "grandchild%04d", k); + sprintf(name, "grandchild%03x", k); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -3904,7 +3904,7 @@ code = ''' for (lfs_size_t k = 0; k < N; k++) { if (i < N-REMAINING || j < N-REMAINING || k < N-REMAINING) { char name[256]; - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); lfsr_remove(&lfs, name) => 0; } @@ -3919,7 +3919,7 @@ code = ''' if (i < N-REMAINING || j < N-REMAINING) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); lfsr_remove(&lfs, name) => 0; } @@ -3934,7 +3934,7 @@ code = ''' if (i < N-REMAINING) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_remove(&lfs, name) => 0; } @@ -3950,7 +3950,7 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; if (i < N-REMAINING) { lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; @@ -3962,27 +3962,27 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; if (j < N-REMAINING) { lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; } else { lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "dir%04d/child%04d/grandchild%04d", + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); struct lfs_info info; if (k < N-REMAINING) { lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; } else { lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "grandchild%04d", k); + sprintf(name, "grandchild%03x", k); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -4004,7 +4004,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-REMAINING + i)); + sprintf(name, "dir%03x", (int)(N-REMAINING + i)); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -4015,7 +4015,7 @@ code = ''' for (lfs_size_t i = 0; i < REMAINING; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-REMAINING + i)); + sprintf(name, "dir%03x", (int)(N-REMAINING + i)); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -4027,7 +4027,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < REMAINING; j++) { char name[256]; - sprintf(name, "child%04d", (int)(N-REMAINING + j)); + sprintf(name, "child%03x", (int)(N-REMAINING + j)); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -4040,7 +4040,7 @@ code = ''' for (lfs_size_t i = 0; i < REMAINING; i++) { for (lfs_size_t j = 0; j < REMAINING; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", + sprintf(name, "dir%03x/child%03x", (int)(N-REMAINING + i), (int)(N-REMAINING + j)); lfsr_dir_open(&lfs, &dir, name) => 0; @@ -4054,7 +4054,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t k = 0; k < REMAINING; k++) { char name[256]; - sprintf(name, "grandchild%04d", (int)(N-REMAINING + k)); + sprintf(name, "grandchild%03x", (int)(N-REMAINING + k)); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -4091,7 +4091,7 @@ code = ''' char name[4096]; memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -4107,11 +4107,11 @@ code = ''' // check that our mkdir worked memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", i); + sprintf(name2, "dir%03x", i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -4119,7 +4119,7 @@ code = ''' memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); lfsr_dir_t dir; lfsr_dir_open(&lfs, &dir, name) => 0; struct lfs_info info; @@ -4133,7 +4133,7 @@ code = ''' assert(info.size == 0); if (i < N-1) { char name2[256]; - sprintf(name2, "dir%04d", i+1); + sprintf(name2, "dir%03x", i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); @@ -4146,7 +4146,7 @@ code = ''' // now remove some number of directories for (lfs_size_t i = 0; i < N-REMAINING; i++) { lfsr_remove(&lfs, name) => 0; - name[strlen(name) - strlen("/dir....")] = '\0'; + name[strlen(name) - strlen("/dir...")] = '\0'; // remount? if (REMOUNT) { @@ -4160,11 +4160,11 @@ code = ''' // check that our remove worked memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < REMAINING; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", i); + sprintf(name2, "dir%03x", i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -4172,7 +4172,7 @@ code = ''' memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < REMAINING; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); lfsr_dir_t dir; lfsr_dir_open(&lfs, &dir, name) => 0; struct lfs_info info; @@ -4186,7 +4186,7 @@ code = ''' assert(info.size == 0); if (i < REMAINING-1) { char name2[256]; - sprintf(name2, "dir%04d", i+1); + sprintf(name2, "dir%03x", i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); @@ -4231,8 +4231,8 @@ code = ''' uint8_t op = TEST_PRNG(&prng) % 2; if (op == 0 || sim_size == 0) { - // choose a pseudo-random number, truncate to 4 decimals - lfs_size_t x = TEST_PRNG(&prng) % 10000; + // choose a pseudo-random number, truncate to 3 hexadecimals + lfs_size_t x = TEST_PRNG(&prng) % 0x1000; // insert into our sim for (lfs_size_t j = 0;; j++) { if (j >= sim_size || sim[j] >= x) { @@ -4252,7 +4252,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); @@ -4267,7 +4267,7 @@ code = ''' // remove this directory char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); lfsr_remove(&lfs, name) => 0; } } @@ -4283,11 +4283,11 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", sim[j]); + sprintf(name2, "dir%03x", sim[j]); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -4306,7 +4306,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "dir%04d", sim[j]); + sprintf(name, "dir%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5748,12 +5748,12 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved000" : "/mved000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -5769,7 +5769,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -5790,7 +5790,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5803,9 +5803,9 @@ code = ''' // now rename the directories for (lfs_size_t i = 0; i < N; i++) { char old_name[256]; - sprintf(old_name, "dir%04d", i); + sprintf(old_name, "dir%03x", i); char new_name[256]; - sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(new_name, "%smved%03x", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -5821,7 +5821,7 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -5841,7 +5841,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5871,12 +5871,12 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved000" : "/mved000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", (int)(N-1-i)); + sprintf(name, "dir%03x", (int)(N-1-i)); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -5892,7 +5892,7 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -5913,7 +5913,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5926,9 +5926,9 @@ code = ''' // now rename the directories for (lfs_size_t i = 0; i < N; i++) { char old_name[256]; - sprintf(old_name, "dir%04d", i); + sprintf(old_name, "dir%03x", i); char new_name[256]; - sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(new_name, "%smved%03x", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -5944,7 +5944,7 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -5964,7 +5964,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -5994,18 +5994,18 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved000" : "/mved000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t j = 0; j < N; j++) { - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -6022,7 +6022,7 @@ code = ''' // check that our mkdirs worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -6031,10 +6031,10 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6054,7 +6054,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6065,7 +6065,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6077,7 +6077,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6091,9 +6091,9 @@ code = ''' // now rename our directories for (lfs_size_t i = 0; i < N; i++) { char old_name[256]; - sprintf(old_name, "dir%04d", i); + sprintf(old_name, "dir%03x", i); char new_name[256]; - sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(new_name, "%smved%03x", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -6107,10 +6107,10 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char old_name[256]; - sprintf(old_name, "%smved%04d/child%04d", + sprintf(old_name, "%smved%03x/child%03x", ((BEFORE) ? "0" : ""), i, j); char new_name[256]; - sprintf(new_name, "%smved%04d/%schmved%04d", + sprintf(new_name, "%smved%03x/%schmved%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j); int err = lfsr_rename(&lfs, old_name, new_name); @@ -6129,7 +6129,7 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -6138,11 +6138,11 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "%smved%04d/%schmved%04d", + sprintf(name, "%smved%03x/%schmved%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); + sprintf(name, "%schmved%03x", ((BEFORE) ? "0" : ""), j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6161,7 +6161,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6172,7 +6172,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6184,7 +6184,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); + sprintf(name, "%schmved%03x", ((BEFORE) ? "0" : ""), j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6215,24 +6215,24 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved000" : "/mved000"), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t j = 0; j < N; j++) { - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); // containing this many directories for (lfs_size_t k = 0; k < N; k++) { - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -6250,7 +6250,7 @@ code = ''' // check that our mkdirs worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -6259,20 +6259,20 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "dir%04d/child%04d/grandchild%04d", i, j, k); + sprintf(name, "dir%03x/child%03x/grandchild%03x", i, j, k); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "grandchild%04d", k); + sprintf(name, "grandchild%03x", k); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6293,7 +6293,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6304,7 +6304,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6316,7 +6316,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "child%04d", j); + sprintf(name, "child%03x", j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6327,7 +6327,7 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "dir%04d/child%04d", i, j); + sprintf(name, "dir%03x/child%03x", i, j); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6339,7 +6339,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "grandchild%04d", k); + sprintf(name, "grandchild%03x", k); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6354,9 +6354,9 @@ code = ''' // now rename our directories for (lfs_size_t i = 0; i < N; i++) { char old_name[256]; - sprintf(old_name, "dir%04d", i); + sprintf(old_name, "dir%03x", i); char new_name[256]; - sprintf(new_name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(new_name, "%smved%03x", ((BEFORE) ? "0" : ""), i); int err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -6370,10 +6370,10 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char old_name[256]; - sprintf(old_name, "%smved%04d/child%04d", + sprintf(old_name, "%smved%03x/child%03x", ((BEFORE) ? "0" : ""), i, j); char new_name[256]; - sprintf(new_name, "%smved%04d/%schmved%04d", + sprintf(new_name, "%smved%03x/%schmved%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j); int err = lfsr_rename(&lfs, old_name, new_name); @@ -6389,11 +6389,11 @@ code = ''' for (lfs_size_t k = 0; k < N; k++) { char old_name[256]; - sprintf(old_name, "%smved%04d/%schmved%04d/grandchild%04d", + sprintf(old_name, "%smved%03x/%schmved%03x/grandchild%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j, k); char new_name[256]; - sprintf(new_name, "%smved%04d/%schmved%04d/%sgrmved%04d", + sprintf(new_name, "%smved%03x/%schmved%03x/%sgrmved%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j, ((BEFORE) ? "0" : ""), k); @@ -6414,7 +6414,7 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -6423,25 +6423,25 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "%smved%04d/%schmved%04d", + sprintf(name, "%smved%03x/%schmved%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); + sprintf(name, "%schmved%03x", ((BEFORE) ? "0" : ""), j); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "%smved%04d/%schmved%04d/%sgrmved%04d", + sprintf(name, "%smved%03x/%schmved%03x/%sgrmved%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j, ((BEFORE) ? "0" : ""), k); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; - sprintf(name, "%sgrmved%04d", ((BEFORE) ? "0" : ""), k); + sprintf(name, "%sgrmved%03x", ((BEFORE) ? "0" : ""), k); assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6461,7 +6461,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6472,7 +6472,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_open(&lfs, &dir, name) => 0; lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, ".") == 0); @@ -6484,7 +6484,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "%schmved%04d", ((BEFORE) ? "0" : ""), j); + sprintf(name, "%schmved%03x", ((BEFORE) ? "0" : ""), j); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6495,7 +6495,7 @@ code = ''' for (lfs_size_t j = 0; j < N; j++) { char name[256]; - sprintf(name, "%smved%04d/%schmved%04d", + sprintf(name, "%smved%03x/%schmved%03x", ((BEFORE) ? "0" : ""), i, ((BEFORE) ? "0" : ""), j); lfsr_dir_open(&lfs, &dir, name) => 0; @@ -6509,7 +6509,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t k = 0; k < N; k++) { char name[256]; - sprintf(name, "%sgrmved%04d", ((BEFORE) ? "0" : ""), k); + sprintf(name, "%sgrmved%03x", ((BEFORE) ? "0" : ""), k); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6541,13 +6541,13 @@ code = ''' // check if we have already started renaming, in case of powerloss struct lfs_info info; - err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved0000" : "/mved0000"), &info); + err = lfsr_stat(&lfs, ((BEFORE) ? "/0mved000" : "/mved000"), &info); if (err == LFS_ERR_NOENT) { // create this many directory in a sort of linked-list by nesting char name[4096]; memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -6563,11 +6563,11 @@ code = ''' // check that our mkdir worked memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", i); + sprintf(name2, "dir%03x", i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6575,7 +6575,7 @@ code = ''' memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/dir%04d", i); + sprintf(&name[strlen(name)], "/dir%03x", i); lfsr_dir_t dir; lfsr_dir_open(&lfs, &dir, name) => 0; struct lfs_info info; @@ -6589,7 +6589,7 @@ code = ''' assert(info.size == 0); if (i < N-1) { char name2[256]; - sprintf(name2, "dir%04d", i+1); + sprintf(name2, "dir%03x", i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6606,8 +6606,8 @@ code = ''' char new_name[4096]; memset(new_name, 0, sizeof(new_name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&old_name[strlen(old_name)], "/dir%04d", i); - sprintf(&new_name[strlen(new_name)], "/%smved%04d", + sprintf(&old_name[strlen(old_name)], "/dir%03x", i); + sprintf(&new_name[strlen(new_name)], "/%smved%03x", ((BEFORE) ? "0" : ""), i); err = lfsr_rename(&lfs, old_name, new_name); assert(!err || (TEST_PLS && err == LFS_ERR_NOENT)); @@ -6628,11 +6628,11 @@ code = ''' char name[4096]; memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(&name[strlen(name)], "/%smved%03x", ((BEFORE) ? "0" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name2, "%smved%03x", ((BEFORE) ? "0" : ""), i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6640,7 +6640,7 @@ code = ''' memset(name, 0, sizeof(name)); for (lfs_size_t i = 0; i < N; i++) { - sprintf(&name[strlen(name)], "/%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(&name[strlen(name)], "/%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_t dir; lfsr_dir_open(&lfs, &dir, name) => 0; struct lfs_info info; @@ -6654,7 +6654,7 @@ code = ''' assert(info.size == 0); if (i < N-1) { char name2[256]; - sprintf(name2, "%smved%04d", ((BEFORE) ? "0" : ""), i+1); + sprintf(name2, "%smved%03x", ((BEFORE) ? "0" : ""), i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6699,8 +6699,8 @@ code = ''' uint8_t op = TEST_PRNG(&prng) % 2; if (op == 0 || sim_size == 0) { - // choose a pseudo-random number, truncate to 4 decimals - lfs_size_t x = TEST_PRNG(&prng) % 10000; + // choose a pseudo-random number, truncate to 3 hexadecimals + lfs_size_t x = TEST_PRNG(&prng) % 0x1000; // insert into our sim for (lfs_size_t j = 0;; j++) { if (j >= sim_size || sim[j] >= x) { @@ -6720,7 +6720,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); @@ -6729,7 +6729,7 @@ code = ''' // number to rename to lfs_size_t j = TEST_PRNG(&prng) % sim_size; lfs_size_t x = sim[j]; - lfs_size_t y = TEST_PRNG(&prng) % 10000; + lfs_size_t y = TEST_PRNG(&prng) % 0x1000; for (lfs_size_t k = 0;; k++) { if (k >= sim_size || sim[k] >= y) { // already seen and not a noop? @@ -6756,9 +6756,9 @@ code = ''' // rename this directory char old_name[256]; - sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); char new_name[256]; - sprintf(new_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), y); + sprintf(new_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), y); lfsr_rename(&lfs, old_name, new_name) => 0; } } @@ -6774,11 +6774,11 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", sim[j]); + sprintf(name2, "dir%03x", sim[j]); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6797,7 +6797,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "dir%04d", sim[j]); + sprintf(name, "dir%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -6844,8 +6844,8 @@ code = ''' uint8_t op = TEST_PRNG(&prng) % 3; if (op == 0 || sim_size == 0) { - // choose a pseudo-random number, truncate to 4 decimals - lfs_size_t x = TEST_PRNG(&prng) % 10000; + // choose a pseudo-random number, truncate to 3 hexadecimals + lfs_size_t x = TEST_PRNG(&prng) % 0x1000; // insert into our sim for (lfs_size_t j = 0;; j++) { if (j >= sim_size || sim[j] >= x) { @@ -6865,7 +6865,7 @@ code = ''' // create a directory here char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); int err = lfsr_mkdir(&lfs, name); assert(!err || err == LFS_ERR_EXIST); @@ -6880,7 +6880,7 @@ code = ''' // remove this directory char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); lfsr_remove(&lfs, name) => 0; } else { @@ -6888,7 +6888,7 @@ code = ''' // number to rename to lfs_size_t j = TEST_PRNG(&prng) % sim_size; lfs_size_t x = sim[j]; - lfs_size_t y = TEST_PRNG(&prng) % 10000; + lfs_size_t y = TEST_PRNG(&prng) % 0x1000; for (lfs_size_t k = 0;; k++) { if (k >= sim_size || sim[k] >= y) { // already seen and not a noop? @@ -6915,9 +6915,9 @@ code = ''' // rename this directory char old_name[256]; - sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), x); + sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), x); char new_name[256]; - sprintf(new_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), y); + sprintf(new_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), y); lfsr_rename(&lfs, old_name, new_name) => 0; } } @@ -6933,11 +6933,11 @@ code = ''' // test that our directories match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), sim[j]); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", sim[j]); + sprintf(name2, "dir%03x", sim[j]); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -6956,7 +6956,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "dir%04d", sim[j]); + sprintf(name, "dir%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); diff --git a/tests/test_dread.toml b/tests/test_dread.toml index 7ba69c53..51afe6bb 100644 --- a/tests/test_dread.toml +++ b/tests/test_dread.toml @@ -22,7 +22,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -47,7 +47,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_dir_tell(&lfs, &dir) => 2 + i; char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -76,7 +76,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -98,7 +98,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_dir_tell(&lfs, &dir) => 2 + i; char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -123,7 +123,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_dir_tell(&lfs, &dir) => 2 + i; char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -153,7 +153,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -175,7 +175,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_dir_tell(&lfs, &dir) => 2 + i; char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -199,7 +199,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_dir_seek(&lfs, &dir, 2 + i) => 0; char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -351,7 +351,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -371,7 +371,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -386,7 +386,7 @@ code = ''' if (NEIGHBORS & 0x2) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "a_IplRNrPH/a_%04d", i); + sprintf(name, "a_IplRNrPH/a_%03x", i); lfsr_mkdir(&lfs, name) => 0; } } @@ -394,7 +394,7 @@ code = ''' if (NEIGHBORS & 0x1) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "f_VtoMnwRH/f_%04d", i); + sprintf(name, "f_VtoMnwRH/f_%03x", i); lfsr_mkdir(&lfs, name) => 0; } } @@ -422,7 +422,7 @@ code = ''' // we should be able to keep reading where we left off for (lfs_size_t i = I; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -467,7 +467,7 @@ code = ''' lfsr_mkdir(&lfs, "a_IplRNrPH") => 0; for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "a_IplRNrPH/a_%04d", i); + sprintf(name, "a_IplRNrPH/a_%03x", i); lfsr_mkdir(&lfs, name) => 0; } } @@ -477,7 +477,7 @@ code = ''' lfsr_mkdir(&lfs, "f_VtoMnwRH") => 0; for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "f_VtoMnwRH/f_%04d", i); + sprintf(name, "f_VtoMnwRH/f_%03x", i); lfsr_mkdir(&lfs, name) => 0; } } @@ -486,7 +486,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -506,7 +506,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -521,7 +521,7 @@ code = ''' if (NEIGHBORS & 0x2) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "a_IplRNrPH/a_%04d", i); + sprintf(name, "a_IplRNrPH/a_%03x", i); lfsr_remove(&lfs, name) => 0; } } @@ -529,7 +529,7 @@ code = ''' if (NEIGHBORS & 0x1) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "f_VtoMnwRH/f_%04d", i); + sprintf(name, "f_VtoMnwRH/f_%03x", i); lfsr_remove(&lfs, name) => 0; } } @@ -557,7 +557,7 @@ code = ''' // we should be able to keep reading where we left off for (lfs_size_t i = I; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -602,7 +602,7 @@ code = ''' lfsr_mkdir(&lfs, "a_IplRNrPH") => 0; for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "a_IplRNrPH/a_%04d", i); + sprintf(name, "a_IplRNrPH/a_%03x", i); lfsr_mkdir(&lfs, name) => 0; } } @@ -612,7 +612,7 @@ code = ''' lfsr_mkdir(&lfs, "f_VtoMnwRH") => 0; for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "f_VtoMnwRH/f_%04d", i); + sprintf(name, "f_VtoMnwRH/f_%03x", i); lfsr_mkdir(&lfs, name) => 0; } } @@ -621,7 +621,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -641,7 +641,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -656,9 +656,9 @@ code = ''' if (NEIGHBORS & 0x2) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "a_IplRNrPH/a_%04d", i); + sprintf(name, "a_IplRNrPH/a_%03x", i); char name_[256]; - sprintf(name_, "a_IplRNrPH/b_%04d", i); + sprintf(name_, "a_IplRNrPH/b_%03x", i); lfsr_rename(&lfs, name, name_) => 0; } } @@ -666,9 +666,9 @@ code = ''' if (NEIGHBORS & 0x1) { for (lfs_size_t i = 0; i < NEIGHBOR_N; i++) { char name[256]; - sprintf(name, "f_VtoMnwRH/f_%04d", i); + sprintf(name, "f_VtoMnwRH/f_%03x", i); char name_[256]; - sprintf(name_, "f_VtoMnwRH/b_%04d", i); + sprintf(name_, "f_VtoMnwRH/b_%03x", i); lfsr_rename(&lfs, name, name_) => 0; } } @@ -696,7 +696,7 @@ code = ''' // we should be able to keep reading where we left off for (lfs_size_t i = I; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -750,7 +750,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i+1); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i+1); lfsr_mkdir(&lfs, name) => 0; } @@ -770,7 +770,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i+1); + sprintf(name, "dir%03x", i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -779,7 +779,7 @@ code = ''' // make a dir at J char name[256]; - sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%03x_", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_mkdir(&lfs, name) => 0; // seek after mkdir? this tests that the internal position is @@ -796,7 +796,7 @@ code = ''' // we should be able to keep reading, though we may pick up J for (lfs_size_t i = I + ((I >= J) ? 1 : 0); i < N+1; i++) { char name[256]; - sprintf(name, "dir%04d%s", + sprintf(name, "dir%03x%s", i+1 - ((i >= J) ? 1 : 0), (i == J) ? "_" : ""); lfsr_dir_read(&lfs, &dir, &info) => 0; @@ -851,7 +851,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -871,7 +871,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -880,7 +880,7 @@ code = ''' // remove the dir at J char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_remove(&lfs, name) => 0; // seek after remove? this tests that the internal position is @@ -901,7 +901,7 @@ code = ''' } char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -962,7 +962,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -982,7 +982,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -991,9 +991,9 @@ code = ''' // rename the dir at J char old_name[256]; - sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); + sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J); char new_name[256]; - sprintf(new_name, "%s/%smved%04d", + sprintf(new_name, "%s/%smved%03x", ((PARENT == 1) ? "pricklypear" : (PARENT >= 2) ? "quiabentia" : ""), @@ -1019,7 +1019,7 @@ code = ''' } char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1078,7 +1078,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i+1); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i+1); lfsr_mkdir(&lfs, name) => 0; } @@ -1098,7 +1098,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i+1); + sprintf(name, "dir%03x", i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1107,11 +1107,11 @@ code = ''' // make a dir at J char name[256]; - sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%03x_", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_mkdir(&lfs, name) => 0; // make a dir at K - sprintf(name, "%s/dir%04d_", ((PARENT) ? "pricklypear" : ""), (int)K); + sprintf(name, "%s/dir%03x_", ((PARENT) ? "pricklypear" : ""), (int)K); lfsr_mkdir(&lfs, name) => 0; // seek after mkdir? this tests that the internal position is @@ -1130,7 +1130,7 @@ code = ''' i < N+2; i++) { char name[256]; - sprintf(name, "dir%04d%s", + sprintf(name, "dir%03x%s", i+1 - (i >= J + ((J >= K) ? 1 : 0) ? 1 : 0) - (i >= K + ((K >= J) ? 1 : 0) ? 1 : 0), (i == J + ((J > K) ? 1 : 0) || i == K + ((K > J) ? 1 : 0) @@ -1191,7 +1191,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -1211,7 +1211,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1220,11 +1220,11 @@ code = ''' // remove the dir at J char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J); lfsr_remove(&lfs, name) => 0; // remove the dir at K - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)K); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)K); lfsr_remove(&lfs, name) => 0; // seek after remove? this tests that the internal position is @@ -1245,7 +1245,7 @@ code = ''' } char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1310,7 +1310,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); lfsr_mkdir(&lfs, name) => 0; } @@ -1330,7 +1330,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1339,9 +1339,9 @@ code = ''' // rename the dir at J char old_name[256]; - sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)J); + sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)J); char new_name[256]; - sprintf(new_name, "%s/%smved%04d", + sprintf(new_name, "%s/%smved%03x", ((PARENT == 1) ? "pricklypear" : (PARENT >= 2) ? "quiabentia" : ""), @@ -1350,8 +1350,8 @@ code = ''' lfsr_rename(&lfs, old_name, new_name) => 0; // rename the dir at K - sprintf(old_name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), (int)K); - sprintf(new_name, "%s/%smved%04d", + sprintf(old_name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), (int)K); + sprintf(new_name, "%s/%smved%03x", ((PARENT == 1) ? "pricklypear" : (PARENT >= 2) ? "quiabentia" : ""), @@ -1377,7 +1377,7 @@ code = ''' } char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1425,7 +1425,7 @@ code = ''' // create our directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "pricklypear/dir%04d", i+1); + sprintf(name, "pricklypear/dir%03x", i+1); lfsr_mkdir(&lfs, name) => 0; } @@ -1445,7 +1445,7 @@ code = ''' // read until I for (lfs_size_t i = 0; i < I; i++) { char name[256]; - sprintf(name, "dir%04d", i+1); + sprintf(name, "dir%03x", i+1); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1455,7 +1455,7 @@ code = ''' // remove the directory for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "pricklypear/dir%04d", i+1); + sprintf(name, "pricklypear/dir%03x", i+1); lfsr_remove(&lfs, name) => 0; } lfsr_remove(&lfs, "pricklypear") => 0; @@ -1515,7 +1515,7 @@ code = ''' // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -1523,11 +1523,11 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", i); + sprintf(name2, "dir%03x", i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -1546,7 +1546,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1567,7 +1567,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1594,7 +1594,7 @@ code = ''' // check that our removes worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; } @@ -1655,19 +1655,19 @@ code = ''' struct lfs_info info; err = lfsr_stat(&lfs, ((PARENT == 1) ? ((BEFORE) - ? "pricklypear/0mved0000" - : "pricklypear/mved0000") + ? "pricklypear/0mved000" + : "pricklypear/mved000") : (PARENT >= 2) ? ((BEFORE) - ? "quiabentia/0mved0000" - : "quiabentia/mved0000") + ? "quiabentia/0mved000" + : "quiabentia/mved000") : ((BEFORE) - ? "/0mved0000" - : "/mved0000")), &info); + ? "/0mved000" + : "/mved000")), &info); if (err == LFS_ERR_NOENT) { // make this many directories for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); err = lfsr_mkdir(&lfs, name); assert(!err || (TEST_PLS && err == LFS_ERR_EXIST)); } @@ -1675,11 +1675,11 @@ code = ''' // check that our mkdir worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "dir%04d", i); + sprintf(name2, "dir%03x", i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -1698,7 +1698,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "dir%04d", i); + sprintf(name, "dir%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1762,11 +1762,11 @@ code = ''' // check that our renames worked for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%s/dir%04d", ((PARENT) ? "pricklypear" : ""), i); + sprintf(name, "%s/dir%03x", ((PARENT) ? "pricklypear" : ""), i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; - sprintf(name, "%s/%smved%04d", + sprintf(name, "%s/%smved%03x", ((PARENT == 1) ? "pricklypear" : (PARENT >= 2) ? "quiabentia" : ""), @@ -1774,7 +1774,7 @@ code = ''' i); lfsr_stat(&lfs, name, &info) => 0; char name2[256]; - sprintf(name2, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name2, "%smved%03x", ((BEFORE) ? "0" : ""), i); assert(strcmp(info.name, name2) == 0); assert(info.type == LFS_TYPE_DIR); assert(info.size == 0); @@ -1794,7 +1794,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "%smved%04d", ((BEFORE) ? "0" : ""), i); + sprintf(name, "%smved%03x", ((BEFORE) ? "0" : ""), i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_DIR); diff --git a/tests/test_files.toml b/tests/test_files.toml index c57f86eb..8593d979 100644 --- a/tests/test_files.toml +++ b/tests/test_files.toml @@ -700,7 +700,7 @@ code = ''' uint32_t prng = 42; for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { @@ -733,7 +733,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { // check with stat char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -814,7 +814,7 @@ code = ''' // create a file here char name[256]; - sprintf(name, "amethyst%04d", x); + sprintf(name, "amethyst%03x", x); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); @@ -836,7 +836,7 @@ code = ''' // check that our files match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -857,7 +857,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_REG); @@ -869,7 +869,7 @@ code = ''' // check the file contents for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_file_t file; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0; @@ -996,7 +996,7 @@ code = ''' uint32_t prng = 42; for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { @@ -1029,7 +1029,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { // check with stat char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -1053,7 +1053,7 @@ code = ''' // now remove some number of files for (lfs_size_t i = 0; i < N-REMAINING; i++) { char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); lfsr_remove(&lfs, name) => 0; // remount? @@ -1070,7 +1070,7 @@ code = ''' prng = 42; for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); // keep prng in sync uint8_t wbuf[SIZE]; @@ -1169,7 +1169,7 @@ code = ''' // create a file here char name[256]; - sprintf(name, "amethyst%04d", x); + sprintf(name, "amethyst%03x", x); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); @@ -1195,7 +1195,7 @@ code = ''' // delete this file char name[256]; - sprintf(name, "amethyst%04d", x); + sprintf(name, "amethyst%03x", x); lfsr_remove(&lfs, name) => 0; } } @@ -1209,7 +1209,7 @@ code = ''' // check that our files match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -1230,7 +1230,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_REG); @@ -1242,7 +1242,7 @@ code = ''' // check the file contents for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_file_t file; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0; @@ -1286,7 +1286,7 @@ code = ''' // create a number of directories to distance our files for (lfs_size_t i = 0; i < N; i++) { char path[256]; - sprintf(path, "basalt%04d", i); + sprintf(path, "basalt%03x", i); lfsr_mkdir(&lfs, path) => 0; } @@ -1336,7 +1336,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char path[256]; - sprintf(path, "basalt%04d", i); + sprintf(path, "basalt%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, path) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1385,7 +1385,7 @@ code = ''' // create a number of directories to distance our files for (lfs_size_t i = 0; i < N; i++) { char path[256]; - sprintf(path, "basalt%04d", i); + sprintf(path, "basalt%03x", i); lfsr_mkdir(&lfs, path) => 0; } @@ -1445,7 +1445,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t i = 0; i < N; i++) { char path[256]; - sprintf(path, "basalt%04d", i); + sprintf(path, "basalt%03x", i); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, path) == 0); assert(info.type == LFS_TYPE_DIR); @@ -1942,7 +1942,7 @@ code = ''' uint32_t prng = 42; for (lfs_size_t i = 0; i < N; i++) { char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { @@ -1975,7 +1975,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { // check with stat char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -1999,9 +1999,9 @@ code = ''' // now rename our files for (lfs_size_t i = 0; i < N; i++) { char old_name[256]; - sprintf(old_name, "amethyst%04d", i); + sprintf(old_name, "amethyst%03x", i); char new_name[256]; - sprintf(new_name, "basalt%04d", i); + sprintf(new_name, "basalt%03x", i); lfsr_rename(&lfs, old_name, new_name) => 0; @@ -2017,10 +2017,10 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { // check with stat char name[256]; - sprintf(name, "amethyst%04d", i); + sprintf(name, "amethyst%03x", i); struct lfs_info info; lfsr_stat(&lfs, name, &info) => LFS_ERR_NOENT; - sprintf(name, "basalt%04d", i); + sprintf(name, "basalt%03x", i); lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_REG); @@ -2105,7 +2105,7 @@ code = ''' // create a file here char name[256]; - sprintf(name, "amethyst%04d", x); + sprintf(name, "amethyst%03x", x); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); @@ -2166,9 +2166,9 @@ code = ''' // rename this file char old_name[256]; - sprintf(old_name, "amethyst%04d", x); + sprintf(old_name, "amethyst%03x", x); char new_name[256]; - sprintf(new_name, "amethyst%04d", y); + sprintf(new_name, "amethyst%03x", y); lfsr_rename(&lfs, old_name, new_name) => 0; } } @@ -2182,7 +2182,7 @@ code = ''' // check that our files match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -2203,7 +2203,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_REG); @@ -2215,7 +2215,7 @@ code = ''' // check the file contents for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_file_t file; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0; @@ -2299,7 +2299,7 @@ code = ''' // create a file here char name[256]; - sprintf(name, "amethyst%04d", x); + sprintf(name, "amethyst%03x", x); uint8_t wbuf[SIZE]; for (lfs_size_t j = 0; j < SIZE; j++) { wbuf[j] = 'a' + (TEST_PRNG(&wprng) % 26); @@ -2325,7 +2325,7 @@ code = ''' // delete this file char name[256]; - sprintf(name, "amethyst%04d", x); + sprintf(name, "amethyst%03x", x); lfsr_remove(&lfs, name) => 0; // renaming a file? @@ -2377,9 +2377,9 @@ code = ''' // rename this file char old_name[256]; - sprintf(old_name, "amethyst%04d", x); + sprintf(old_name, "amethyst%03x", x); char new_name[256]; - sprintf(new_name, "amethyst%04d", y); + sprintf(new_name, "amethyst%03x", y); lfsr_rename(&lfs, old_name, new_name) => 0; } } @@ -2393,7 +2393,7 @@ code = ''' // check that our files match our simulation for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); struct lfs_info info; lfsr_stat(&lfs, name, &info) => 0; assert(strcmp(info.name, name) == 0); @@ -2414,7 +2414,7 @@ code = ''' assert(info.size == 0); for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_dir_read(&lfs, &dir, &info) => 0; assert(strcmp(info.name, name) == 0); assert(info.type == LFS_TYPE_REG); @@ -2426,7 +2426,7 @@ code = ''' // check the file contents for (lfs_size_t j = 0; j < sim_size; j++) { char name[256]; - sprintf(name, "amethyst%04d", sim[j]); + sprintf(name, "amethyst%03x", sim[j]); lfsr_file_t file; lfsr_file_open(&lfs, &file, name, LFS_O_RDONLY) => 0;