Changeset 387 for asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale

Timestamp:

May 22, 2019, 4:09:18 PM (5 years ago)

Author:

coas-nagasima

Message:

ファイルディスクリプタ処理を更新

Location:

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale

Files:

• __lctrans.c (modified) (1 diff)
• __mo_lookup.c (modified) (1 diff)
• iconv.c (modified) (3 diffs)
• locale_map.c (modified) (1 diff)

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/__lctrans.c

@@ -8 +8 @@
 }
 
-#ifndef __c2__
 weak_alias(dummy, __lctrans_impl);
-#endif
 
 const char *__lctrans(const char *msg, const struct __locale_map *lm)

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/__mo_lookup.c

@@ -4 +4 @@
 static inline uint32_t swapc(uint32_t x, int c)
 {
-        return c ? x>>24 | x>>8&0xff00 | x<<8&0xff0000 | x<<24 : x;
+        return c ? (x>>24) | (x>>8&0xff00) | (x<<8&0xff0000) | (x<<24) : x;
 }
 

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/iconv.c

@@ -136 +136 @@
 {
         e &= 3;
-        return s[e]+0U<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
+        return (s[e]+0U)<<24 | s[e^1]<<16 | s[e^2]<<8 | s[e^3];
 }
 
@@ -156 +156 @@
         unsigned x = c - 128 - map[-1];
         x = legacy_chars[ map[x*5/4]>>2*x%8 |
-                map[x*5/4+1]<<8-2*x%8 & 1023 ];
+                (map[x*5/4+1]<<(8-2*x%8) & 1023) ];
         return x ? x : c;
 }
@@ -348 +348 @@
                                 c += (0xa1-0x81);
                                 d += 0xa1;
-                                if (c >= 93 || c>=0xc6-0x81 && d>0x52)
+                                if (c >= 93 || (c>=0xc6-0x81 && d>0x52))
                                         goto ilseq;
                                 if (d-'A'<26) d = d-'A';

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/locale/locale_map.c

@@ -36 +36 @@
 
         if (!*val) {
-                (val = getenv("LC_ALL")) && *val ||
-                (val = getenv(envvars[cat])) && *val ||
-                (val = getenv("LANG")) && *val ||
+                ((val = getenv("LC_ALL")) && *val) ||
+                ((val = getenv(envvars[cat])) && *val) ||
+                ((val = getenv("LANG")) && *val) ||
                 (val = "C.UTF-8");
         }