From 25086a5fe4f4b8a000e4ca2d184efd3ed7810c65 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 29 Mar 2016 08:50:27 +0200 Subject: [PATCH] better naming for mmap helpers Rename lxc_mmap()/lxc_munmap() to lxc_strmmap()/lxc_strmunmap(). Signed-off-by: Christian Brauner --- src/lxc/lxccontainer.c | 4 ++-- src/lxc/utils.c | 6 +++--- src/lxc/utils.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 8e2f41356..f5a44d078 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -2164,7 +2164,7 @@ static bool mod_rdep(struct lxc_container *c0, struct lxc_container *c, bool inc if (fbuf.st_size != 0) { - buf = lxc_mmap(NULL, fbuf.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + buf = lxc_strmmap(NULL, fbuf.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if (buf == MAP_FAILED) { SYSERROR("Failed to create mapping %s", path); close(fd); @@ -2177,7 +2177,7 @@ static bool mod_rdep(struct lxc_container *c0, struct lxc_container *c, bool inc bytes += len; } - lxc_munmap(buf, fbuf.st_size); + lxc_strmunmap(buf, fbuf.st_size); if (ftruncate(fd, fbuf.st_size - bytes) < 0) { SYSERROR("Failed to truncate file %s", path); close(fd); diff --git a/src/lxc/utils.c b/src/lxc/utils.c index 98ea0667d..ba20c43df 100644 --- a/src/lxc/utils.c +++ b/src/lxc/utils.c @@ -1812,8 +1812,8 @@ int lxc_count_file_lines(const char *fn) return n; } -void *lxc_mmap(void *addr, size_t length, int prot, int flags, int fd, - off_t offset) +void *lxc_strmmap(void *addr, size_t length, int prot, int flags, int fd, + off_t offset) { void *tmp = NULL, *overlap = NULL; @@ -1835,7 +1835,7 @@ out: return overlap; } -int lxc_munmap(void *addr, size_t length) +int lxc_strmunmap(void *addr, size_t length) { return munmap(addr, length + 1); } diff --git a/src/lxc/utils.h b/src/lxc/utils.h index 2c1b80fba..fbd516cf6 100644 --- a/src/lxc/utils.h +++ b/src/lxc/utils.h @@ -255,10 +255,10 @@ extern void **lxc_append_null_to_array(void **array, size_t count); /* mmap() wrapper. lxc_mmap() will take care to \0-terminate files so that * normal string-handling functions can be used on the buffer. */ -extern void *lxc_mmap(void *addr, size_t length, int prot, int flags, int fd, - off_t offset); +extern void *lxc_strmmap(void *addr, size_t length, int prot, int flags, int fd, + off_t offset); /* munmap() wrapper. Use it to free memory mmap()ed with lxc_mmap(). */ -extern int lxc_munmap(void *addr, size_t length); +extern int lxc_strmunmap(void *addr, size_t length); //initialize rand with urandom extern int randseed(bool); -- 2.47.2