summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-10-11 16:49:13 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-10-11 16:50:40 +0900
commit69e27abdc37f222183ce27f4ce0e3fe2a45ca590 (patch)
tree487cbabad5e0a5e5efd0c56063cf5d437484b4ea /src/modules
parent725237df0a8b8cab83c8f38368e5d0389dbd196e (diff)
eina - and e3fl in general - stop using eina_error_get/set - useless really
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/eina/mp/chained_pool/eina_chained_mempool.c8
-rw-r--r--src/modules/eina/mp/one_big/eina_one_big.c11
-rw-r--r--src/modules/emotion/gstreamer/emotion_gstreamer.c10
3 files changed, 3 insertions, 26 deletions
diff --git a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
index e3fcb5963c..b71b79dcf4 100644
--- a/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
+++ b/src/modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -33,7 +33,6 @@
33 33
34#include "eina_config.h" 34#include "eina_config.h"
35#include "eina_inlist.h" 35#include "eina_inlist.h"
36#include "eina_error.h"
37#include "eina_module.h" 36#include "eina_module.h"
38#include "eina_mempool.h" 37#include "eina_mempool.h"
39#include "eina_trash.h" 38#include "eina_trash.h"
@@ -123,13 +122,8 @@ _eina_chained_mp_pool_new(Chained_Mempool *pool)
123 Chained_Pool *p; 122 Chained_Pool *p;
124 unsigned char *ptr; 123 unsigned char *ptr;
125 124
126 eina_error_set(0);
127 p = malloc(pool->alloc_size); 125 p = malloc(pool->alloc_size);
128 if (!p) 126 if (!p) return NULL;
129 {
130 eina_error_set(EINA_ERROR_OUT_OF_MEMORY);
131 return NULL;
132 }
133 127
134#ifdef EINA_DEBUG_MALLOC 128#ifdef EINA_DEBUG_MALLOC
135 { 129 {
diff --git a/src/modules/eina/mp/one_big/eina_one_big.c b/src/modules/eina/mp/one_big/eina_one_big.c
index e658013382..470a2ddf05 100644
--- a/src/modules/eina/mp/one_big/eina_one_big.c
+++ b/src/modules/eina/mp/one_big/eina_one_big.c
@@ -100,11 +100,7 @@ eina_one_big_malloc(void *data, EINA_UNUSED unsigned int size)
100 if (!pool->base) 100 if (!pool->base)
101 { 101 {
102 pool->base = malloc(pool->item_size * pool->max); 102 pool->base = malloc(pool->item_size * pool->max);
103 if (!pool->base) 103 if (!pool->base) goto retry_smaller;
104 {
105 eina_error_set(EINA_ERROR_OUT_OF_MEMORY);
106 goto retry_smaller;
107 }
108#ifndef NVALGRIND 104#ifndef NVALGRIND
109 VALGRIND_MAKE_MEM_NOACCESS(pool->base, pool->item_size * pool->max); 105 VALGRIND_MAKE_MEM_NOACCESS(pool->base, pool->item_size * pool->max);
110#endif 106#endif
@@ -118,11 +114,8 @@ eina_one_big_malloc(void *data, EINA_UNUSED unsigned int size)
118 } 114 }
119 115
120 retry_smaller: 116 retry_smaller:
121 eina_error_set(0);
122 mem = malloc(sizeof(Eina_Inlist) + pool->item_size); 117 mem = malloc(sizeof(Eina_Inlist) + pool->item_size);
123 if (!mem) 118 if (mem)
124 eina_error_set(EINA_ERROR_OUT_OF_MEMORY);
125 else
126 { 119 {
127 pool->over++; 120 pool->over++;
128 /* Only need to zero list elements and not the payload here */ 121 /* Only need to zero list elements and not the payload here */
diff --git a/src/modules/emotion/gstreamer/emotion_gstreamer.c b/src/modules/emotion/gstreamer/emotion_gstreamer.c
index f678bf06f9..cf40c7f07b 100644
--- a/src/modules/emotion/gstreamer/emotion_gstreamer.c
+++ b/src/modules/emotion/gstreamer/emotion_gstreamer.c
@@ -64,11 +64,6 @@ emotion_video_stream_new(Emotion_Gstreamer_Video *ev)
64 if (!vstream) return NULL; 64 if (!vstream) return NULL;
65 65
66 ev->video_streams = eina_list_append(ev->video_streams, vstream); 66 ev->video_streams = eina_list_append(ev->video_streams, vstream);
67 if (eina_error_get())
68 {
69 free(vstream);
70 return NULL;
71 }
72 return vstream; 67 return vstream;
73} 68}
74 69
@@ -1893,11 +1888,6 @@ _emotion_gstreamer_video_pipeline_parse(Emotion_Gstreamer_Video *ev,
1893 astream = calloc(1, sizeof(Emotion_Audio_Stream)); 1888 astream = calloc(1, sizeof(Emotion_Audio_Stream));
1894 if (!astream) continue; 1889 if (!astream) continue;
1895 ev->audio_streams = eina_list_append(ev->audio_streams, astream); 1890 ev->audio_streams = eina_list_append(ev->audio_streams, astream);
1896 if (eina_error_get())
1897 {
1898 free(astream);
1899 continue;
1900 }
1901 1891
1902 astream->length_time = length_time; 1892 astream->length_time = length_time;
1903 astream->channels = channels; 1893 astream->channels = channels;