eina: Fixes typo and removes redundant duplicate code.
authorcedric <cedric>
Thu, 4 Oct 2012 01:42:15 +0000 (01:42 +0000)
committercedric <cedric@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 4 Oct 2012 01:42:15 +0000 (01:42 +0000)
Patch by Igor Murzov <e-mail@date.by>

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eina@77391 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

AUTHORS
src/lib/eina_file_win32.c
src/lib/eina_log.c
src/lib/eina_str.c

diff --git a/AUTHORS b/AUTHORS
index 7ee2d6c..2fe4065 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,3 +26,4 @@ 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>
\ No newline at end of file
index c010963..61bd0d1 100644 (file)
@@ -407,7 +407,6 @@ _eina_file_win32_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **d
      it->info.type = EINA_FILE_LNK;
    else if (attr & (FILE_ATTRIBUTE_ARCHIVE |
                     FILE_ATTRIBUTE_COMPRESSED |
-                    FILE_ATTRIBUTE_COMPRESSED |
                     FILE_ATTRIBUTE_HIDDEN |
                     FILE_ATTRIBUTE_NORMAL |
                     FILE_ATTRIBUTE_SPARSE_FILE |
index b9c8a99..4316eae 100644 (file)
@@ -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;
index 9a1a369..5db3839 100644 (file)
@@ -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)