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

eina: Remove EAPI eina_freeq_main_set() 

I believe this function is not required and should not be
used by applications. If there is a very good use case to
use your own main freeq, then the API could be added again.

For now, removing the set() is probably the safer option.

Note: the API was introduced in the upcoming 1.19
This commit is contained in:
Jean-Philippe Andre 2017-01-17 14:07:45 +09:00
parent 3f24b6ea2f
commit ffbc0645e5
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/eina/eina_freeq.c
View File

@ -254,8 +254,7 @@ eina_freeq_type_get(Eina_FreeQ *fq)
return EINA_FREEQ_DEFAULT;
}
/* FIXME This function should not exist as an EAPI */
EAPI void
void
eina_freeq_main_set(Eina_FreeQ *fq)
{
if (!fq) return;

10
src/lib/eina/eina_freeq.h
View File

@ -149,16 +149,6 @@ eina_freeq_free(Eina_FreeQ *fq);
EAPI Eina_FreeQ_Type
eina_freeq_type_get(Eina_FreeQ *fq);
/**
* @brief Set the main free queue driven by the EFL mainloop.
*
* @param fq The free queue to set as the main loop one.
*
* @since 1.19
*/
EAPI void
eina_freeq_main_set(Eina_FreeQ *fq);
/**
* @brief Get the main loop free queue.
*

6
src/lib/eina/eina_private.h
View File

@ -138,6 +138,12 @@ void eina_cpu_count_internal(void);
void eina_file_mmap_faulty(void *addr, long page_size);
#ifndef EINA_FREEQ_H_
typedef struct _Eina_FreeQ Eina_FreeQ;
#endif
void eina_freeq_main_set(Eina_FreeQ *fq);
#include "eina_inline_private.h"
#endif /* EINA_PRIVATE_H_ */

20
src/tests/eina/eina_test_freeq.c
View File

@ -8,23 +8,25 @@
START_TEST(freeq_simple)
{
Eina_FreeQ *fq, *pfq;
Eina_FreeQ *fq;
int *p;
eina_init();
fail_if(eina_freeq_main_get() == NULL);
pfq = eina_freeq_main_get();
fail_if(eina_freeq_type_get(pfq) != EINA_FREEQ_DEFAULT);
fq = eina_freeq_main_get();
fail_if(fq == NULL);
fail_if(eina_freeq_type_get(fq) != EINA_FREEQ_DEFAULT);
p = malloc(sizeof(int));
*p = 42;
eina_freeq_ptr_main_add(p, NULL, sizeof(int));
eina_freeq_clear(fq);
fail_if(eina_freeq_ptr_pending(eina_freeq_main_get()));
fq = eina_freeq_new(EINA_FREEQ_DEFAULT);
fail_if(!fq);
eina_freeq_main_set(fq);
fail_if(eina_freeq_main_get() != fq);
eina_freeq_free(fq);
fail_if(eina_freeq_main_get() != NULL);
eina_freeq_main_set(pfq);
eina_shutdown();
}