NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ecore_Evas (wayland): Remove goto. (don't need them, don't want them) 

;) Also, remove an extra blank line that got in there.



SVN revision: 77099
This commit is contained in:
Christopher Michael 2012-09-26 19:01:04 +00:00
parent 9177bdef75
commit a37ddfb283
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/ecore/src/lib/ecore_evas/ecore_evas_wayland_shm.c
View File

@ -962,7 +962,8 @@ _ecore_evas_wl_shm_pool_create(Ecore_Evas *ee, size_t size)
if (ftruncate(fd, size) < 0) if (ftruncate(fd, size) < 0)
{ {
ERR("Could not truncate temporary file."); ERR("Could not truncate temporary file.");
goto end; close(fd);
return;
} }
data = mmap(NULL, size, (PROT_READ | PROT_WRITE), MAP_SHARED, fd, 0); data = mmap(NULL, size, (PROT_READ | PROT_WRITE), MAP_SHARED, fd, 0);
@ -971,15 +972,13 @@ _ecore_evas_wl_shm_pool_create(Ecore_Evas *ee, size_t size)
if (data == MAP_FAILED) if (data == MAP_FAILED)
{ {
ERR("mmap of temporary file failed."); ERR("mmap of temporary file failed.");
goto end; close(fd);
return;
} }
ee->engine.wl.pool_size = size; ee->engine.wl.pool_size = size;
ee->engine.wl.pool_data = data; ee->engine.wl.pool_data = data;
ee->engine.wl.pool = wl_shm_create_pool(shm, fd, size); ee->engine.wl.pool = wl_shm_create_pool(shm, fd, size);
end:
close(fd);
} }
static void static void
@ -1009,7 +1008,6 @@ _ecore_evas_wl_buffer_new(Ecore_Evas *ee, int w, int h)
_ecore_evas_wl_buffer_free(ee); _ecore_evas_wl_buffer_free(ee);
ee->engine.wl.buffer = ee->engine.wl.buffer =
wl_shm_pool_create_buffer(ee->engine.wl.pool, 0, w, h, stride, format); wl_shm_pool_create_buffer(ee->engine.wl.pool, 0, w, h, stride, format);
} }
void void