summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-10-04 09:31:46 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-10-04 09:31:46 +0000
commit1000f350e370a788ff5b2ff248b36872ccf43a71 (patch)
tree43854493ee2b047781b18e713b0cdef51c1c5667 /src
parentc3fd0444b1d78035b12acf7dde7cec5ff1f37df2 (diff)
efl: backport Igor's eina patch.
SVN revision: 77415
Diffstat (limited to 'src')
-rw-r--r--src/examples/eina/eina_array_01.c2
-rw-r--r--src/examples/eina/eina_array_02.c2
-rw-r--r--src/examples/eina/eina_hash_08.c2
-rw-r--r--src/lib/eina/eina_file_win32.c1
-rw-r--r--src/lib/eina/eina_log.c2
-rw-r--r--src/lib/eina/eina_share_common.c4
-rw-r--r--src/lib/eina/eina_str.c16
-rw-r--r--src/tests/eina/eina_test_error.c4
8 files changed, 6 insertions, 27 deletions
diff --git a/src/examples/eina/eina_array_01.c b/src/examples/eina/eina_array_01.c
index 43a332d87d..f55832d23e 100644
--- a/src/examples/eina/eina_array_01.c
+++ b/src/examples/eina/eina_array_01.c
@@ -23,8 +23,6 @@ main(int argc, char **argv)
23 "skulls", "bulldog", "flat top", "hammerhead", "gonzo" 23 "skulls", "bulldog", "flat top", "hammerhead", "gonzo"
24 }; 24 };
25 Eina_Array *array; 25 Eina_Array *array;
26 Eina_Array_Iterator iterator;
27 char *item;
28 unsigned int i; 26 unsigned int i;
29 27
30 eina_init(); 28 eina_init();
diff --git a/src/examples/eina/eina_array_02.c b/src/examples/eina/eina_array_02.c
index 6b2903b21a..6decdd3392 100644
--- a/src/examples/eina/eina_array_02.c
+++ b/src/examples/eina/eina_array_02.c
@@ -47,7 +47,7 @@ main(int argc, char **argv)
47 47
48 eina_array_remove(array, keep, NULL); 48 eina_array_remove(array, keep, NULL);
49 EINA_ARRAY_ITER_NEXT(array, i, item, iterator) 49 EINA_ARRAY_ITER_NEXT(array, i, item, iterator)
50 printf("item #%d: %s\n", i, item); 50 printf("item #%u: %s\n", i, item);
51 51
52 eina_array_free(array); 52 eina_array_free(array);
53 53
diff --git a/src/examples/eina/eina_hash_08.c b/src/examples/eina/eina_hash_08.c
index ed45f7f90f..ce6a2a56d0 100644
--- a/src/examples/eina/eina_hash_08.c
+++ b/src/examples/eina/eina_hash_08.c
@@ -59,8 +59,6 @@ main(int argc, const char *argv[])
59 int saved_entry_size = sizeof("Alceu Valenca"); 59 int saved_entry_size = sizeof("Alceu Valenca");
60 const char *phone = NULL; 60 const char *phone = NULL;
61 Eina_Bool r; 61 Eina_Bool r;
62 Eina_Iterator *it;
63 void *data;
64 62
65 eina_init(); 63 eina_init();
66 64
diff --git a/src/lib/eina/eina_file_win32.c b/src/lib/eina/eina_file_win32.c
index c010963344..61bd0d19ea 100644
--- a/src/lib/eina/eina_file_win32.c
+++ b/src/lib/eina/eina_file_win32.c
@@ -407,7 +407,6 @@ _eina_file_win32_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **d
407 it->info.type = EINA_FILE_LNK; 407 it->info.type = EINA_FILE_LNK;
408 else if (attr & (FILE_ATTRIBUTE_ARCHIVE | 408 else if (attr & (FILE_ATTRIBUTE_ARCHIVE |
409 FILE_ATTRIBUTE_COMPRESSED | 409 FILE_ATTRIBUTE_COMPRESSED |
410 FILE_ATTRIBUTE_COMPRESSED |
411 FILE_ATTRIBUTE_HIDDEN | 410 FILE_ATTRIBUTE_HIDDEN |
412 FILE_ATTRIBUTE_NORMAL | 411 FILE_ATTRIBUTE_NORMAL |
413 FILE_ATTRIBUTE_SPARSE_FILE | 412 FILE_ATTRIBUTE_SPARSE_FILE |
diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c
index b9c8a9916e..4316eae30a 100644
--- a/src/lib/eina/eina_log.c
+++ b/src/lib/eina/eina_log.c
@@ -320,7 +320,7 @@ eina_log_win32_color_convert(const char *color, const char **endptr)
320 attr |= BACKGROUND_RED; 320 attr |= BACKGROUND_RED;
321 else if (code == 42) 321 else if (code == 42)
322 attr |= BACKGROUND_GREEN; 322 attr |= BACKGROUND_GREEN;
323 else if (code == 44) 323 else if (code == 43)
324 attr |= BACKGROUND_RED | BACKGROUND_GREEN; 324 attr |= BACKGROUND_RED | BACKGROUND_GREEN;
325 else if (code == 44) 325 else if (code == 44)
326 attr |= BACKGROUND_BLUE; 326 attr |= BACKGROUND_BLUE;
diff --git a/src/lib/eina/eina_share_common.c b/src/lib/eina/eina_share_common.c
index 776e429deb..91ad0dbafd 100644
--- a/src/lib/eina/eina_share_common.c
+++ b/src/lib/eina/eina_share_common.c
@@ -241,7 +241,7 @@ _eina_share_common_population_stats(Eina_Share *share)
241 sizeof (share->population_group[0]); 241 sizeof (share->population_group[0]);
242 ++i) 242 ++i)
243 fprintf(stderr, 243 fprintf(stderr,
244 "DDD: %i strings of length %i, max strings: %i\n", 244 "DDD: %i strings of length %u, max strings: %i\n",
245 share->population_group[i].count, 245 share->population_group[i].count,
246 i, 246 i,
247 share->population_group[i].max); 247 share->population_group[i].max);
@@ -935,7 +935,7 @@ eina_share_common_dump(Eina_Share *share, void (*additional_dump)(
935 sizeof (share->population_group[0]); 935 sizeof (share->population_group[0]);
936 ++i) 936 ++i)
937 fprintf(stderr, 937 fprintf(stderr,
938 "DDD: %i strings of length %i, max strings: %i\n", 938 "DDD: %i strings of length %u, max strings: %i\n",
939 share->population_group[i].count, 939 share->population_group[i].count,
940 i, 940 i,
941 share->population_group[i].max); 941 share->population_group[i].max);
diff --git a/src/lib/eina/eina_str.c b/src/lib/eina/eina_str.c
index 9a1a369c3f..5db38394bb 100644
--- a/src/lib/eina/eina_str.c
+++ b/src/lib/eina/eina_str.c
@@ -490,22 +490,6 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
490 outalloc += 64; 490 outalloc += 64;
491 outb += 64; 491 outb += 64;
492 } 492 }
493 else if (errno == EILSEQ)
494 {
495 if (new_txt)
496 free(new_txt);
497
498 new_txt = NULL;
499 break;
500 }
501 else if (errno == EINVAL)
502 {
503 if (new_txt)
504 free(new_txt);
505
506 new_txt = NULL;
507 break;
508 }
509 else 493 else
510 { 494 {
511 if (new_txt) 495 if (new_txt)
diff --git a/src/tests/eina/eina_test_error.c b/src/tests/eina/eina_test_error.c
index 57f69504cc..962f2ded44 100644
--- a/src/tests/eina/eina_test_error.c
+++ b/src/tests/eina/eina_test_error.c
@@ -158,7 +158,7 @@ START_TEST(eina_error_test_lots)
158 158
159 for (i = 0; i < sizeof(codes)/sizeof(codes[0]); i++) 159 for (i = 0; i < sizeof(codes)/sizeof(codes[0]); i++)
160 { 160 {
161 snprintf(buf, sizeof(buf), "myerr-%d", i); 161 snprintf(buf, sizeof(buf), "myerr-%u", i);
162 codes[i] = eina_error_msg_register(buf); 162 codes[i] = eina_error_msg_register(buf);
163 ck_assert_int_ne(codes[i], 0); 163 ck_assert_int_ne(codes[i], 0);
164 } 164 }
@@ -167,7 +167,7 @@ START_TEST(eina_error_test_lots)
167 { 167 {
168 int found; 168 int found;
169 169
170 snprintf(buf, sizeof(buf), "myerr-%d", i); 170 snprintf(buf, sizeof(buf), "myerr-%u", i);
171 171
172 found = eina_error_find(buf); 172 found = eina_error_find(buf);
173 ck_assert_int_eq(codes[i], found); 173 ck_assert_int_eq(codes[i], found);