summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2019-01-12 00:24:51 -0800
committerSascha Hauer <s.hauer@pengutronix.de>2019-01-16 08:33:34 +0100
commit246216c24eb60d2742aec18fa875c40a905ed223 (patch)
treee51c56d9df1254b565720b2214b6697716d5033a
parent31551c89701c42f63d3f4352ed84e7842d0ba9fe (diff)
downloadbarebox-246216c24eb60d2742aec18fa875c40a905ed223.tar.gz
treewide: Introduce MAP_FAILED and replace ad-hoc constants with it
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--commands/go.c2
-rw-r--r--commands/md.c2
-rw-r--r--common/ratp/md.c2
-rw-r--r--crypto/digest.c2
-rw-r--r--fs/fs.c2
-rw-r--r--include/fs.h2
6 files changed, 7 insertions, 5 deletions
diff --git a/commands/go.c b/commands/go.c
index fb319b3..ecc2ceb 100644
--- a/commands/go.c
+++ b/commands/go.c
@@ -45,7 +45,7 @@ static int do_go(int argc, char *argv[])
}
addr = memmap(fd, PROT_READ);
- if (addr == (void *)-1) {
+ if (addr == MAP_FAILED) {
perror("memmap");
goto out;
}
diff --git a/commands/md.c b/commands/md.c
index 3e83c72..a495fc8 100644
--- a/commands/md.c
+++ b/commands/md.c
@@ -68,7 +68,7 @@ static int do_mem_md(int argc, char *argv[])
return 1;
map = memmap(fd, PROT_READ);
- if (map != (void *)-1) {
+ if (map != MAP_FAILED) {
ret = memory_display(map + start, start, size,
mode >> O_RWSIZE_SHIFT, swab);
goto out;
diff --git a/common/ratp/md.c b/common/ratp/md.c
index 9ce7e99..ce343d7 100644
--- a/common/ratp/md.c
+++ b/common/ratp/md.c
@@ -76,7 +76,7 @@ static int do_ratp_mem_md(const char *filename,
return -errno;
map = memmap(fd, PROT_READ);
- if (map != (void *)-1) {
+ if (map != MAP_FAILED) {
memcpy(output, (uint8_t *)(map + start), size);
goto out;
}
diff --git a/crypto/digest.c b/crypto/digest.c
index bc6de0b..b653fbb 100644
--- a/crypto/digest.c
+++ b/crypto/digest.c
@@ -232,7 +232,7 @@ int digest_file_window(struct digest *d, const char *filename,
}
buf = memmap(fd, PROT_READ);
- if (buf == (void *)-1) {
+ if (buf == MAP_FAILED) {
buf = xmalloc(4096);
flags = 1;
}
diff --git a/fs/fs.c b/fs/fs.c
index 625ed10..a304bf1 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -533,7 +533,7 @@ void *memmap(int fd, int flags)
{
struct fs_driver_d *fsdrv;
FILE *f;
- void *retp = (void *)-1;
+ void *retp = MAP_FAILED;
int ret;
if (check_fd(fd))
diff --git a/include/fs.h b/include/fs.h
index 181318f..f1514af 100644
--- a/include/fs.h
+++ b/include/fs.h
@@ -130,6 +130,8 @@ int protect(int fd, size_t count, loff_t offset, int prot);
int protect_file(const char *file, int prot);
void *memmap(int fd, int flags);
+#define MAP_FAILED ((void *)-1)
+
#define FILESIZE_MAX ((loff_t)-1)
#define PROT_READ 1