bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dade4fc2f7a75c1f54a4903c3bb9c4c5690f6fa9
commit dade4fc2f7a75c1f54a4903c3bb9c4c5690f6fa9 Author: Marcel Hollerbach <[email protected]> Date: Sun Apr 19 15:14:12 2020 +0200 eo-files: convert all Eina.Strbuf & Eina.Binbuf these structs should not be used, but rather the builtin types that exist for it. Reviewed-by: Felipe Magno de Almeida <[email protected]> Differential Revision: https://phab.enlightenment.org/D11742 --- src/lib/ecore/efl_io_copier.eo | 4 ++-- src/lib/efl/interfaces/efl_io_buffer.eo | 2 +- src/lib/eio/efl_io_manager.eo | 4 ++-- src/lib/eo/eina_types.eot | 3 --- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/lib/ecore/efl_io_copier.eo b/src/lib/ecore/efl_io_copier.eo index e172a0c41d..291bdbc0ef 100644 --- a/src/lib/ecore/efl_io_copier.eo +++ b/src/lib/ecore/efl_io_copier.eo @@ -148,7 +148,7 @@ class @beta Efl.Io.Copier extends Efl.Loop_Consumer implements Efl.Io.Closer { destination then the "done" event is emitted. If the destination is not set (ie: $NULL) then data is kept - in a internal @Eina.Binbuf, which can be stolen with + in a internal binbuf, which can be stolen with @.binbuf_steal once "data" or "line" events are emitted. It exists as a useful shortcut to easily drain readers and store all data in memory with no need to use an @@ -313,7 +313,7 @@ class @beta Efl.Io.Copier extends Efl.Loop_Consumer implements Efl.Io.Closer { which case you should wait for "done", "data" or "line" events and then call it to retrieve and own the data. ]] - return: ptr(Eina.Binbuf) @move @no_unused; [[Binbuf]] + return: binbuf @move @no_unused; [[Binbuf]] } @property pending_size { diff --git a/src/lib/efl/interfaces/efl_io_buffer.eo b/src/lib/efl/interfaces/efl_io_buffer.eo index 518a799a3a..58e0c7ab22 100644 --- a/src/lib/efl/interfaces/efl_io_buffer.eo +++ b/src/lib/efl/interfaces/efl_io_buffer.eo @@ -133,7 +133,7 @@ class @beta Efl.Io.Buffer extends Efl.Object On failure, for example a read-only backing store was adopted with @.adopt_readonly, $NULL is returned. ]] - return: ptr(Eina.Binbuf) @move @no_unused; [[Binbuf]] + return: binbuf @move @no_unused; [[Binbuf]] } } diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo index be58b047c0..6d147d95b4 100644 --- a/src/lib/eio/efl_io_manager.eo +++ b/src/lib/eio/efl_io_manager.eo @@ -80,13 +80,13 @@ class @beta Efl.Io.Manager extends Efl.Loop_Consumer [[Retrieves or sets information of a given extended attribute.]] set { values { - data: ptr(Eina.Binbuf); [[Data to set as information]] + data: binbuf; [[Data to set as information]] flags: Eina.Xattr.Flags; [[Extended attributes flags]] } return: future<uint64> @move; [[Future for asynchronous set operation]] } get { - return: future<Eina.Binbuf> @move; [[Information]] + return: future<binbuf> @move; [[Information]] } keys { path: string; [[File path]] diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot index 000a2567d9..cbb0981dc7 100644 --- a/src/lib/eo/eina_types.eot +++ b/src/lib/eo/eina_types.eot @@ -128,9 +128,6 @@ type @extern Eina.Error: int; [[Eina error type @since 1.22 ]] -struct @extern @beta @free(eina_binbuf_free) Eina.Binbuf; [[Eina binbuf data structure]] -struct @extern @beta @free(eina_strbuf_free) Eina.Strbuf; [[Eina strbuf data structure]] - struct @extern @beta Eina.Slice { [[A linear, read-only, memory segment]] len: size; [[Length of the memory segment]] --
