efl: backport Igor's eina patch.

SVN revision: 77415

AUTHORS

@@ -41,6 +41,7 @@ Raphael Kubo da Costa <rakuco@freebsd.org>
 Jérôme Pinot <ngc891@gmail.com>
 Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
 Patryk Kaczmarek <patryk.k@samsung.com>
+Igor Murzov <e-mail@date.by>
 
 Eet
 ---

src/examples/eina/eina_array_01.c

@@ -23,8 +23,6 @@ main(int argc, char **argv)
       "skulls", "bulldog", "flat top", "hammerhead", "gonzo"
    };
    Eina_Array *array;
-   Eina_Array_Iterator iterator;
-   char *item;
    unsigned int i;
 
    eina_init();

src/examples/eina/eina_array_02.c

@@ -47,7 +47,7 @@ main(int argc, char **argv)
 
    eina_array_remove(array, keep, NULL);
    EINA_ARRAY_ITER_NEXT(array, i, item, iterator)
-     printf("item #%d: %s\n", i, item);
+     printf("item #%u: %s\n", i, item);
 
    eina_array_free(array);
 

src/examples/eina/eina_hash_08.c

@@ -59,8 +59,6 @@ main(int argc, const char *argv[])
    int saved_entry_size = sizeof("Alceu Valenca");
    const char *phone = NULL;
    Eina_Bool r;
-   Eina_Iterator *it;
-   void *data;
 
    eina_init();
 

src/lib/eina/eina_file_win32.c

@@ -406,7 +406,6 @@ _eina_file_win32_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **d
    else if (attr & FILE_ATTRIBUTE_REPARSE_POINT)
      it->info.type = EINA_FILE_LNK;
    else if (attr & (FILE_ATTRIBUTE_ARCHIVE |
-                    FILE_ATTRIBUTE_COMPRESSED |
                     FILE_ATTRIBUTE_COMPRESSED |
                     FILE_ATTRIBUTE_HIDDEN |
                     FILE_ATTRIBUTE_NORMAL |

src/lib/eina/eina_log.c

@@ -320,7 +320,7 @@ eina_log_win32_color_convert(const char *color, const char **endptr)
                     attr |= BACKGROUND_RED;
                   else if (code == 42)
                     attr |= BACKGROUND_GREEN;
-                  else if (code == 44)
+                  else if (code == 43)
                     attr |= BACKGROUND_RED | BACKGROUND_GREEN;
                   else if (code == 44)
                     attr |= BACKGROUND_BLUE;

src/lib/eina/eina_share_common.c

@@ -241,7 +241,7 @@ _eina_share_common_population_stats(Eina_Share *share)
         sizeof (share->population_group[0]);
         ++i)
       fprintf(stderr,
-              "DDD: %i strings of length %i, max strings: %i\n",
+              "DDD: %i strings of length %u, max strings: %i\n",
               share->population_group[i].count,
               i,
               share->population_group[i].max);
@@ -935,7 +935,7 @@ eina_share_common_dump(Eina_Share *share, void (*additional_dump)(
         sizeof (share->population_group[0]);
         ++i)
       fprintf(stderr,
-              "DDD: %i strings of length %i, max strings: %i\n",
+              "DDD: %i strings of length %u, max strings: %i\n",
               share->population_group[i].count,
               i,
               share->population_group[i].max);

src/lib/eina/eina_str.c

@@ -490,22 +490,6 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
                   outalloc += 64;
                   outb += 64;
                }
-             else if (errno == EILSEQ)
-               {
-                  if (new_txt)
-                     free(new_txt);
-
-                  new_txt = NULL;
-                  break;
-               }
-             else if (errno == EINVAL)
-               {
-                  if (new_txt)
-                     free(new_txt);
-
-                  new_txt = NULL;
-                  break;
-               }
              else
                {
                   if (new_txt)

src/tests/eina/eina_test_error.c

@@ -158,7 +158,7 @@ START_TEST(eina_error_test_lots)
 
    for (i = 0; i < sizeof(codes)/sizeof(codes[0]); i++)
      {
-        snprintf(buf, sizeof(buf), "myerr-%d", i);
+        snprintf(buf, sizeof(buf), "myerr-%u", i);
         codes[i] = eina_error_msg_register(buf);
         ck_assert_int_ne(codes[i], 0);
      }
@@ -167,7 +167,7 @@ START_TEST(eina_error_test_lots)
      {
         int found;
 
-        snprintf(buf, sizeof(buf), "myerr-%d", i);
+        snprintf(buf, sizeof(buf), "myerr-%u", i);
 
         found = eina_error_find(buf);
         ck_assert_int_eq(codes[i], found);