summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitor Sousa <vitorsousa@expertisesolutions.com.br>2019-07-08 12:46:25 -0300
committerVitor Sousa <vitorsousa@expertisesolutions.com.br>2019-07-08 12:46:37 -0300
commit25ef604467b083d1f5ff2c7f9a1a82e660e04443 (patch)
tree4e1947210343d921e5bdd82dce686afc224b8e3e
parentec501a6623e8132caea14ad7e382d6e7c2f348c0 (diff)
Revert "efl: prevent usage of some Eina.* stub types in stable APIs"
C# does not support `slice` and `rw_slice` yet. Reverting until proper support lands. This reverts commit ec7bc0eddd7abc77d28605b0a6f0aea2e246a0ee.
-rw-r--r--src/lib/efl/interfaces/efl_io_reader.eo2
-rw-r--r--src/lib/efl/interfaces/efl_io_writer.eo4
-rw-r--r--src/lib/eo/eina_types.eot22
3 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/efl/interfaces/efl_io_reader.eo b/src/lib/efl/interfaces/efl_io_reader.eo
index 374e81e1fb..2e166031a9 100644
--- a/src/lib/efl/interfaces/efl_io_reader.eo
+++ b/src/lib/efl/interfaces/efl_io_reader.eo
@@ -29,7 +29,7 @@ interface Efl.Io.Reader {
29 You can understand this method as read(2) libc function. 29 You can understand this method as read(2) libc function.
30 ]] 30 ]]
31 params { 31 params {
32 @inout rw_slice: rw_slice<ubyte>; [[Provides a pre-allocated memory to be filled up to rw_slice.len. It will be populated and the length will be set to the actually used amount of bytes, which can be smaller than the request.]] 32 @inout rw_slice: Eina.Rw_Slice; [[Provides a pre-allocated memory to be filled up to rw_slice.len. It will be populated and the length will be set to the actually used amount of bytes, which can be smaller than the request.]]
33 } 33 }
34 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]] 34 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]]
35 } 35 }
diff --git a/src/lib/efl/interfaces/efl_io_writer.eo b/src/lib/efl/interfaces/efl_io_writer.eo
index d83d5beb0f..471b6a0d60 100644
--- a/src/lib/efl/interfaces/efl_io_writer.eo
+++ b/src/lib/efl/interfaces/efl_io_writer.eo
@@ -29,8 +29,8 @@ interface Efl.Io.Writer {
29 You can understand this method as write(2) libc function. 29 You can understand this method as write(2) libc function.
30 ]] 30 ]]
31 params { 31 params {
32 @inout slice: slice<ubyte>; [[Provides a pre-populated memory to be used up to slice.len. The returned slice will be adapted as length will be set to the actually used amount of bytes, which can be smaller than the request.]] 32 @inout slice: Eina.Slice; [[Provides a pre-populated memory to be used up to slice.len. The returned slice will be adapted as length will be set to the actually used amount of bytes, which can be smaller than the request.]]
33 @out remaining: slice<ubyte> @optional; [[Convenience to output the remaining parts of slice that was not written. If the full slice was written, this will be a slice of zero-length.]] 33 @out remaining: Eina.Slice @optional; [[Convenience to output the remaining parts of slice that was not written. If the full slice was written, this will be a slice of zero-length.]]
34 } 34 }
35 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]] 35 return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]]
36 } 36 }
diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot
index d936901eea..95d15a4782 100644
--- a/src/lib/eo/eina_types.eot
+++ b/src/lib/eo/eina_types.eot
@@ -42,9 +42,9 @@ struct @extern Eina.Matrix3 {
42 zz: double; [[ZZ matrix value]] 42 zz: double; [[ZZ matrix value]]
43} 43}
44 44
45type @extern @beta Eina.Unicode: uint32; [[Eina unicode type]] 45type @extern Eina.Unicode: uint32; [[Eina unicode type]]
46 46
47struct @extern @beta Eina.File_Direct_Info; [[Eina file direct information data structure]] 47struct @extern Eina.File_Direct_Info; [[Eina file direct information data structure]]
48/*{ 48/*{
49 path_lenght: size_t; [[Size of the whole path]] 49 path_lenght: size_t; [[Size of the whole path]]
50 name_length: size_t; [[Size of the filename/basename component]] 50 name_length: size_t; [[Size of the filename/basename component]]
@@ -53,7 +53,7 @@ struct @extern @beta Eina.File_Direct_Info; [[Eina file direct information data
53 path: char[EINA_PATH_MAX]; [[The path]] 53 path: char[EINA_PATH_MAX]; [[The path]]
54};*/ 54};*/
55 55
56enum @extern @beta Eina.Xattr.Flags { 56enum @extern Eina.Xattr.Flags {
57 [[Eina file extended attributes flags]] 57 [[Eina file extended attributes flags]]
58 insert, [[This is the default behaviour, it will either create or replace the extended attribute]] 58 insert, [[This is the default behaviour, it will either create or replace the extended attribute]]
59 replace, [[This will only succeed if the extended attribute previously existed]] 59 replace, [[This will only succeed if the extended attribute previously existed]]
@@ -62,25 +62,25 @@ enum @extern @beta Eina.Xattr.Flags {
62 62
63type @extern Eina.Error: int; [[Eina error type]] 63type @extern Eina.Error: int; [[Eina error type]]
64 64
65struct @extern @beta @free(eina_binbuf_free) Eina.Binbuf; [[Eina binbuf data structure]] 65struct @extern @free(eina_binbuf_free) Eina.Binbuf; [[Eina binbuf data structure]]
66struct @extern @beta @free(eina_strbuf_free) Eina.Strbuf; [[Eina strbuf data structure]] 66struct @extern @free(eina_strbuf_free) Eina.Strbuf; [[Eina strbuf data structure]]
67 67
68struct @extern @beta Eina.Slice { 68struct @extern Eina.Slice {
69 [[A linear, read-only, memory segment]] 69 [[A linear, read-only, memory segment]]
70 len: size; [[Length of the memory segment]] 70 len: size; [[Length of the memory segment]]
71 mem: const(void_ptr); [[Pointer to memory segment]] 71 mem: const(void_ptr); [[Pointer to memory segment]]
72} 72}
73 73
74struct @extern @beta Eina.Rw_Slice { 74struct @extern Eina.Rw_Slice {
75 [[A linear, read-write, memory segment]] 75 [[A linear, read-write, memory segment]]
76 len: size; [[Length of the memory segment]] 76 len: size; [[Length of the memory segment]]
77 mem: void_ptr; [[Pointer to memory segment]] 77 mem: void_ptr; [[Pointer to memory segment]]
78} 78}
79 79
80struct @extern @beta Eina.Value; [[Eina value placeholder so it can be referenced from docs.]] 80struct @extern Eina.Value; [[Eina value placeholder so it can be referenced from docs.]]
81struct @extern @beta Eina.Value_Type; [[Eina value type]] 81struct @extern Eina.Value_Type; [[Eina value type]]
82 82
83struct @extern @beta Eina.Stat { 83struct @extern Eina.Stat {
84 [[The structure to store some file statistics.]] 84 [[The structure to store some file statistics.]]
85 dev : ulong; [[The device where this file is located]] 85 dev : ulong; [[The device where this file is located]]
86 ino : ulong; [[The inode]] 86 ino : ulong; [[The inode]]
@@ -103,5 +103,5 @@ struct @extern @beta Eina.Stat {
103struct @extern @free(eina_promise_free) Eina.Promise; [[Eina promise type]] 103struct @extern @free(eina_promise_free) Eina.Promise; [[Eina promise type]]
104 104
105/* FIXME: This definitely shouldn't be here. */ 105/* FIXME: This definitely shouldn't be here. */
106type @beta Efl.Event_Cb: __undefined_type; [[Efl event callback type]] 106type Efl.Event_Cb: __undefined_type; [[Efl event callback type]]
107 107