[Emacs-diffs] trunk r117778: * sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno.

[Michael Albinus]

------------------------------------------------------------
revno: 117778
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2014-08-29 23:19:45 +0200
message:
  * sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/sysdep.c                   sysdep.c-20091113204419-o5vbwnq5f7feedwu-448

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-08-29 20:16:40 +0000
+++ b/src/ChangeLog     2014-08-29 21:19:45 +0000
@@ -1,9 +1,13 @@
+2014-08-29  Michael Albinus  <address@hidden>
+
+       * sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno.
+
 2014-08-29  Paul Eggert  <address@hidden>
 
-       * sysdep.c (str_collate): Do not look at errno after towlower_l.
-       errno's value is not specified after towlower_l.  Instead, assume
-       that towlower_l returns its argument on failure, which is portable
-       in practice.
+       * sysdep.c (str_collate) [__STDC_ISO_10646__]: Do not look at
+       errno after towlower_l.  errno's value is not specified after
+       towlower_l.  Instead, assume that towlower_l returns its argument
+       on failure, which is portable in practice.
 
 2014-08-29  Eli Zaretskii  <address@hidden>
 

=== modified file 'src/sysdep.c'
--- a/src/sysdep.c      2014-08-29 20:16:40 +0000
+++ b/src/sysdep.c      2014-08-29 21:19:45 +0000
@@ -3740,6 +3740,8 @@
     FETCH_STRING_CHAR_ADVANCE (*(p2+i-1), s2, i, i_byte);
   *(p2+len) = 0;
 
+  errno = 0;
+
   if (STRINGP (locale))
     {
       locale_t loc = newlocale (LC_COLLATE_MASK | LC_CTYPE_MASK,
@@ -3761,7 +3763,6 @@
     }
   else
     {
-      errno = 0;
       if (! NILP (ignore_case))
        for (int i = 1; i < 3; i++)
          {
@@ -3769,6 +3770,7 @@
            for (; *p; p++)
              *p = towlower (*p);
          }
+
       res = wcscoll (p1, p2);
       err = errno;
     }