Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

libc/blkoutstream: Replace stream->geo.geo_sectorsize with sectorsize

Browse Source 
and sblock with sector to make the code more readable.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2024-08-19 01:06:33 +08:00
committed by archer
parent bce5dee0da
commit 9f1af300cb
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/stream/lib_blkoutstream.c
+8 -9
View File
@@ -78,7 +78,7 @@ static int blkoutstream_puts(FAR struct lib_outstream_s *self,
while (remain > 0) while (remain > 0)
{ {
size_t sblock = self->nput / sectorsize; size_t sector = self->nput / sectorsize;
size_t offset = self->nput % sectorsize; size_t offset = self->nput % sectorsize;
if (offset > 0) if (offset > 0)
@@ -93,28 +93,27 @@ static int blkoutstream_puts(FAR struct lib_outstream_s *self,
self->nput += copyin; self->nput += copyin;
remain -= copyin; remain -= copyin;
if (offset == stream->geo.geo_sectorsize) if (offset == sectorsize)
{ {
ret = inode->u.i_bops->write(inode, stream->cache, sblock, 1); ret = inode->u.i_bops->write(inode, stream->cache, sector, 1);
if (ret < 0) if (ret < 0)
{ {
return ret; return ret;
} }
} }
} }
else if (remain < stream->geo.geo_sectorsize) else if (remain < sectorsize)
{ {
memcpy(stream->cache, ptr, remain); memcpy(stream->cache, ptr, remain);
self->nput += remain; self->nput += remain;
remain = 0; remain = 0;
} }
else if (remain >= stream->geo.geo_sectorsize) else if (remain >= sectorsize)
{ {
size_t copyin = (remain / stream->geo.geo_sectorsize) * size_t copyin = (remain / sectorsize) * sectorsize;
stream->geo.geo_sectorsize;
ret = inode->u.i_bops->write(inode, ptr, sblock, ret = inode->u.i_bops->write(inode, ptr, sector,
remain / stream->geo.geo_sectorsize); remain / sectorsize);
if (ret < 0) if (ret < 0)
{ {
return ret; return ret;