enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

Evas: Fix shadow declaration of variable 'write'. 

SVN revision: 59713
This commit is contained in:
Christopher Michael 2011-05-27 01:22:56 +00:00
parent b1181721fa
commit 6379aa55aa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/evas/src/lib/cserve/evas_cs.h
View File

@ -272,7 +272,7 @@ EAPI Mem *evas_cserve_mem_new(int size, const char *name);
EAPI void evas_cserve_mem_free(Mem *m);
// for client
EAPI Mem *evas_cserve_mem_open(int pid, int id, const char *name, int size, int write);
EAPI Mem *evas_cserve_mem_open(int pid, int id, const char *name, int size, int do_write);
EAPI void evas_cserve_mem_close(Mem *m);
// for both

8
legacy/evas/src/lib/cserve/evas_cs_mem.c
View File

@ -71,7 +71,7 @@ evas_cserve_mem_free(Mem *m)
}
EAPI Mem *
evas_cserve_mem_open(int pid, int id, const char *name, int size, int write)
evas_cserve_mem_open(int pid, int id, const char *name, int size, int do_write)
{
Mem *m;
char buf[PATH_MAX];
@ -89,7 +89,7 @@ evas_cserve_mem_open(int pid, int id, const char *name, int size, int write)
return NULL;
}
m->size = size;
if (write)
if (do_write)
m->fd = shm_open(m->name, O_RDWR, S_IRUSR | S_IWUSR);
else
m->fd = shm_open(m->name, O_RDONLY, S_IRUSR);
@ -99,8 +99,8 @@ evas_cserve_mem_open(int pid, int id, const char *name, int size, int write)
free(m);
return NULL;
}
m->write = write;
if (write)
m->write = do_write;
if (do_write)
m->data = mmap(NULL, m->size, PROT_READ | PROT_WRITE, MAP_SHARED, m->fd, 0);
else
m->data = mmap(NULL, m->size, PROT_READ, MAP_SHARED, m->fd, 0);