summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Rosenberger <p.rosenberger@linutronix.de>2018-10-18 09:17:23 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-11-09 09:39:44 +0100
commit9f1db73234b40f4ea071421e8179065df16211ec (patch)
treea77a65c258a0b166397caf92899710598939af0e
parent1c80e31872aec9f2ef7eca6a52aa89c0ea759d8f (diff)
downloaddt-utils-9f1db73234b40f4ea071421e8179065df16211ec.tar.gz
dt-utils-9f1db73234b40f4ea071421e8179065df16211ec.tar.xz
Fix compiler warnings about wrong type conversion in messages.
These warning were observed with gcc-6.3 on x86-64. Signed-off-by: Philipp Rosenberger <p.rosenberger@linutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--src/barebox-state/backend_bucket_circular.c14
-rw-r--r--src/barebox-state/backend_format_dtb.c2
-rw-r--r--src/barebox-state/backend_format_raw.c2
-rw-r--r--src/barebox-state/backend_storage.c2
4 files changed, 10 insertions, 10 deletions
diff --git a/src/barebox-state/backend_bucket_circular.c b/src/barebox-state/backend_bucket_circular.c
index 135a43a..9caa994 100644
--- a/src/barebox-state/backend_bucket_circular.c
+++ b/src/barebox-state/backend_bucket_circular.c
@@ -168,13 +168,13 @@ static int state_mtd_peb_read(struct state_backend_storage_bucket_circular *circ
return ret;
}
- dev_dbg(circ->dev, "Read state from %ld length %zd\n", offset,
+ dev_dbg(circ->dev, "Read state from %ld length %d\n", offset,
len);
ret = read_full(circ->fd, buf, len);
if (ret < 0) {
- dev_err(circ->dev, "Failed to read circular storage len %zd, %d\n",
+ dev_err(circ->dev, "Failed to read circular storage len %d, %d\n",
len, ret);
free(buf);
return ret;
@@ -200,7 +200,7 @@ static int state_mtd_peb_write(struct state_backend_storage_bucket_circular *cir
ret = write_full(circ->fd, buf, len);
if (ret < 0) {
- dev_err(circ->dev, "Failed to write circular to %ld length %zd, %d\n",
+ dev_err(circ->dev, "Failed to write circular to %ld length %d, %d\n",
offset, len, ret);
return ret;
}
@@ -211,7 +211,7 @@ static int state_mtd_peb_write(struct state_backend_storage_bucket_circular *cir
*/
flush(circ->fd);
- dev_dbg(circ->dev, "Written state to offset %ld length %zd data length %zd\n",
+ dev_dbg(circ->dev, "Written state to offset %ld length %d data length %d\n",
offset, len, len);
return 0;
@@ -299,7 +299,7 @@ static int state_backend_bucket_circular_write(struct state_backend_storage_buck
void *write_buf;
if (written_length > circ->max_size) {
- dev_err(circ->dev, "Error, state data too big to be written, to write: %zd, writesize: %zd, length: %zd, available: %zd\n",
+ dev_err(circ->dev, "Error, state data too big to be written, to write: %d, writesize: %zd, length: %zd, available: %zd\n",
written_length, circ->writesize, len, circ->max_size);
return -E2BIG;
}
@@ -348,12 +348,12 @@ static int state_backend_bucket_circular_write(struct state_backend_storage_buck
ret = state_mtd_peb_write(circ, write_buf, offset, written_length);
if (ret < 0 && ret != -EUCLEAN) {
- dev_err(circ->dev, "Failed to write circular to %ld length %zd, %d\n",
+ dev_err(circ->dev, "Failed to write circular to %ld length %d, %d\n",
offset, written_length, ret);
goto out_free;
}
- dev_dbg(circ->dev, "Written state to PEB %u offset %ld length %zd data length %zd\n",
+ dev_dbg(circ->dev, "Written state to PEB %u offset %ld length %d data length %zd\n",
circ->eraseblock, offset, written_length, len);
out_free:
diff --git a/src/barebox-state/backend_format_dtb.c b/src/barebox-state/backend_format_dtb.c
index 55fa1fc..b48e97d 100644
--- a/src/barebox-state/backend_format_dtb.c
+++ b/src/barebox-state/backend_format_dtb.c
@@ -49,7 +49,7 @@ static int state_backend_format_dtb_verify(struct state_backend_format *format,
size_t len = *lenp;
if (dtb_len > len) {
- dev_err(fdtb->dev, "Error, stored DTB length (%d) longer than read buffer (%d)\n",
+ dev_err(fdtb->dev, "Error, stored DTB length (%zd) longer than read buffer (%zd)\n",
dtb_len, len);
return -EINVAL;
}
diff --git a/src/barebox-state/backend_format_raw.c b/src/barebox-state/backend_format_raw.c
index d76718c..2ba97e0 100644
--- a/src/barebox-state/backend_format_raw.c
+++ b/src/barebox-state/backend_format_raw.c
@@ -108,7 +108,7 @@ static int backend_format_raw_verify(struct state_backend_format *format,
ssize_t complete_len;
if (len < format_raw_min_length) {
- dev_err(backend_raw->dev, "Error, buffer length (%d) is shorter than the minimum required header length\n",
+ dev_err(backend_raw->dev, "Error, buffer length (%zd) is shorter than the minimum required header length\n",
len);
return -EINVAL;
}
diff --git a/src/barebox-state/backend_storage.c b/src/barebox-state/backend_storage.c
index 1052656..2c6b7d4 100644
--- a/src/barebox-state/backend_storage.c
+++ b/src/barebox-state/backend_storage.c
@@ -246,7 +246,7 @@ static int state_storage_mtd_buckets_init(struct state_backend_storage *storage,
end = meminfo->size;
if (!IS_ALIGNED(storage->offset, meminfo->erasesize)) {
- dev_err(storage->dev, "Offset within the device is not aligned to eraseblocks. Offset is %ld, erasesize %zu\n",
+ dev_err(storage->dev, "Offset within the device is not aligned to eraseblocks. Offset is %ld, erasesize %u\n",
storage->offset, meminfo->erasesize);
return -EINVAL;
}