From 550b14261ec5d50da46386a553d7a3a980a734f8 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 18 Apr 2018 15:49:14 -0700 Subject: [PATCH] efl: refactor model error creation. --- src/lib/efl/interfaces/efl_model_common.c | 34 ++++++++--------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/lib/efl/interfaces/efl_model_common.c b/src/lib/efl/interfaces/efl_model_common.c index dabc388338..ecbbb59ecb 100644 --- a/src/lib/efl/interfaces/efl_model_common.c +++ b/src/lib/efl/interfaces/efl_model_common.c @@ -23,37 +23,25 @@ static const char EFL_MODEL_ERROR_PERMISSION_DENIED_STR[] = "Permission denied"; static const char EFL_MODEL_ERROR_INCORRECT_VALUE_STR[] = "Incorrect value"; static const char EFL_MODEL_ERROR_INVALID_OBJECT_STR[] = "Object is invalid"; +#define _ERROR(Name) EFL_MODEL_ERROR_##Name = eina_error_msg_static_register(EFL_MODEL_ERROR_##Name##_STR); EAPI int efl_model_init(void) { - EFL_MODEL_ERROR_INCORRECT_VALUE = eina_error_msg_static_register( - EFL_MODEL_ERROR_INCORRECT_VALUE_STR); - - EFL_MODEL_ERROR_UNKNOWN = eina_error_msg_static_register( - EFL_MODEL_ERROR_UNKNOWN_STR); - - EFL_MODEL_ERROR_NOT_SUPPORTED = eina_error_msg_static_register( - EFL_MODEL_ERROR_NOT_SUPPORTED_STR); - - EFL_MODEL_ERROR_NOT_FOUND = eina_error_msg_static_register( - EFL_MODEL_ERROR_NOT_FOUND_STR); - - EFL_MODEL_ERROR_READ_ONLY = eina_error_msg_static_register( - EFL_MODEL_ERROR_READ_ONLY_STR); - - EFL_MODEL_ERROR_INIT_FAILED = eina_error_msg_static_register( - EFL_MODEL_ERROR_INIT_FAILED_STR); - - EFL_MODEL_ERROR_PERMISSION_DENIED = eina_error_msg_static_register( - EFL_MODEL_ERROR_PERMISSION_DENIED_STR); - - EFL_MODEL_ERROR_INVALID_OBJECT = eina_error_msg_static_register( - EFL_MODEL_ERROR_INVALID_OBJECT_STR); + _ERROR(INCORRECT_VALUE); + _ERROR(UNKNOWN); + _ERROR(NOT_SUPPORTED); + _ERROR(NOT_FOUND); + _ERROR(READ_ONLY); + _ERROR(INIT_FAILED); + _ERROR(PERMISSION_DENIED); + _ERROR(INVALID_OBJECT); return EINA_TRUE; } +#undef _ERROR + EAPI void _efl_model_properties_changed_internal(const Efl_Model *model, ...) {