PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6a693d57: Merge "Fixed warnings in libmtdutils"

Browse Source 
* commit '6a693d57687a18f8e032293b71ca98882a78c93d':
  Fixed warnings in libmtdutils
This commit is contained in:
Jean-Baptiste Queru
2012-08-23 15:54:02 -07:00
committed by Android Git Automerger
parent 8876725f05 6a693d5768
commit e630d945f9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mtdutils/mtdutils.c
View File

@@ -328,8 +328,8 @@ static int read_block(const MtdPartition *partition, int fd, char *data)
ssize_t mtd_read_data(MtdReadContext *ctx, char *data, size_t len)
{
ssize_t read = 0;
while (read < (int) len) {
size_t read = 0;
while (read < len) {
if (ctx->consumed < ctx->partition->erase_size) {
size_t avail = ctx->partition->erase_size - ctx->consumed;
size_t copy = len - read < avail ? len - read : avail;
@@ -350,7 +350,7 @@ ssize_t mtd_read_data(MtdReadContext *ctx, char *data, size_t len)
}
// Read the next block into the buffer
if (ctx->consumed == ctx->partition->erase_size && read < (int) len) {
if (ctx->consumed == ctx->partition->erase_size && read < len) {
if (read_block(ctx->partition, ctx->fd, ctx->buffer)) return -1;
ctx->consumed = 0;
}
@@ -457,7 +457,7 @@ static int write_block(MtdWriteContext *ctx, const char *data)
if (retry > 0) {
fprintf(stderr, "mtd: wrote block after %d retries\n", retry);
}
fprintf(stderr, "mtd: successfully wrote block at %llx\n", pos);
fprintf(stderr, "mtd: successfully wrote block at %lx\n", pos);
return 0; // Success!
}