diff options
author | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2017-09-22 16:08:56 +0200 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2017-09-22 16:17:19 +0200 |
commit | fdd27cadf837bf3df7e8174030b3630d2649350b (patch) | |
tree | 861011271ad3a59128fc938b2b7957dfd578f6e8 /src | |
parent | 72e9d604a36d18aa18740323ddcbd99f6f9bf8a7 (diff) |
eo: make more freefuncs implicit
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/ecore/efl_io_copier.eo | 2 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_config.eo | 2 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_io_buffer.eo | 2 | ||||
-rw-r--r-- | src/lib/elementary/elm_interface_atspi_accessible.eo | 3 | ||||
-rw-r--r-- | src/lib/eo/eina_types.eot | 2 | ||||
-rw-r--r-- | src/lib/eolian/database_validate.c | 6 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_canvas.eo | 6 |
7 files changed, 13 insertions, 10 deletions
diff --git a/src/lib/ecore/efl_io_copier.eo b/src/lib/ecore/efl_io_copier.eo index 5096c1d6c8..f1d254d45a 100644 --- a/src/lib/ecore/efl_io_copier.eo +++ b/src/lib/ecore/efl_io_copier.eo | |||
@@ -310,7 +310,7 @@ class Efl.Io.Copier (Efl.Loop_User, Efl.Io.Closer) { | |||
310 | this case you should wait for "done", "data" or "line" | 310 | this case you should wait for "done", "data" or "line" |
311 | events and then call it to retrieve (and own!) the data. | 311 | events and then call it to retrieve (and own!) the data. |
312 | ]] | 312 | ]] |
313 | return: free(ptr(Eina.Binbuf), eina_binbuf_free) @owned @warn_unused; [[Binbuf]] | 313 | return: ptr(Eina.Binbuf) @owned @warn_unused; [[Binbuf]] |
314 | } | 314 | } |
315 | 315 | ||
316 | @property pending_size { | 316 | @property pending_size { |
diff --git a/src/lib/efl/interfaces/efl_config.eo b/src/lib/efl/interfaces/efl_config.eo index e6c64b6778..3f128cdb48 100644 --- a/src/lib/efl/interfaces/efl_config.eo +++ b/src/lib/efl/interfaces/efl_config.eo | |||
@@ -17,7 +17,7 @@ interface Efl.Config () | |||
17 | params { | 17 | params { |
18 | name: string; [[Configuration option name]] | 18 | name: string; [[Configuration option name]] |
19 | } | 19 | } |
20 | return: free(ptr(generic_value), eina_value_free) @owned; [[Configuration option value]] | 20 | return: ptr(generic_value) @owned; [[Configuration option value]] |
21 | } | 21 | } |
22 | config_list_get @const { | 22 | config_list_get @const { |
23 | [[Returns a list of generic values under a given key.]] | 23 | [[Returns a list of generic values under a given key.]] |
diff --git a/src/lib/efl/interfaces/efl_io_buffer.eo b/src/lib/efl/interfaces/efl_io_buffer.eo index 9c51ff6c83..d9d4d91e23 100644 --- a/src/lib/efl/interfaces/efl_io_buffer.eo +++ b/src/lib/efl/interfaces/efl_io_buffer.eo | |||
@@ -132,7 +132,7 @@ class Efl.Io.Buffer (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Ef | |||
132 | On failure, for example a read-only backing store was | 132 | On failure, for example a read-only backing store was |
133 | adopted with @.adopt_readonly, NULL is returned. | 133 | adopted with @.adopt_readonly, NULL is returned. |
134 | ]] | 134 | ]] |
135 | return: free(ptr(Eina.Binbuf), eina_binbuf_free) @owned @warn_unused; [[Binbuf]] | 135 | return: ptr(Eina.Binbuf) @owned @warn_unused; [[Binbuf]] |
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo index c8cea4247b..9064d5d702 100644 --- a/src/lib/elementary/elm_interface_atspi_accessible.eo +++ b/src/lib/elementary/elm_interface_atspi_accessible.eo | |||
@@ -298,7 +298,8 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) | |||
298 | get { | 298 | get { |
299 | } | 299 | } |
300 | values { | 300 | values { |
301 | attributes: free(list<ptr(Elm.Atspi.Attribute) @owned>, elm_atspi_attributes_list_free) @owned; [[List of object attributes]] | 301 | /* FIXME: API for attribute free */ |
302 | attributes: list<ptr(Elm.Atspi.Attribute) @owned> @owned; [[List of object attributes]] | ||
302 | } | 303 | } |
303 | } | 304 | } |
304 | @property index_in_parent @protected { | 305 | @property index_in_parent @protected { |
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot index d483fe8eea..41b89215a4 100644 --- a/src/lib/eo/eina_types.eot +++ b/src/lib/eo/eina_types.eot | |||
@@ -1,5 +1,5 @@ | |||
1 | /* FIXME: Move to Eina when we decide they are handled properly. */ | 1 | /* FIXME: Move to Eina when we decide they are handled properly. */ |
2 | struct @extern Eina.Rect { | 2 | struct @extern @free(eina_rectangle_free) Eina.Rect { |
3 | [[A rectangle in pixel dimensions.]] | 3 | [[A rectangle in pixel dimensions.]] |
4 | x: int; [[X coordinate of the rectangle, from the top-left corner.]] | 4 | x: int; [[X coordinate of the rectangle, from the top-left corner.]] |
5 | y: int; [[Y coordinate of the rectangle, from the top-left corner.]] | 5 | y: int; [[Y coordinate of the rectangle, from the top-left corner.]] |
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c index 11ba527772..b2df691ac4 100644 --- a/src/lib/eolian/database_validate.c +++ b/src/lib/eolian/database_validate.c | |||
@@ -142,13 +142,14 @@ static const char * const eo_complex_frees[] = | |||
142 | static const char *eo_obj_free = "efl_del"; | 142 | static const char *eo_obj_free = "efl_del"; |
143 | static const char *eo_str_free = "free"; | 143 | static const char *eo_str_free = "free"; |
144 | static const char *eo_strshare_free = "eina_stringshare_del"; | 144 | static const char *eo_strshare_free = "eina_stringshare_del"; |
145 | static const char *eo_value_free = "eina_value_free"; | ||
145 | 146 | ||
146 | static Eina_Bool | 147 | static Eina_Bool |
147 | _validate_type(Eolian_Type *tp) | 148 | _validate_type(Eolian_Type *tp) |
148 | { | 149 | { |
149 | char buf[256]; | 150 | char buf[256]; |
150 | 151 | ||
151 | if ((tp->owned || tp->freefunc) && !database_type_is_ownable(tp, EINA_FALSE)) | 152 | if (tp->owned && !database_type_is_ownable(tp, EINA_FALSE)) |
152 | { | 153 | { |
153 | snprintf(buf, sizeof(buf), "type '%s' is not ownable", tp->full_name); | 154 | snprintf(buf, sizeof(buf), "type '%s' is not ownable", tp->full_name); |
154 | return _type_error(tp, buf); | 155 | return _type_error(tp, buf); |
@@ -184,6 +185,9 @@ _validate_type(Eolian_Type *tp) | |||
184 | case KW_stringshare: | 185 | case KW_stringshare: |
185 | tp->freefunc = eina_stringshare_add(eo_strshare_free); | 186 | tp->freefunc = eina_stringshare_add(eo_strshare_free); |
186 | break; | 187 | break; |
188 | case KW_generic_value: | ||
189 | tp->freefunc = eina_stringshare_add(eo_value_free); | ||
190 | break; | ||
187 | default: | 191 | default: |
188 | break; | 192 | break; |
189 | } | 193 | } |
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 65a5a223af..b43c3ba152 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo | |||
@@ -571,8 +571,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, | |||
571 | 571 | ||
572 | @since 1.15 | 572 | @since 1.15 |
573 | ]] | 573 | ]] |
574 | return: free(list<ptr(Eina.Rect)>, evas_render_updates_free) | 574 | return: list<ptr(Eina.Rect)> @owned @warn_unused; [[ |
575 | @owned @warn_unused; [[ | ||
576 | A newly allocated list of updated rectangles of the canvas | 575 | A newly allocated list of updated rectangles of the canvas |
577 | ($Eina.Rect structs). Free this list with | 576 | ($Eina.Rect structs). Free this list with |
578 | \@ref evas_render_updates_free. | 577 | \@ref evas_render_updates_free. |
@@ -866,8 +865,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, | |||
866 | 865 | ||
867 | See the full @ref Example_Evas_Events "example". | 866 | See the full @ref Example_Evas_Events "example". |
868 | */ | 867 | */ |
869 | return: free(list<ptr(Eina.Rect)>, evas_render_updates_free) | 868 | return: list<ptr(Eina.Rect)> @owned @warn_unused; [[ |
870 | @owned @warn_unused; [[ | ||
871 | A newly allocated list of updated rectangles of the canvas | 869 | A newly allocated list of updated rectangles of the canvas |
872 | ($Eina.Rect structs). Free this list with | 870 | ($Eina.Rect structs). Free this list with |
873 | \@ref evas_render_updates_free. | 871 | \@ref evas_render_updates_free. |