X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fword.c;h=0e80452eecc26aa2503c9a103dbd6418257833a2;hp=e4b9af87bb7fbd5a617dfc0c43df66ab9f382d85;hb=ffe8e22a52a385d795889c5cabbde2f277342e32;hpb=3daa13d36f562d9c2ff93b4b68643fc88a446335

diff --git a/src/word.c b/src/word.c
index e4b9af8..0e80452 100644
--- a/src/word.c
+++ b/src/word.c
@@ -14,7 +14,7 @@ WORD n2word(const char *str)
     }
     /* nが-32768〜32767の範囲にないときは、その下位16ビットを格納 */
     if(n < -32768 || n > 32767) {
-        n = n % 0x10000;
+        n = n & 0xFFFF;
     }
     return (WORD)n;
 }
@@ -23,7 +23,7 @@ WORD n2word(const char *str)
 WORD h2word(const char *str)
 {
     assert(*str == '#');
-    WORD w = 0x0;
+    WORD word = 0x0;
     char *check;
     str++;
     if(*str == '-' || strlen(str) > 4) {
@@ -31,16 +31,16 @@ WORD h2word(const char *str)
         return 0;
     }
     /* WORD値に変換 */
-    w = (WORD)strtol(str, &check, 16);
+    word = (WORD)strtol(str, &check, 16);
     if(*check != '\0') {
         setcerr(115, str-1);    /* not hex */
         return 0x0;
     }
-    return w;
+    return word;
 }
 
 /* 10進数または16進数の文字列をWORD値に変換 */
-WORD a2word(const char *str)
+WORD nh2word(const char *str)
 {
     WORD word;
     if(!isdigit(*str) && *str != '-' && *str != '#') {