summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-11-08 15:20:38 +0000
committerJérémy Zurcher <jeremy@asynk.ch>2014-01-03 16:22:19 +0100
commit2a4fe126415bd47b184b48cfd44b0f41a36b7dbe (patch)
tree53096917174f3cc701e05083b824cda79f660bcb
parent29f0704ba9487e2f45be8b7d24cb2eb632f18019 (diff)
downloadefl-2a4fe126415bd47b184b48cfd44b0f41a36b7dbe.tar.gz
eo2: prefix all the eo2_*internal* functions with an underscore.
This prevents them from being auto-completed by IDEs which makes development nicer.
-rw-r--r--src/lib/eo/Eo.h12
-rw-r--r--src/lib/eo/eo.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index f565c83fd1..0526560e5b 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -854,11 +854,11 @@ EAPI void eo_error_set_internal(const Eo *obj, const char *file, int line);
#define eo2_add(klass, parent, ...) \
({ \
const Eo_Class *_tmp_klass = klass; \
- Eo *_tmp_obj = eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
+ Eo *_tmp_obj = _eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
eo2_do(_tmp_obj, \
eo2_constructor(); \
__VA_ARGS__; \
- _tmp_obj = eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
+ _tmp_obj = _eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
); \
_tmp_obj; \
})
@@ -881,10 +881,10 @@ EAPI void eo_error_set_internal(const Eo *obj, const char *file, int line);
#define eo2_add_custom(klass, parent, ...) \
({ \
const Eo_Class *_tmp_klass = klass; \
- Eo *_tmp_obj = eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
+ Eo *_tmp_obj = _eo2_add_internal_start(__FILE__, __LINE__, _tmp_klass, parent); \
eo2_do(_tmp_obj, \
__VA_ARGS__; \
- _tmp_obj = eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
+ _tmp_obj = _eo2_add_internal_end(__FILE__, __LINE__, _tmp_obj); \
); \
_tmp_obj; \
})
@@ -902,8 +902,8 @@ EAPI void eo_error_set_internal(const Eo *obj, const char *file, int line);
* @see #eo_add
*/
EAPI Eo *eo_add_internal(const char *file, int line, const Eo_Class *klass, Eo *parent, ...);
-EAPI Eo * eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent);
-EAPI Eo * eo2_add_internal_end(const char *file, int line, const Eo *obj);
+EAPI Eo * _eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent);
+EAPI Eo * _eo2_add_internal_end(const char *file, int line, const Eo *obj);
/**
* @brief Get a pointer to the data of an object for a specific class.
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 65b1c974db..02e4ca11b2 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -654,7 +654,7 @@ _eo2_class_funcs_set(_Eo_Class *klass)
}
EAPI Eo *
-eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent_id)
+_eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo *parent_id)
{
_Eo_Object *obj;
@@ -703,7 +703,7 @@ eo2_add_internal_start(const char *file, int line, const Eo_Class *klass_id, Eo
}
EAPI Eo *
-eo2_add_internal_end(const char *file, int line, const Eo *eo_id)
+_eo2_add_internal_end(const char *file, int line, const Eo *eo_id)
{
Eo2_Stack_Frame *fptr;
@@ -719,7 +719,7 @@ eo2_add_internal_end(const char *file, int line, const Eo *eo_id)
{
ERR("in %s:%d: Object of class '%s' - Not all of the object constructors have been executed.",
file, line, fptr->cur_klass->desc->name);
- /* Unref twice, once for the ref in eo2_add_internal_start, and once for the basic object ref. */
+ /* Unref twice, once for the ref in _eo2_add_internal_start, and once for the basic object ref. */
_eo_unref(fptr->obj);
_eo_unref(fptr->obj);
return NULL;