Use eina_environment_tmp_get()

This commit is contained in:
Vincent Torri 2015-07-22 07:31:26 +02:00 committed by Tom Hacohen
parent 6e80c4aea1
commit 16063b8ab1
2 changed files with 7 additions and 20 deletions

View File

@ -774,11 +774,7 @@ _ecore_fps_debug_init(void)
_ecore_fps_debug_init_count++; _ecore_fps_debug_init_count++;
if (_ecore_fps_debug_init_count > 1) return; if (_ecore_fps_debug_init_count > 1) return;
#ifndef HAVE_EVIL tmp = eina_environment_tmp_get();
tmp = "/tmp";
#else
tmp = evil_tmpdir_get ();
#endif /* HAVE_EVIL */
pid = (int)getpid(); pid = (int)getpid();
snprintf(buf, sizeof(buf), "%s/.ecore_fps_debug-%i", tmp, pid); snprintf(buf, sizeof(buf), "%s/.ecore_fps_debug-%i", tmp, pid);
_ecore_fps_debug_fd = open(buf, O_CREAT | O_TRUNC | O_RDWR, 0644); _ecore_fps_debug_fd = open(buf, O_CREAT | O_TRUNC | O_RDWR, 0644);
@ -829,16 +825,11 @@ _ecore_fps_debug_shutdown(void)
if (_ecore_fps_debug_fd >= 0) if (_ecore_fps_debug_fd >= 0)
{ {
char buf[4096]; char buf[4096];
const char *tmp;
int pid; int pid;
#ifndef HAVE_EVIL
tmp = "/tmp";
#else
tmp = (char *)evil_tmpdir_get ();
#endif /* HAVE_EVIL */
pid = (int)getpid(); pid = (int)getpid();
snprintf(buf, sizeof(buf), "%s/.ecore_fps_debug-%i", tmp, pid); snprintf(buf, sizeof(buf), "%s/.ecore_fps_debug-%i",
eina_environment_tmp_get(), pid);
unlink(buf); unlink(buf);
if (_ecore_fps_runtime_mmap) if (_ecore_fps_runtime_mmap)
{ {

View File

@ -2966,17 +2966,12 @@ EAPI void
_ecore_evas_fps_debug_init(void) _ecore_evas_fps_debug_init(void)
{ {
char buf[4096]; char buf[4096];
const char *tmp;
_ecore_evas_fps_debug_init_count++; _ecore_evas_fps_debug_init_count++;
if (_ecore_evas_fps_debug_init_count > 1) return; if (_ecore_evas_fps_debug_init_count > 1) return;
#ifndef HAVE_EVIL snprintf(buf, sizeof(buf), "%s/.ecore_evas_fps_debug-%i",
tmp = "/tmp"; eina_environment_tmp_get(), (int)getpid());
#else
tmp = evil_tmpdir_get ();
#endif /* HAVE_EVIL */
snprintf(buf, sizeof(buf), "%s/.ecore_evas_fps_debug-%i", tmp, (int)getpid());
_ecore_evas_fps_debug_fd = open(buf, O_CREAT | O_TRUNC | O_RDWR, 0644); _ecore_evas_fps_debug_fd = open(buf, O_CREAT | O_TRUNC | O_RDWR, 0644);
if (_ecore_evas_fps_debug_fd < 0) if (_ecore_evas_fps_debug_fd < 0)
{ {
@ -3026,7 +3021,8 @@ _ecore_evas_fps_debug_shutdown(void)
{ {
char buf[4096]; char buf[4096];
snprintf(buf, sizeof(buf), "/tmp/.ecore_evas_fps_debug-%i", (int)getpid()); snprintf(buf, sizeof(buf), "%s/.ecore_evas_fps_debug-%i",
eina_environment_tmp_get(), (int)getpid());
unlink(buf); unlink(buf);
if (_ecore_evas_fps_rendertime_mmap) if (_ecore_evas_fps_rendertime_mmap)
{ {