Skip to content

Commit b708976

Browse files
committed
Squashed 'littlefs/' changes from 611c9b2..130790f
130790f Merge pull request #863 from littlefs-project/fix-conversion-warning 531d5e5 Merge pull request #855 from mdahamshi/mmd_fix e40d8f5 Merge pull request #849 from littlefs-project/fix-ci-release-no-version 5a834b6 initlize struct lfs_diskoff disk = {0} so we don't use it uninitlized in first run d775b46 Fixed integer conversion warning from Code Composer Studio 96fb8be Fixed release script breaking if there is no previous version git-subtree-dir: littlefs git-subtree-split: 130790fa915d104b5ca19524e86d9618fdcac848
1 parent 85abdf1 commit b708976

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ jobs:
8181
- name: find-prev-version
8282
continue-on-error: true
8383
run: |
84-
LFS_PREV_VERSION="$(git describe --tags --abbrev=0 --match 'v*')"
84+
LFS_PREV_VERSION="$( \
85+
git describe --tags --abbrev=0 --match 'v*' \
86+
|| true)"
8587
echo "LFS_PREV_VERSION=$LFS_PREV_VERSION"
8688
echo "LFS_PREV_VERSION=$LFS_PREV_VERSION" >> $GITHUB_ENV
8789
@@ -240,6 +242,7 @@ jobs:
240242
run: |
241243
# create release and patch version tag (vN.N.N)
242244
# only draft if not a patch release
245+
touch release.txt
243246
[ -e table.txt ] && cat table.txt >> release.txt
244247
echo >> release.txt
245248
[ -e changes.txt ] && cat changes.txt >> release.txt

lfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ static int lfs_dir_traverse(lfs_t *lfs,
877877
// iterate over directory and attrs
878878
lfs_tag_t tag;
879879
const void *buffer;
880-
struct lfs_diskoff disk;
880+
struct lfs_diskoff disk = {0};
881881
while (true) {
882882
{
883883
if (off+lfs_tag_dsize(ptag) < dir->off) {
@@ -1628,7 +1628,7 @@ static int lfs_dir_commitcrc(lfs_t *lfs, struct lfs_commit *commit) {
16281628
}
16291629

16301630
// space for fcrc?
1631-
uint8_t eperturb = -1;
1631+
uint8_t eperturb = (uint8_t)-1;
16321632
if (noff >= end && noff <= lfs->cfg->block_size - lfs->cfg->prog_size) {
16331633
// first read the leading byte, this always contains a bit
16341634
// we can perturb to avoid writes that don't change the fcrc

0 commit comments

Comments
 (0)