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

edje: use const Eina_File for mmap_set function.

This commit is contained in:
Cedric Bail 2013-11-04 11:28:29 +09:00
parent f4ae52ea67
commit 1c7f602087
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/edje/Edje_Common.h
View File

@ -135,7 +135,7 @@ EAPI void edje_fontset_append_set (const char *fonts);
* *
* Then, edje_file_data_get("test.edj", "key1") will return "value1" * Then, edje_file_data_get("test.edj", "key1") will return "value1"
*/ */
EAPI char *edje_mmap_data_get(Eina_File *f, const char *key); EAPI char *edje_mmap_data_get(const Eina_File *f, const char *key);
/** /**
* Get data from the file level data block of an edje file * Get data from the file level data block of an edje file

2
src/lib/edje/Edje_Eo.h
View File

@ -652,7 +652,7 @@ enum
* *
* @see edje_object_file_set * @see edje_object_file_set
*/ */
#define edje_obj_mmap_set(file, group, ret) EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_MMAP_SET), EO_TYPECHECK(Eina_File*, file), EO_TYPECHECK(const char *, group), EO_TYPECHECK(Eina_Bool *, ret) #define edje_obj_mmap_set(file, group, ret) EDJE_OBJ_ID(EDJE_OBJ_SUB_ID_MMAP_SET), EO_TYPECHECK(const Eina_File*, file), EO_TYPECHECK(const char *, group), EO_TYPECHECK(Eina_Bool *, ret)
/** /**
* @def edje_obj_file_get * @def edje_obj_file_get

2
src/lib/edje/Edje_Legacy.h
View File

@ -1806,7 +1806,7 @@ EAPI Eina_Bool edje_object_file_set (Evas_Object *obj, const char
* @see edje_object_mmap_set() * @see edje_object_mmap_set()
* @since 1.8 * @since 1.8
*/ */
EAPI Eina_Bool edje_object_mmap_set(Evas_Object *obj, Eina_File *file, const char *group); EAPI Eina_Bool edje_object_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group);
/** /**

5
src/lib/edje/edje_cache.c
View File

@ -1,6 +1,5 @@
#include "edje_private.h" #include "edje_private.h"
static Eina_Hash *_edje_file_hash = NULL; static Eina_Hash *_edje_file_hash = NULL;
static int _edje_file_cache_size = 16; static int _edje_file_cache_size = 16;
static Eina_List *_edje_file_cache = NULL; static Eina_List *_edje_file_cache = NULL;
@ -299,7 +298,7 @@ _edje_file_change(void *data, int ev_type EINA_UNUSED, void *event)
#endif #endif
static Edje_File * static Edje_File *
_edje_file_open(Eina_File *f, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, time_t mtime) _edje_file_open(const Eina_File *f, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, time_t mtime)
{ {
Edje_Color_Class *cc; Edje_Color_Class *cc;
Edje_File *edf; Edje_File *edf;
@ -399,7 +398,7 @@ _edje_file_dangling(Edje_File *edf)
#endif #endif
Edje_File * Edje_File *
_edje_cache_file_coll_open(Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed) _edje_cache_file_coll_open(const Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed)
{ {
Edje_File *edf; Edje_File *edf;
Eina_List *l, *hist; Eina_List *l, *hist;

10
src/lib/edje/edje_load.c
View File

@ -24,7 +24,7 @@ struct _Edje_Drag_Items
} page; } page;
}; };
void _edje_file_add(Edje *ed, Eina_File *f); void _edje_file_add(Edje *ed, const Eina_File *f);
/* START - Nested part support */ /* START - Nested part support */
#define _edje_smart_nested_type "Evas_Smart_Nested" #define _edje_smart_nested_type "Evas_Smart_Nested"
@ -83,7 +83,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *group)
} }
EAPI Eina_Bool EAPI Eina_Bool
edje_object_mmap_set(Evas_Object *obj, Eina_File *file, const char *group) edje_object_mmap_set(Evas_Object *obj, const Eina_File *file, const char *group)
{ {
if (!obj) return EINA_FALSE; if (!obj) return EINA_FALSE;
Eina_Bool ret = EINA_FALSE; Eina_Bool ret = EINA_FALSE;
@ -295,7 +295,7 @@ edje_file_group_exists(const char *file, const char *glob)
} }
EAPI char * EAPI char *
edje_mmap_data_get(Eina_File *f, const char *key) edje_mmap_data_get(const Eina_File *f, const char *key)
{ {
Edje_File *edf; Edje_File *edf;
char *str = NULL; char *str = NULL;
@ -357,7 +357,7 @@ _edje_physics_world_update_cb(void *data, EPhysics_World *world EINA_UNUSED, voi
#endif #endif
int int
_edje_object_file_set_internal(Evas_Object *obj, Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested) _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested)
{ {
Edje *ed; Edje *ed;
Evas *tev; Evas *tev;
@ -1166,7 +1166,7 @@ on_error:
} }
void void
_edje_file_add(Edje *ed, Eina_File *f) _edje_file_add(Edje *ed, const Eina_File *f)
{ {
if (!_edje_edd_edje_file) return; if (!_edje_edd_edje_file) return;
if (!f) if (!f)

4
src/lib/edje/edje_private.h
View File

@ -1972,7 +1972,7 @@ void *_edje_signal_callback_disable(const Edje_Signal_Callback_Group *cgp,
EAPI void _edje_edd_init(void); EAPI void _edje_edd_init(void);
EAPI void _edje_edd_shutdown(void); EAPI void _edje_edd_shutdown(void);
int _edje_object_file_set_internal(Evas_Object *obj, Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested); int _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const char *group, const char *parent, Eina_List *group_path, Eina_Array *nested);
void _edje_file_del(Edje *ed); void _edje_file_del(Edje *ed);
void _edje_file_free(Edje_File *edf); void _edje_file_free(Edje_File *edf);
@ -2154,7 +2154,7 @@ void _edje_textblock_styles_del(Edje *ed);
void _edje_textblock_style_all_update(Edje *ed); void _edje_textblock_style_all_update(Edje *ed);
void _edje_textblock_style_parse_and_fix(Edje_File *edf); void _edje_textblock_style_parse_and_fix(Edje_File *edf);
void _edje_textblock_style_cleanup(Edje_File *edf); void _edje_textblock_style_cleanup(Edje_File *edf);
Edje_File *_edje_cache_file_coll_open(Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed); Edje_File *_edje_cache_file_coll_open(const Eina_File *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, Edje *ed);
void _edje_cache_coll_clean(Edje_File *edf); void _edje_cache_coll_clean(Edje_File *edf);
void _edje_cache_coll_flush(Edje_File *edf); void _edje_cache_coll_flush(Edje_File *edf);
void _edje_cache_coll_unref(Edje_File *edf, Edje_Part_Collection *edc); void _edje_cache_coll_unref(Edje_File *edf, Edje_Part_Collection *edc);

2
src/lib/edje/edje_smart.c
View File

@ -363,7 +363,7 @@ _edje_smart_file_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
static void static void
_edje_smart_mmap_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) _edje_smart_mmap_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{ {
Eina_File *f = va_arg(*list, Eina_File *); const Eina_File *f = va_arg(*list, Eina_File *);
const char *group = va_arg(*list, const char *); const char *group = va_arg(*list, const char *);
Eina_Bool *ret = va_arg(*list, Eina_Bool *); Eina_Bool *ret = va_arg(*list, Eina_Bool *);
Eina_Array *nested; Eina_Array *nested;