summaryrefslogtreecommitdiffstats
path: root/arch/sandbox/os
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2015-03-03 13:14:50 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-03-06 07:42:21 +0100
commitc265ed260d0a85c03046fa450c6a2246e0d6eb88 (patch)
treec279842e4ee285cd0cd7f836ab32b7a9918d5399 /arch/sandbox/os
parentefda5d09bb012c11f830c6fadf0de09017b1edcf (diff)
downloadbarebox-c265ed260d0a85c03046fa450c6a2246e0d6eb88.tar.gz
barebox-c265ed260d0a85c03046fa450c6a2246e0d6eb88.tar.xz
sandbox: hostfile: clarify variable names
Use "filename" for the name of the file in the host system, while "devname" for the device in the sandbox. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/sandbox/os')
-rw-r--r--arch/sandbox/os/common.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c
index cfb261acf2..e2023165d5 100644
--- a/arch/sandbox/os/common.c
+++ b/arch/sandbox/os/common.c
@@ -206,9 +206,9 @@ int linux_execve(const char * filename, char *const argv[], char *const envp[])
extern void start_barebox(void);
extern void mem_malloc_init(void *start, void *end);
-static int add_image(char *str, char *name)
+static int add_image(char *str, char *devname)
{
- char *file;
+ char *filename;
int readonly = 0, map = 1;
struct stat s;
char *opt;
@@ -218,7 +218,7 @@ static int add_image(char *str, char *name)
if (!hf)
return -1;
- file = strtok(str, ",");
+ filename = strtok(str, ",");
while ((opt = strtok(NULL, ","))) {
if (!strcmp(opt, "ro"))
readonly = 1;
@@ -226,11 +226,11 @@ static int add_image(char *str, char *name)
map = 1;
}
- printf("add file %s(%s)\n", file, readonly ? "ro" : "");
+ printf("add file %s(%s)\n", filename, readonly ? "ro" : "");
- fd = open(file, readonly ? O_RDONLY : O_RDWR);
+ fd = open(filename, readonly ? O_RDONLY : O_RDWR);
hf->fd = fd;
- hf->filename = file;
+ hf->filename = filename;
if (fd < 0) {
perror("open");
@@ -243,14 +243,14 @@ static int add_image(char *str, char *name)
}
hf->size = s.st_size;
- hf->name = strdup(name);
+ hf->devname = strdup(devname);
if (map) {
hf->base = (unsigned long)mmap(NULL, hf->size,
PROT_READ | (readonly ? 0 : PROT_WRITE),
MAP_SHARED, fd, 0);
if ((void *)hf->base == MAP_FAILED)
- printf("warning: mmapping %s failed\n", file);
+ printf("warning: mmapping %s failed\n", filename);
}
ret = barebox_register_filedev(hf);