merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.

SVN revision: 77542
This commit is contained in:
Vincent Torri 2012-10-05 20:09:47 +00:00
parent 227ef6982e
commit 7fe3d35994
60 changed files with 428 additions and 419 deletions

View File

@ -197,7 +197,7 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
#### Additional options to configure
EFL_ENABLE_LIB([eet], [yes])
EFL_ENABLE_LIB([eo], [no])
EFL_ENABLE_LIB([eo], [yes])
# Assert or fail.
@ -275,7 +275,6 @@ EFL_CHECK_PATH_MAX
AC_C_BIGENDIAN
AC_C_INLINE
EFL_ATTRIBUTE_UNUSED
# EFL_CHECK_COMPILER_FLAGS([MY_LIB], [-Wall -Wextra])
@ -1162,7 +1161,10 @@ AC_MSG_NOTICE([Eo checks])
requirements_pc_eo="eina >= 1.7.99"
PKG_CHECK_MODULES([EO], [${requirements_pc_eo}])
AC_ARG_VAR([EO_CFLAGS], [preprocessor flags for Eo])
AC_SUBST([EO_CFLAGS])
AC_ARG_VAR([EO_LIBS], [linker flags for Eo])
AC_SUBST([EO_LIBS])
# Example (evas one)

View File

@ -3,30 +3,6 @@ dnl That code is public domain and can be freely used or copied.
dnl Macros for checking if the compiler supports some __attribute__ uses
dnl Usage: EFL_ATTRIBUTE_UNUSED
dnl call AC_DEFINE for __UNUSED__ if __attribute__((unused)) is available
AC_DEFUN([EFL_ATTRIBUTE_UNUSED],
[
AC_MSG_CHECKING([for __attribute__ ((unused))])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[
void foo(int x __attribute__ ((unused))) {}
]],
[[
]])],
[have_attribute_unused="yes"],
[have_attribute_unused="no"])
AC_MSG_RESULT([${have_attribute_unused}])
if test "x${have_attribute_unused}" = "xyes" ; then
AC_DEFINE([__UNUSED__], [__attribute__ ((unused))], [Macro declaring a function argument to be unused.])
else
AC_DEFINE([__UNUSED__], [], [__attribute__ ((unused)) is not supported.])
fi
])
dnl Usage: EFL_ATTRIBUTE_VECTOR
dnl call AC_DEFINE for HAVE_GCC_ATTRIBUTE_VECTOR if __attribute__((vector)) is available

View File

@ -47,7 +47,7 @@ struct _Eina_Bench_Object
Eina_Bool keep;
};
static Eina_Bool keep(void *data, __UNUSED__ void *gdata)
static Eina_Bool keep(void *data, EINA_UNUSED void *gdata)
{
Eina_Bench_Object *bo = data;
@ -109,16 +109,16 @@ eina_bench_array_4evas_render_inline(int request)
}
static Eina_Bool
eina_iterator_ebo_free(__UNUSED__ const Eina_Array *array,
Eina_Bench_Object *ebo, __UNUSED__ void *fdata)
eina_iterator_ebo_free(EINA_UNUSED const Eina_Array *array,
Eina_Bench_Object *ebo, EINA_UNUSED void *fdata)
{
free(ebo);
return EINA_TRUE;
}
static Eina_Bool
eina_iterator_ebo_rand(__UNUSED__ const void *container,
Eina_Bench_Object *ebo, __UNUSED__ void *fdata)
eina_iterator_ebo_rand(EINA_UNUSED const void *container,
Eina_Bench_Object *ebo, EINA_UNUSED void *fdata)
{
ebo->keep = rand() < (RAND_MAX / 2) ? ebo->keep : EINA_FALSE;
return EINA_TRUE;
@ -609,7 +609,7 @@ _eina_ecore_for_each_remove(void *value, void *user_data)
}
static void
_eina_ecore_for_each_rand(void *value, __UNUSED__ void *user_data)
_eina_ecore_for_each_rand(void *value, EINA_UNUSED void *user_data)
{
Eina_Bench_Object *ebo = value;

View File

@ -52,8 +52,8 @@ _eina_string_key_length(const char *key)
}
static int
_eina_string_key_cmp(const char *key1, __UNUSED__ int key1_length,
const char *key2, __UNUSED__ int key2_length)
_eina_string_key_cmp(const char *key1, EINA_UNUSED int key1_length,
const char *key2, EINA_UNUSED int key2_length)
{
return strcmp(key1, key2);
}
@ -71,7 +71,7 @@ struct _Eina_Bench_Rbtree
static Eina_Rbtree_Direction
_eina_bench_rbtree_cmp(const Eina_Bench_Rbtree *left,
const Eina_Bench_Rbtree *right,
__UNUSED__ void *data)
EINA_UNUSED void *data)
{
if (!left)
return EINA_RBTREE_RIGHT;
@ -87,13 +87,13 @@ static inline int
_eina_bench_rbtree_key(const Eina_Bench_Rbtree *node,
const char *key,
int length,
__UNUSED__ void *data)
EINA_UNUSED void *data)
{
return strncmp(node->key, key, length);
}
static void
_eina_bench_rbtree_free(Eina_Rbtree *node, __UNUSED__ void *data)
_eina_bench_rbtree_free(Eina_Rbtree *node, EINA_UNUSED void *data)
{
free(node);
}

View File

@ -56,7 +56,7 @@ _evas_mp_pool_free(Pool *p)
}
void *
evas_mempool_malloc(Evas_Mempool *pool, int size __UNUSED__)
evas_mempool_malloc(Evas_Mempool *pool, int size EINA_UNUSED)
{
#ifdef NOPOOL
return malloc(size);

View File

@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib/eina \
-I$(top_srcdir)/src/lib/eo \
-I$(top_builddir)/src/lib/eina \
-I$(top_builddir)/src/lib/eo \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
@ -30,6 +32,8 @@ eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
if EO_BUILD_EXAMPLE_EVAS
AM_CPPFLAGS += @ELM_CFLAGS@
eo_evas_SOURCES = \
evas/evas_elw_box.c \
evas/evas_elw_box.h \

View File

@ -5,8 +5,8 @@
#include <Elementary.h>
#include "Eo.h"
#include "evas_obj.h"
#include "elw_box.h"
#include "evas_evas_obj.h"
#include "evas_elw_box.h"
EAPI Eo_Op ELW_BOX_BASE_ID = 0;

View File

@ -5,10 +5,10 @@
#include <Elementary.h>
#include "Eo.h"
#include "evas_obj.h"
#include "elw_box.h"
#include "elw_button.h"
#include "elw_boxedbutton.h"
#include "evas_evas_obj.h"
#include "evas_elw_box.h"
#include "evas_elw_button.h"
#include "evas_elw_boxedbutton.h"
typedef struct
{

View File

@ -5,8 +5,8 @@
#include <Elementary.h>
#include "Eo.h"
#include "evas_obj.h"
#include "elw_button.h"
#include "evas_evas_obj.h"
#include "evas_elw_button.h"
EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;

View File

@ -5,8 +5,8 @@
#include <Elementary.h>
#include "Eo.h"
#include "evas_obj.h"
#include "elw_win.h"
#include "evas_evas_obj.h"
#include "evas_elw_win.h"
typedef struct
{

View File

@ -5,7 +5,7 @@
#include <Elementary.h>
#include "Eo.h"
#include "evas_obj.h"
#include "evas_evas_obj.h"
#define MY_CLASS EXEVAS_OBJ_CLASS

View File

@ -4,11 +4,11 @@
#include <Elementary.h>
#include "evas_obj.h"
#include "elw_button.h"
#include "elw_box.h"
#include "elw_boxedbutton.h"
#include "elw_win.h"
#include "evas_evas_obj.h"
#include "evas_elw_button.h"
#include "evas_elw_box.h"
#include "evas_elw_boxedbutton.h"
#include "evas_elw_win.h"
Eina_Bool
_btn_clicked_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info)

View File

@ -624,7 +624,7 @@ static int _eet_data_words_bigendian = -1;
/* CHAR TYPE */
static int
eet_data_get_char(const Eet_Dictionary *ed __UNUSED__,
eet_data_get_char(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@ -642,7 +642,7 @@ eet_data_get_char(const Eet_Dictionary *ed __UNUSED__,
}
static void *
eet_data_put_char(Eet_Dictionary *ed __UNUSED__,
eet_data_put_char(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@ -661,7 +661,7 @@ eet_data_put_char(Eet_Dictionary *ed __UNUSED__,
/* SHORT TYPE */
static int
eet_data_get_short(const Eet_Dictionary *ed __UNUSED__,
eet_data_get_short(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@ -678,7 +678,7 @@ eet_data_get_short(const Eet_Dictionary *ed __UNUSED__,
}
static void *
eet_data_put_short(Eet_Dictionary *ed __UNUSED__,
eet_data_put_short(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@ -697,7 +697,7 @@ eet_data_put_short(Eet_Dictionary *ed __UNUSED__,
/* INT TYPE */
static inline int
eet_data_get_int(const Eet_Dictionary *ed __UNUSED__,
eet_data_get_int(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@ -714,7 +714,7 @@ eet_data_get_int(const Eet_Dictionary *ed __UNUSED__,
}
static void *
eet_data_put_int(Eet_Dictionary *ed __UNUSED__,
eet_data_put_int(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@ -733,7 +733,7 @@ eet_data_put_int(Eet_Dictionary *ed __UNUSED__,
/* LONG LONG TYPE */
static int
eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__,
eet_data_get_long_long(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@ -750,7 +750,7 @@ eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__,
}
static void *
eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__,
eet_data_put_long_long(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@ -863,7 +863,7 @@ eet_data_put_string(Eet_Dictionary *ed,
/* ALWAYS INLINED STRING TYPE */
static int
eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__,
eet_data_get_istring(const Eet_Dictionary *ed EINA_UNUSED,
const void *src,
const void *src_end,
void *dst)
@ -872,7 +872,7 @@ eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__,
}
static void *
eet_data_put_istring(Eet_Dictionary *ed __UNUSED__,
eet_data_put_istring(Eet_Dictionary *ed EINA_UNUSED,
const void *src,
int *size_ret)
{
@ -881,9 +881,9 @@ eet_data_put_istring(Eet_Dictionary *ed __UNUSED__,
/* ALWAYS NULL TYPE */
static int
eet_data_get_null(const Eet_Dictionary *ed __UNUSED__,
const void *src __UNUSED__,
const void *src_end __UNUSED__,
eet_data_get_null(const Eet_Dictionary *ed EINA_UNUSED,
const void *src EINA_UNUSED,
const void *src_end EINA_UNUSED,
void *dst)
{
char **d;
@ -895,8 +895,8 @@ eet_data_get_null(const Eet_Dictionary *ed __UNUSED__,
}
static void *
eet_data_put_null(Eet_Dictionary *ed __UNUSED__,
const void *src __UNUSED__,
eet_data_put_null(Eet_Dictionary *ed EINA_UNUSED,
const void *src EINA_UNUSED,
int *size_ret)
{
*size_ret = 0;
@ -1725,7 +1725,7 @@ _eet_str_direct_alloc(const char *str)
}
static void
_eet_str_direct_free(const char *str __UNUSED__)
_eet_str_direct_free(const char *str EINA_UNUSED)
{
}
@ -2512,7 +2512,7 @@ _eet_freelist_all_unref(Eet_Free_Context *freelist_context)
}
static int
eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__,
eet_data_descriptor_encode_hash_cb(void *hash EINA_UNUSED,
const char *cipher_key,
void *hdata,
void *fdata)
@ -3506,7 +3506,7 @@ eet_data_get_list(Eet_Free_Context *context,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
int group_type __UNUSED__,
int group_type EINA_UNUSED,
void *data,
char **p,
int *size)
@ -3573,7 +3573,7 @@ eet_data_get_hash(Eet_Free_Context *context,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
int group_type __UNUSED__,
int group_type EINA_UNUSED,
void *data,
char **p,
int *size)
@ -3817,7 +3817,7 @@ on_error:
static void
eet_data_put_union(Eet_Dictionary *ed,
Eet_Data_Descriptor *edd __UNUSED__,
Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)
@ -3874,7 +3874,7 @@ eet_data_put_union(Eet_Dictionary *ed,
static int
eet_data_get_union(Eet_Free_Context *context,
const Eet_Dictionary *ed,
Eet_Data_Descriptor *edd __UNUSED__,
Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
@ -3971,7 +3971,7 @@ on_error:
static void
eet_data_put_variant(Eet_Dictionary *ed,
Eet_Data_Descriptor *edd __UNUSED__,
Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)
@ -4083,11 +4083,11 @@ eet_data_put_variant(Eet_Dictionary *ed,
static int
eet_data_get_variant(Eet_Free_Context *context,
const Eet_Dictionary *ed,
Eet_Data_Descriptor *edd __UNUSED__,
Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type __UNUSED__,
int group_type __UNUSED__,
int type EINA_UNUSED,
int group_type EINA_UNUSED,
void *data,
char **p,
int *size)
@ -4279,10 +4279,10 @@ eet_data_get_unknown(Eet_Free_Context *context,
Eet_Data_Element *ede,
Eet_Data_Chunk *echnk,
int type,
int group_type __UNUSED__,
int group_type EINA_UNUSED,
void *data,
char **p __UNUSED__,
int *size __UNUSED__)
char **p EINA_UNUSED,
int *size EINA_UNUSED)
{
int ret;
void *data_ret;
@ -4390,7 +4390,7 @@ eet_data_get_unknown(Eet_Free_Context *context,
static void
eet_data_put_array(Eet_Dictionary *ed,
Eet_Data_Descriptor *edd __UNUSED__,
Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)
@ -4466,7 +4466,7 @@ eet_data_put_array(Eet_Dictionary *ed,
static void
eet_data_put_unknown(Eet_Dictionary *ed,
Eet_Data_Descriptor *edd __UNUSED__,
Eet_Data_Descriptor *edd EINA_UNUSED,
Eet_Data_Element *ede,
Eet_Data_Stream *ds,
void *data_in)

View File

@ -342,7 +342,7 @@ _JPEGFatalErrorHandler(j_common_ptr cinfo)
}
static void
_JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
_JPEGErrorHandler(j_common_ptr cinfo EINA_UNUSED)
{
/* emptr errmgr; */
@ -353,8 +353,8 @@ _JPEGErrorHandler(j_common_ptr cinfo __UNUSED__)
}
static void
_JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__,
int msg_level __UNUSED__)
_JPEGErrorHandler2(j_common_ptr cinfo EINA_UNUSED,
int msg_level EINA_UNUSED)
{
/* emptr errmgr; */

View File

@ -402,21 +402,21 @@ _eina_file_map_close(Eina_File_Map *map)
}
static unsigned int
_eina_file_map_key_length(const void *key __UNUSED__)
_eina_file_map_key_length(const void *key EINA_UNUSED)
{
return sizeof (unsigned long int) * 2;
}
static int
_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length __UNUSED__,
const unsigned long int *key2, int key2_length __UNUSED__)
_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length EINA_UNUSED,
const unsigned long int *key2, int key2_length EINA_UNUSED)
{
if (key1[0] - key2[0] == 0) return key1[1] - key2[1];
return key1[0] - key2[0];
}
static int
_eina_file_map_key_hash(const unsigned long int *key, int key_length __UNUSED__)
_eina_file_map_key_hash(const unsigned long int *key, int key_length EINA_UNUSED)
{
return eina_hash_int64(&key[0], sizeof (unsigned long int))
^ eina_hash_int64(&key[1], sizeof (unsigned long int));

View File

@ -469,21 +469,21 @@ _eina_file_map_close(Eina_File_Map *map)
}
static unsigned int
_eina_file_map_key_length(const void *key __UNUSED__)
_eina_file_map_key_length(const void *key EINA_UNUSED)
{
return sizeof (unsigned long int) * 2;
}
static int
_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length __UNUSED__,
const unsigned long int *key2, int key2_length __UNUSED__)
_eina_file_map_key_cmp(const unsigned long int *key1, int key1_length EINA_UNUSED,
const unsigned long int *key2, int key2_length EINA_UNUSED)
{
if (key1[0] - key2[0] == 0) return key1[1] - key2[1];
return key1[0] - key2[0];
}
static int
_eina_file_map_key_hash(const unsigned long int *key, int key_length __UNUSED__)
_eina_file_map_key_hash(const unsigned long int *key, int key_length EINA_UNUSED)
{
return eina_hash_int64(&key[0], sizeof (unsigned long int))
^ eina_hash_int64(&key[1], sizeof (unsigned long int));
@ -1122,18 +1122,18 @@ eina_file_filename_get(Eina_File *file)
return file->filename;
}
EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file __UNUSED__)
EAPI Eina_Iterator *eina_file_xattr_get(Eina_File *file EINA_UNUSED)
{
return NULL;
}
EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file __UNUSED__)
EAPI Eina_Iterator *eina_file_xattr_value_get(Eina_File *file EINA_UNUSED)
{
return NULL;
}
EAPI void *
eina_file_map_all(Eina_File *file, Eina_File_Populate rule __UNUSED__)
eina_file_map_all(Eina_File *file, Eina_File_Populate rule EINA_UNUSED)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(file, NULL);
@ -1342,7 +1342,7 @@ eina_file_map_faulted(Eina_File *file, void *map)
}
EAPI int
eina_file_statat(void *container __UNUSED__, Eina_File_Direct_Info *info, Eina_Stat *st)
eina_file_statat(void *container EINA_UNUSED, Eina_File_Direct_Info *info, Eina_Stat *st)
{
struct __stat64 buf;

View File

@ -156,8 +156,8 @@ struct _Eina_Hash_Each
static inline int
_eina_hash_hash_rbtree_cmp_hash(const Eina_Hash_Head *hash_head,
const int *hash,
__UNUSED__ int key_length,
__UNUSED__ void *data)
EINA_UNUSED int key_length,
EINA_UNUSED void *data)
{
return hash_head->hash - *hash;
}
@ -165,7 +165,7 @@ _eina_hash_hash_rbtree_cmp_hash(const Eina_Hash_Head *hash_head,
static Eina_Rbtree_Direction
_eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head *left,
const Eina_Hash_Head *right,
__UNUSED__ void *data)
EINA_UNUSED void *data)
{
if (left->hash - right->hash < 0)
return EINA_RBTREE_LEFT;
@ -176,7 +176,7 @@ _eina_hash_hash_rbtree_cmp_node(const Eina_Hash_Head *left,
static inline int
_eina_hash_key_rbtree_cmp_key_data(const Eina_Hash_Element *hash_element,
const Eina_Hash_Tuple *tuple,
__UNUSED__ unsigned int key_length,
EINA_UNUSED unsigned int key_length,
Eina_Key_Cmp cmp)
{
int result;
@ -307,7 +307,7 @@ on_error:
}
static Eina_Bool
_eina_hash_rbtree_each(__UNUSED__ const Eina_Rbtree *container,
_eina_hash_rbtree_each(EINA_UNUSED const Eina_Rbtree *container,
const Eina_Hash_Head *hash_head,
Eina_Hash_Each *data)
{
@ -507,41 +507,41 @@ _eina_string_key_length(const char *key)
}
static int
_eina_string_key_cmp(const char *key1, __UNUSED__ int key1_length,
const char *key2, __UNUSED__ int key2_length)
_eina_string_key_cmp(const char *key1, EINA_UNUSED int key1_length,
const char *key2, EINA_UNUSED int key2_length)
{
return strcmp(key1, key2);
}
static int
_eina_stringshared_key_cmp(const char *key1, __UNUSED__ int key1_length,
const char *key2, __UNUSED__ int key2_length)
_eina_stringshared_key_cmp(const char *key1, EINA_UNUSED int key1_length,
const char *key2, EINA_UNUSED int key2_length)
{
return key1 - key2;
}
static unsigned int
_eina_int32_key_length(__UNUSED__ const uint32_t *key)
_eina_int32_key_length(EINA_UNUSED const uint32_t *key)
{
return 4;
}
static int
_eina_int32_key_cmp(const uint32_t *key1, __UNUSED__ int key1_length,
const uint32_t *key2, __UNUSED__ int key2_length)
_eina_int32_key_cmp(const uint32_t *key1, EINA_UNUSED int key1_length,
const uint32_t *key2, EINA_UNUSED int key2_length)
{
return *key1 - *key2;
}
static unsigned int
_eina_int64_key_length(__UNUSED__ const uint32_t *key)
_eina_int64_key_length(EINA_UNUSED const uint32_t *key)
{
return 8;
}
static int
_eina_int64_key_cmp(const uint64_t *key1, __UNUSED__ int key1_length,
const uint64_t *key2, __UNUSED__ int key2_length)
_eina_int64_key_cmp(const uint64_t *key1, EINA_UNUSED int key1_length,
const uint64_t *key2, EINA_UNUSED int key2_length)
{
return *key1 - *key2;
}

View File

@ -168,7 +168,7 @@ static int _eina_list_log_dom = -1;
#define DBG(...) EINA_LOG_DOM_DBG(_eina_list_log_dom, __VA_ARGS__)
static inline Eina_List_Accounting *
_eina_list_mempool_accounting_new(__UNUSED__ Eina_List *list)
_eina_list_mempool_accounting_new(EINA_UNUSED Eina_List *list)
{
Eina_List_Accounting *tmp;
@ -192,7 +192,7 @@ _eina_list_mempool_accounting_free(Eina_List_Accounting *accounting)
}
static inline Eina_List *
_eina_list_mempool_list_new(__UNUSED__ Eina_List *list)
_eina_list_mempool_list_new(EINA_UNUSED Eina_List *list)
{
Eina_List *tmp;

View File

@ -467,9 +467,9 @@ static void
eina_log_print_prefix_NOthreads_NOcolor_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file __UNUSED__,
const char *file EINA_UNUSED,
const char *fnc,
int line __UNUSED__)
int line EINA_UNUSED)
{
DECLARE_LEVEL_NAME(level);
fprintf(fp, "%s<%u>:%s %s() ", name, eina_log_pid_get(), d->domain_str,
@ -481,7 +481,7 @@ eina_log_print_prefix_NOthreads_NOcolor_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
const char *fnc __UNUSED__,
const char *fnc EINA_UNUSED,
int line)
{
DECLARE_LEVEL_NAME(level);
@ -535,9 +535,9 @@ static void
eina_log_print_prefix_NOthreads_color_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file __UNUSED__,
const char *file EINA_UNUSED,
const char *fnc,
int line __UNUSED__)
int line EINA_UNUSED)
{
DECLARE_LEVEL_NAME_COLOR(level);
#ifdef _WIN32_WCE
@ -574,7 +574,7 @@ eina_log_print_prefix_NOthreads_color_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
const char *fnc __UNUSED__,
const char *fnc EINA_UNUSED,
int line)
{
DECLARE_LEVEL_NAME_COLOR(level);
@ -630,9 +630,9 @@ static void
eina_log_print_prefix_threads_NOcolor_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file __UNUSED__,
const char *file EINA_UNUSED,
const char *fnc,
int line __UNUSED__)
int line EINA_UNUSED)
{
Thread cur;
@ -654,7 +654,7 @@ eina_log_print_prefix_threads_NOcolor_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
const char *fnc __UNUSED__,
const char *fnc EINA_UNUSED,
int line)
{
Thread cur;
@ -752,9 +752,9 @@ static void
eina_log_print_prefix_threads_color_NOfile_func(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file __UNUSED__,
const char *file EINA_UNUSED,
const char *fnc,
int line __UNUSED__)
int line EINA_UNUSED)
{
Thread cur;
@ -822,7 +822,7 @@ eina_log_print_prefix_threads_color_file_NOfunc(FILE *fp,
const Eina_Log_Domain *d,
Eina_Log_Level level,
const char *file,
const char *fnc __UNUSED__,
const char *fnc EINA_UNUSED,
int line)
{
Thread cur;
@ -1887,7 +1887,7 @@ eina_log_print_cb_stderr(const Eina_Log_Domain *d,
const char *fnc,
int line,
const char *fmt,
__UNUSED__ void *data,
EINA_UNUSED void *data,
va_list args)
{
#ifdef EINA_ENABLE_LOG
@ -1914,7 +1914,7 @@ eina_log_print_cb_stdout(const Eina_Log_Domain *d,
const char *fnc,
int line,
const char *fmt,
__UNUSED__ void *data,
EINA_UNUSED void *data,
va_list args)
{
#ifdef EINA_ENABLE_LOG
@ -1936,7 +1936,7 @@ eina_log_print_cb_stdout(const Eina_Log_Domain *d,
EAPI void
eina_log_print_cb_file(const Eina_Log_Domain *d,
__UNUSED__ Eina_Log_Level level,
EINA_UNUSED Eina_Log_Level level,
const char *file,
const char *fnc,
int line,

View File

@ -76,9 +76,9 @@ static long _eina_mmap_pagesize = -1;
#define DBG(...) EINA_LOG_DOM_DBG(_eina_mmap_log_dom, __VA_ARGS__)
static void
_eina_mmap_safe_sigbus(int sig __UNUSED__,
_eina_mmap_safe_sigbus(int sig EINA_UNUSED,
siginfo_t *siginfo,
void *ptr __UNUSED__)
void *ptr EINA_UNUSED)
{
unsigned char *addr = (unsigned char *)(siginfo->si_addr);
int perrno;

View File

@ -2465,7 +2465,7 @@ _eina_model_interface_properties_hash_constructor(Eina_Model *model)
}
static Eina_Bool
_eina_model_interface_properties_hash_destructor_foreach(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
_eina_model_interface_properties_hash_destructor_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED)
{
eina_value_free(data);
return EINA_TRUE;
@ -2551,7 +2551,7 @@ _eina_model_interface_properties_hash_del(Eina_Model *model, const char *name)
}
static Eina_Bool
_eina_model_interface_properties_hash_names_list_foreach(const Eina_Hash *hash __UNUSED__, const void *key, void *data __UNUSED__, void *fdata)
_eina_model_interface_properties_hash_names_list_foreach(const Eina_Hash *hash EINA_UNUSED, const void *key, void *data EINA_UNUSED, void *fdata)
{
Eina_List **p_list = fdata;
*p_list = eina_list_append(*p_list, eina_stringshare_add(key));
@ -2686,7 +2686,7 @@ _eina_model_interface_properties_struct_set(Eina_Model *model, const char *name,
}
static Eina_Bool
_eina_model_interface_properties_struct_del(Eina_Model *model __UNUSED__, const char *name __UNUSED__)
_eina_model_interface_properties_struct_del(Eina_Model *model EINA_UNUSED, const char *name EINA_UNUSED)
{
return EINA_FALSE; /* not allowed */
}
@ -4888,7 +4888,7 @@ eina_model_type_subclass_check(const Eina_Model_Type *type, const Eina_Model_Typ
}
static inline const Eina_Model_Interface *
_eina_model_type_interface_get(const Eina_Model_Type *type, const char *name, Eina_Bool ptr_cmp __UNUSED__)
_eina_model_type_interface_get(const Eina_Model_Type *type, const char *name, Eina_Bool ptr_cmp EINA_UNUSED)
{
const Eina_Model_Interface **itr;

View File

@ -176,7 +176,7 @@ static unsigned int _eina_object_item_size = 0;
static int
_eina_rbtree_cmp_range(const Eina_Rbtree *node, const void *key,
__UNUSED__ int length, __UNUSED__ void *data)
EINA_UNUSED int length, EINA_UNUSED void *data)
{
Eina_Class_Range *range;
Eina_Object_ID id;
@ -192,7 +192,7 @@ _eina_rbtree_cmp_range(const Eina_Rbtree *node, const void *key,
static Eina_Rbtree_Direction
_eina_class_direction_range(const Eina_Rbtree *left,
const Eina_Rbtree *right,
__UNUSED__ void *data)
EINA_UNUSED void *data)
{
Eina_Class_Range *rl;
Eina_Class_Range *rr;

View File

@ -305,31 +305,31 @@ _eina_share_common_population_head_del(Eina_Share *share,
#else /* EINA_SHARE_COMMON_USAGE undefined */
static void _eina_share_common_population_init(__UNUSED__ Eina_Share *share) {
static void _eina_share_common_population_init(EINA_UNUSED Eina_Share *share) {
}
static void _eina_share_common_population_shutdown(__UNUSED__ Eina_Share *share)
static void _eina_share_common_population_shutdown(EINA_UNUSED Eina_Share *share)
{
}
static void _eina_share_common_population_stats(__UNUSED__ Eina_Share *share) {
static void _eina_share_common_population_stats(EINA_UNUSED Eina_Share *share) {
}
void eina_share_common_population_add(__UNUSED__ Eina_Share *share,
__UNUSED__ int slen) {
void eina_share_common_population_add(EINA_UNUSED Eina_Share *share,
EINA_UNUSED int slen) {
}
void eina_share_common_population_del(__UNUSED__ Eina_Share *share,
__UNUSED__ int slen) {
void eina_share_common_population_del(EINA_UNUSED Eina_Share *share,
EINA_UNUSED int slen) {
}
static void _eina_share_common_population_head_init(
__UNUSED__ Eina_Share *share,
__UNUSED__ Eina_Share_Common_Head *head) {
EINA_UNUSED Eina_Share *share,
EINA_UNUSED Eina_Share_Common_Head *head) {
}
static void _eina_share_common_population_head_add(
__UNUSED__ Eina_Share *share,
__UNUSED__
EINA_UNUSED Eina_Share *share,
EINA_UNUSED
Eina_Share_Common_Head *head) {
}
static void _eina_share_common_population_head_del(
__UNUSED__ Eina_Share *share,
__UNUSED__
EINA_UNUSED Eina_Share *share,
EINA_UNUSED
Eina_Share_Common_Head *head) {
}
#endif
@ -337,8 +337,8 @@ static void _eina_share_common_population_head_del(
static int
_eina_share_common_cmp(const Eina_Share_Common_Head *ed,
const int *hash,
__UNUSED__ int length,
__UNUSED__ void *data)
EINA_UNUSED int length,
EINA_UNUSED void *data)
{
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, , 0);
@ -348,7 +348,7 @@ _eina_share_common_cmp(const Eina_Share_Common_Head *ed,
static Eina_Rbtree_Direction
_eina_share_common_node(const Eina_Share_Common_Head *left,
const Eina_Share_Common_Head *right,
__UNUSED__ void *data)
EINA_UNUSED void *data)
{
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(left, , 0);
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(right, , 0);
@ -360,7 +360,7 @@ _eina_share_common_node(const Eina_Share_Common_Head *left,
}
static void
_eina_share_common_head_free(Eina_Share_Common_Head *ed, __UNUSED__ void *data)
_eina_share_common_head_free(Eina_Share_Common_Head *ed, EINA_UNUSED void *data)
{
EINA_MAGIC_CHECK_SHARE_COMMON_HEAD(ed, );
@ -546,7 +546,7 @@ _eina_share_common_node_from_str(const char *str, Eina_Magic node_magic)
}
static Eina_Bool
eina_iterator_array_check(const Eina_Rbtree *rbtree __UNUSED__,
eina_iterator_array_check(const Eina_Rbtree *rbtree EINA_UNUSED,
Eina_Share_Common_Head *head,
struct dumpinfo *fdata)
{
@ -867,7 +867,7 @@ on_error:
}
int
eina_share_common_length(__UNUSED__ Eina_Share *share, const char *str)
eina_share_common_length(EINA_UNUSED Eina_Share *share, const char *str)
{
const Eina_Share_Common_Node *node;

View File

@ -514,9 +514,9 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
}
#else
EAPI char *
eina_str_convert(const char *enc_from __UNUSED__,
const char *enc_to __UNUSED__,
const char *text __UNUSED__)
eina_str_convert(const char *enc_from EINA_UNUSED,
const char *enc_to EINA_UNUSED,
const char *text EINA_UNUSED)
{
return NULL;
}

View File

@ -109,7 +109,7 @@ _eina_strbuf_common_init(size_t csize, Eina_Strbuf *buf)
* @return #EINA_TRUE on success, #EINA_FALSE on failure.
*/
static Eina_Bool
_eina_strbuf_common_manage_init(size_t csize __UNUSED__,
_eina_strbuf_common_manage_init(size_t csize EINA_UNUSED,
Eina_Strbuf *buf,
void *str,
size_t len)

View File

@ -997,8 +997,8 @@ static inline void _splitter_del(Eina_Tiler *t)
}
static inline void _splitter_tile_size_set(Eina_Tiler *t,
int w __UNUSED__,
int h __UNUSED__)
int w EINA_UNUSED,
int h EINA_UNUSED)
{
/* TODO are w and h used for something? */
t->splitter.rects = list_zeroed;

View File

@ -164,10 +164,11 @@
# define EINA_SENTINEL
# endif
#elif defined(_WIN32)
#elif defined(_MSC_VER)
# define EINA_UNUSED
# define EINA_WARN_UNUSED_RESULT
# define EINA_ARG_NONNULL(...)
# if defined(_MSC_VER) && _MSC_VER >= 1300
# if _MSC_VER >= 1300
# define EINA_DEPRECATED __declspec(deprecated)
# else
# define EINA_DEPRECATED
@ -184,6 +185,7 @@
# define EINA_SENTINEL
#elif defined(__SUNPRO_C)
# define EINA_UNUSED
# define EINA_WARN_UNUSED_RESULT
# define EINA_ARG_NONNULL(...)
# define EINA_DEPRECATED
@ -207,7 +209,13 @@
# define EINA_LIKELY(exp) exp
# define EINA_SENTINEL
#else /* ! __GNUC__ && ! _WIN32 && ! __SUNPRO_C */
#else /* ! __GNUC__ && ! _MSC_VER && ! __SUNPRO_C */
/**
* @def EINA_UNUSED
* Used to warn when an argument of the function is not used.
*/
# define EINA_UNUSED
/**
* @def EINA_WARN_UNUSED_RESULT

File diff suppressed because it is too large Load Diff

View File

@ -140,7 +140,7 @@ _eina_xattr_ls_iterator_next(Eina_Xattr_Iterator *it, void **data)
}
static void *
_eina_xattr_ls_iterator_container(Eina_Xattr_Iterator *it __UNUSED__)
_eina_xattr_ls_iterator_container(Eina_Xattr_Iterator *it EINA_UNUSED)
{
return NULL;
}

View File

@ -8,6 +8,12 @@ AM_CPPFLAGS = \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
if HAVE_WINDOWS
AM_CPPFLAGS += \
-I$(top_srcdir)/src/lib/evil \
-I$(top_builddir)/src/lib/evil
endif
installed_headerdir = $(includedir)/eo-@VMAJ@
dist_installed_header_DATA = Eo.h

View File

@ -21,6 +21,7 @@
#endif
#include "Evil.h"
#include "evil_private.h"
#include "dlfcn.h"
@ -57,7 +58,7 @@ get_last_error(char *desc)
}
void *
dlopen(const char* path, int mode __UNUSED__)
dlopen(const char* path, int mode EVIL_UNUSED)
{
HMODULE module = NULL;
@ -190,7 +191,7 @@ dlsym(void *handle, const char *symbol)
}
int
dladdr (const void *addr __UNUSED__, Dl_info *info)
dladdr (const void *addr EVIL_UNUSED, Dl_info *info)
{
TCHAR tpath[PATH_MAX];
MEMORY_BASIC_INFORMATION mbi;

View File

@ -24,6 +24,7 @@
#include "evil_private.h"
#define APICHAR char
#include "evil_print.h"
#include "evil_private.h"
#ifdef __MINGW32CE__
# define _get_osfhandle(FILEDES) ((long)FILEDES)
@ -34,7 +35,7 @@
void *
mmap(void *addr __UNUSED__,
mmap(void *addr EVIL_UNUSED,
size_t len,
int prot,
int flags,
@ -189,7 +190,7 @@ mmap(void *addr __UNUSED__,
int
munmap(void *addr,
size_t len __UNUSED__)
size_t len EVIL_UNUSED)
{
#ifdef _WIN32_WCE
OSVERSIONINFO os_version;

View File

@ -6,6 +6,14 @@
extern "C" {
#endif
#ifdef __GNUC__
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
# define EVIL_UNUSED __attribute__ ((__unused__))
# else
# define EVIL_UNUSED
# endif
#endif
long _evil_systemtime_to_time(SYSTEMTIME st);
void _evil_error_display(const char *fct, LONG res);

View File

@ -15,7 +15,7 @@
*
*/
void evil_perror (const char *s __UNUSED__)
void evil_perror (const char *s EVIL_UNUSED)
{
fprintf(stderr, "[Windows CE] error\n");
}