remove many warnings for 64-bit Windows

diff --git a/src/euc_jp.c b/src/euc_jp.c
index 756bdc719f998794a3c35f7f845936a41a4c0e3b..42c3bcea431eded711c547b033b6a7b814e8f1cb 100644 (file)
--- a/src/euc_jp.c
+++ b/src/euc_jp.c
@@ -152,7 +152,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf)
   if (enclen(ONIG_ENCODING_EUC_JP, buf) != (p - buf))
     return ONIGERR_INVALID_CODE_POINT_VALUE;
 #endif  
-  return p - buf;
+  return (int )(p - buf);
 }
 
 static int
@@ -230,7 +230,7 @@ static int
 property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
   struct PropertyNameCtype* pc;
-  int len = end - p;
+  int len = (int )(end - p);
   char q[32];
 
   if (len < sizeof(q) - 1) {

diff --git a/src/regcomp.c b/src/regcomp.c
index 91c7c1804dd404ff73b80245e2464d12bc561162..e86ceeddcbb5ec9a1ff56ab53cd25fbd22ca0cbc 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -129,7 +129,7 @@ static unsigned char PadBuf[WORD_ALIGNMENT_SIZE];
 static UChar*
 str_dup(UChar* s, UChar* end)
 {
-  int len = end - s;
+  int len = (int )(end - s);
 
   if (len > 0) {
     UChar* r = (UChar* )xmalloc(len + 1);
@@ -151,7 +151,7 @@ swap_node(Node* a, Node* b)
   if (NODE_TYPE(a) == NODE_STRING) {
     StrNode* sn = STR_(a);
     if (sn->capa == 0) {
-      int len = sn->end - sn->s;
+      int len = (int )(sn->end - sn->s);
       sn->s   = sn->buf;
       sn->end = sn->s + len;
     }
@@ -160,7 +160,7 @@ swap_node(Node* a, Node* b)
   if (NODE_TYPE(b) == NODE_STRING) {
     StrNode* sn = STR_(b);
     if (sn->capa == 0) {
-      int len = sn->end - sn->s;
+      int len = (int )(sn->end - sn->s);
       sn->s   = sn->buf;
       sn->end = sn->s + len;
     }
@@ -605,7 +605,8 @@ compile_length_string_raw_node(StrNode* sn, regex_t* reg)
   if (sn->end <= sn->s)
     return 0;
 
-  return add_compile_string_length(sn->s, 1 /* sb */, sn->end - sn->s, reg, 0);
+  return add_compile_string_length(sn->s, 1 /* sb */, (int )(sn->end - sn->s),
+                                   reg, 0);
 }
 
 static int
@@ -654,7 +655,7 @@ compile_string_raw_node(StrNode* sn, regex_t* reg)
   if (sn->end <= sn->s)
     return 0;
 
-  return add_compile_string(sn->s, 1 /* sb */, sn->end - sn->s, reg, 0);
+  return add_compile_string(sn->s, 1 /* sb */, (int )(sn->end - sn->s), reg, 0);
 }
 
 static int
@@ -2938,7 +2939,7 @@ tree_min_len(Node* node, ScanEnv* env)
   case NODE_STRING:
     {
       StrNode* sn = STR_(node);
-      len = sn->end - sn->s;
+      len = (int )(sn->end - sn->s);
     }
     break;
 
@@ -2985,7 +2986,7 @@ tree_min_len(Node* node, ScanEnv* env)
         break;
       case ENCLOSURE_IF_ELSE:
         {
-          int elen;
+          OnigLen elen;
 
           len = tree_min_len(NODE_BODY(node), env);
           if (IS_NOT_NULL(en->te.Then))
@@ -3043,7 +3044,7 @@ tree_max_len(Node* node, ScanEnv* env)
   case NODE_STRING:
     {
       StrNode* sn = STR_(node);
-      len = sn->end - sn->s;
+      len = (OnigLen )(sn->end - sn->s);
     }
     break;
 
@@ -3122,7 +3123,7 @@ tree_max_len(Node* node, ScanEnv* env)
         break;
       case ENCLOSURE_IF_ELSE:
         {
-          int tlen, elen;
+          OnigLen tlen, elen;
 
           len = tree_max_len(NODE_BODY(node), env);
           if (IS_NOT_NULL(en->te.Then)) {
@@ -3670,7 +3671,7 @@ update_string_node_case_fold(regex_t* reg, Node *node)
   StrNode* sn = STR_(node);
 
   end = sn->end;
-  sbuf_size = (end - sn->s) * 2;
+  sbuf_size = (int )(end - sn->s) * 2;
   sbuf = (UChar* )xmalloc(sbuf_size);
   CHECK_NULL_RETURN_MEMERR(sbuf);
   ebuf = sbuf + sbuf_size;
@@ -4921,7 +4922,7 @@ set_bm_skip(UChar* s, UChar* end, OnigEncoding enc ARG_UNUSED,
 {
   int i, len;
 
-  len = end - s;
+  len = (int )(end - s);
   if (len < ONIG_CHAR_TABLE_SIZE) {
     for (i = 0; i < ONIG_CHAR_TABLE_SIZE; i++) skip[i] = len;
 
@@ -5585,7 +5586,7 @@ optimize_nodes(Node* node, NodeOpt* opt, OptEnv* env)
   case NODE_STRING:
     {
       StrNode* sn = STR_(node);
-      int slen = sn->end - sn->s;
+      int slen = (int )(sn->end - sn->s);
       int is_raw = NODE_STRING_IS_RAW(node);
 
       if (! NODE_STRING_IS_AMBIG(node)) {
@@ -5941,7 +5942,7 @@ set_optimize_exact(regex_t* reg, OptExact* e)
   reg->dmax = e->mmd.max;
 
   if (reg->dmin != INFINITE_LEN) {
-    reg->threshold_len = reg->dmin + (reg->exact_end - reg->exact);
+    reg->threshold_len = reg->dmin + (int )(reg->exact_end - reg->exact);
   }
 
   return 0;
@@ -6271,7 +6272,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
 #endif
 
   if (reg->alloc == 0) {
-    init_size = (pattern_end - pattern) * 2;
+    init_size = (int )(pattern_end - pattern) * 2;
     if (init_size <= 0) init_size = COMPILE_INIT_SIZE;
     r = BB_INIT(reg, init_size);
     if (r != 0) goto end;

diff --git a/src/regenc.c b/src/regenc.c
index 97b5052084e28165221ea23438c896643c40698d..7ded5a81e44c75f7ae0e65d2ad121947e5756f72 100644 (file)
--- a/src/regenc.c
+++ b/src/regenc.c
@@ -2,7 +2,7 @@
   regenc.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2016  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2017  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -780,7 +780,7 @@ onigenc_mb2_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
   if (enclen(enc, buf) != (p - buf))
     return ONIGERR_INVALID_CODE_POINT_VALUE;
 #endif
-  return p - buf;
+  return (int )(p - buf);
 }
 
 extern int
@@ -803,7 +803,7 @@ onigenc_mb4_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar *buf)
   if (enclen(enc, buf) != (p - buf))
     return ONIGERR_INVALID_CODE_POINT_VALUE;
 #endif
-  return p - buf;
+  return (int )(p - buf);
 }
 
 extern int

diff --git a/src/regerror.c b/src/regerror.c
index c0d2346232ce2a6685059942339502414f47365e..e7d257080a7c7dd396f105ddb5efdf752cc02898 100644 (file)
--- a/src/regerror.c
+++ b/src/regerror.c
@@ -236,7 +236,7 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
     *is_over = ((p < end) ? 1 : 0);
   }
   else {
-    len = MIN((end - s), buf_size);
+    len = MIN((int )(end - s), buf_size);
     xmemcpy(buf, s, (size_t )len);
     *is_over = ((buf_size < (end - s)) ? 1 : 0);
   }
@@ -300,7 +300,7 @@ onig_error_code_to_str(s, code, va_alist)
       }
     }
     *p = '\0';
-    len = p - s;
+    len = (int )(p - s);
     break;
 
   default:
@@ -340,7 +340,7 @@ onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
   n = xvsnprintf((char* )buf, bufsize, (const char* )fmt, args);
   va_end(args);
 
-  need = (pat_end - pat) * 4 + 4;
+  need = (int )(pat_end - pat) * 4 + 4;
 
   if (n + need < bufsize) {
     xstrcat((char* )buf, ": /", bufsize);

diff --git a/src/regexec.c b/src/regexec.c
index 9ab9369e1ae01aa5c3116b00415acba117745e94..76b4e11939ac8d910b8cf18d7f5675ba1ef6cb11 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -476,7 +476,7 @@ typedef struct _StackType {
 
 
 #define STACK_SAVE do{\
-  msa->stack_n = stk_end - stk_base;\
+    msa->stack_n = (int )(stk_end - stk_base);\
   if (is_alloca != 0) {\
     size_t size = sizeof(StackIndex) * msa->ptr_num \
                 + sizeof(StackType) * msa->stack_n;\
@@ -529,7 +529,7 @@ stack_double(int is_alloca, char** arg_alloc_base,
   stk_end  = *arg_stk_end;
   stk      = *arg_stk;
 
-  n = stk_end - stk_base;
+  n = (unsigned int )(stk_end - stk_base);
   size = sizeof(StackIndex) * msa->ptr_num + sizeof(StackType) * n;
   n *= 2;
   new_size = sizeof(StackIndex) * msa->ptr_num + sizeof(StackType) * n;
@@ -556,7 +556,7 @@ stack_double(int is_alloca, char** arg_alloc_base,
   }
 
   alloc_base = new_alloc_base;
-  used = stk - stk_base;
+  used = (int )(stk - stk_base);
   *arg_alloc_base = alloc_base;
   *arg_stk_base   = (StackType* )(alloc_base
                       + (sizeof(StackIndex) * msa->ptr_num));
@@ -566,7 +566,7 @@ stack_double(int is_alloca, char** arg_alloc_base,
 }
 
 #define STACK_ENSURE(n)        do {\
-  if (stk_end - stk < (n)) {\
+    if ((int )(stk_end - stk) < (n)) {\
     int r = stack_double(is_alloca, &alloc_base, &stk_base, &stk_end, &stk, msa);\
     if (r != 0) { STACK_SAVE; return r; } \
     is_alloca = 0;\
@@ -1541,7 +1541,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
     sbegin = s;
     switch (*p++) {
     case OP_END:  MOP_IN(OP_END);
-      n = s - sstart;
+      n = (int )(s - sstart);
       if (n > best_len) {
         OnigRegion* region;
 #ifdef USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
@@ -1563,18 +1563,19 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
           if (IS_POSIX_REGION(msa->options)) {
             posix_regmatch_t* rmt = (posix_regmatch_t* )region;
 
-            rmt[0].rm_so = keep - str;
-            rmt[0].rm_eo = s    - str;
+            rmt[0].rm_so = (regoff_t )(keep - str);
+            rmt[0].rm_eo = (regoff_t )(s    - str);
             for (i = 1; i <= num_mem; i++) {
               if (mem_end_stk[i] != INVALID_STACK_INDEX) {
                 if (MEM_STATUS_AT(reg->bt_mem_start, i))
-                  rmt[i].rm_so = STACK_AT(mem_start_stk[i])->u.mem.pstr - str;
+                  rmt[i].rm_so = (regoff_t )(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
                 else
-                  rmt[i].rm_so = (UChar* )((void* )(mem_start_stk[i])) - str;
+                  rmt[i].rm_so = (regoff_t )((UChar* )((void* )(mem_start_stk[i])) - str);
 
-                rmt[i].rm_eo = (MEM_STATUS_AT(reg->bt_mem_end, i)
-                                ? STACK_AT(mem_end_stk[i])->u.mem.pstr
-                                : (UChar* )((void* )mem_end_stk[i])) - str;
+                rmt[i].rm_eo = (regoff_t )((MEM_STATUS_AT(reg->bt_mem_end, i)
+                                            ? STACK_AT(mem_end_stk[i])->u.mem.pstr
+                                            : (UChar* )((void* )mem_end_stk[i]))
+                                           - str);
               }
               else {
                 rmt[i].rm_so = rmt[i].rm_eo = ONIG_REGION_NOTPOS;
@@ -1583,18 +1584,18 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
           }
           else {
 #endif /* USE_POSIX_API_REGION_OPTION */
-            region->beg[0] = keep - str;
-            region->end[0] = s    - str;
+            region->beg[0] = (int )(keep - str);
+            region->end[0] = (int )(s    - str);
             for (i = 1; i <= num_mem; i++) {
               if (mem_end_stk[i] != INVALID_STACK_INDEX) {
                 if (MEM_STATUS_AT(reg->bt_mem_start, i))
-                  region->beg[i] = STACK_AT(mem_start_stk[i])->u.mem.pstr - str;
+                  region->beg[i] = (int )(STACK_AT(mem_start_stk[i])->u.mem.pstr - str);
                 else
-                  region->beg[i] = (UChar* )((void* )mem_start_stk[i]) - str;
+                  region->beg[i] = (int )((UChar* )((void* )mem_start_stk[i]) - str);
 
-                region->end[i] = (MEM_STATUS_AT(reg->bt_mem_end, i)
-                                  ? STACK_AT(mem_end_stk[i])->u.mem.pstr
-                                  : (UChar* )((void* )mem_end_stk[i])) - str;
+                region->end[i] = (int )((MEM_STATUS_AT(reg->bt_mem_end, i)
+                                         ? STACK_AT(mem_end_stk[i])->u.mem.pstr
+                                         : (UChar* )((void* )mem_end_stk[i])) - str);
               }
               else {
                 region->beg[i] = region->end[i] = ONIG_REGION_NOTPOS;
@@ -1616,8 +1617,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
               }
 
               node->group = 0;
-              node->beg   = keep - str;
-              node->end   = s    - str;
+              node->beg   = (int )(keep - str);
+              node->end   = (int )(s    - str);
 
               stkp = stk_base;
               r = make_capture_history_tree(region->history_root, &stkp,
@@ -2437,7 +2438,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         pend = (MEM_STATUS_AT(reg->bt_mem_end, mem)
                 ? STACK_AT(mem_end_stk[mem])->u.mem.pstr
                 : (UChar* )((void* )mem_end_stk[mem]));
-        n = pend - pstart;
+        n = (int )(pend - pstart);
         DATA_ENSURE(n);
         sprev = s;
         STRING_CMP(pstart, s, n);
@@ -2466,7 +2467,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         pend = (MEM_STATUS_AT(reg->bt_mem_end, mem)
                 ? STACK_AT(mem_end_stk[mem])->u.mem.pstr
                 : (UChar* )((void* )mem_end_stk[mem]));
-        n = pend - pstart;
+        n = (int )(pend - pstart);
         DATA_ENSURE(n);
         sprev = s;
         STRING_CMP_IC(case_fold_flag, pstart, &s, n);
@@ -2498,7 +2499,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
           pend = (MEM_STATUS_AT(reg->bt_mem_end, mem)
                   ? STACK_AT(mem_end_stk[mem])->u.mem.pstr
                   : (UChar* )((void* )mem_end_stk[mem]));
-          n = pend - pstart;
+          n = (int )(pend - pstart);
           DATA_ENSURE(n);
           sprev = s;
           swork = s;
@@ -2537,7 +2538,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
           pend = (MEM_STATUS_AT(reg->bt_mem_end, mem)
                   ? STACK_AT(mem_end_stk[mem])->u.mem.pstr
                   : (UChar* )((void* )mem_end_stk[mem]));
-          n = pend - pstart;
+          n = (int )(pend - pstart);
           DATA_ENSURE(n);
           sprev = s;
           swork = s;
@@ -3263,7 +3264,7 @@ bm_search_notrev(regex_t* reg, const UChar* target, const UChar* target_end,
 #endif
 
   tail = target_end - 1;
-  tlen1 = tail - target;
+  tlen1 = (int )(tail - target);
   end = text_range;
   if (end + tlen1 > text_end)
     end = text_end - tlen1;
@@ -4098,7 +4099,7 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end,
 
  match:
   MATCH_ARG_FREE(msa);
-  return s - str;
+  return (int )(s - str);
 }
 
 extern int

diff --git a/src/regext.c b/src/regext.c
index 62a557ce9a536a85e1231ac759606df92494d3ae..996d043f568ef62ab6868b771ce9e418acfa70a8 100644 (file)
--- a/src/regext.c
+++ b/src/regext.c
@@ -95,7 +95,7 @@ static int
 conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* end,
               UChar** conv, UChar** conv_end)
 {
-  int len = end - s;
+  int len = (int )(end - s);
 
   if (to == ONIG_ENCODING_UTF16_BE) {
     if (from == ONIG_ENCODING_ASCII || from == ONIG_ENCODING_ISO_8859_1) {

diff --git a/src/reggnu.c b/src/reggnu.c
index 1de82fb078d2daa33209fbac8c53f132b884facd..50eb9b434e1278fac86b3e86457e724ecf886627 100644 (file)
--- a/src/reggnu.c
+++ b/src/reggnu.c
@@ -2,7 +2,7 @@
   reggnu.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2017  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@ re_adjust_startpos(regex_t* reg, const char* string, int size,
     else {
       p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, (UChar* )string, s);
     }
-    return p - (UChar* )string;
+    return (int )(p - (UChar* )string);
   }
 
   return startpos;

diff --git a/src/regparse.c b/src/regparse.c
index 3bbd6c749c62c54f118f07c0ae1486b748e9661a..a26a404fddddf6d86038444b2cdeaf126b097054 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -282,7 +282,7 @@ onig_strncmp(const UChar* s1, const UChar* s2, int n)
 extern void
 onig_strcpy(UChar* dest, const UChar* src, const UChar* end)
 {
-  int len = end - src;
+  int len = (int )(end - src);
   if (len > 0) {
     xmemcpy(dest, src, len);
     dest[len] = (UChar )0;
@@ -295,7 +295,7 @@ strdup_with_null(OnigEncoding enc, UChar* s, UChar* end)
   int slen, term_len, i;
   UChar *r;
 
-  slen = end - s;
+  slen = (int )(end - s);
   term_len = ONIGENC_MBC_MINLEN(enc);
 
   r = (UChar* )xmalloc(slen + term_len);
@@ -834,7 +834,7 @@ name_add(regex_t* reg, UChar* name, UChar* name_end, int backref, ScanEnv* env)
                               (HashDataType )e);
     if (r < 0) return r;
 
-    e->name_len   = name_end - name;
+    e->name_len   = (int )(name_end - name);
     e->back_num   = 0;
     e->back_alloc = 0;
     e->back_refs  = (int* )NULL;
@@ -2051,10 +2051,10 @@ make_absent_tree(Node** node, Node* absent, Node* expr, int is_range_cutter,
 extern int
 onig_node_str_cat(Node* node, const UChar* s, const UChar* end)
 {
-  int addlen = end - s;
+  int addlen = (int )(end - s);
 
   if (addlen > 0) {
-    int len  = STR_(node)->end - STR_(node)->s;
+    int len  = (int )(STR_(node)->end - STR_(node)->s);
 
     if (STR_(node)->capa > 0 || (len + addlen > NODE_STRING_BUF_SIZE - 1)) {
       UChar* p;
@@ -4819,7 +4819,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
   case ONIGENC_CTYPE_ASCII:
   case ONIGENC_CTYPE_ALNUM:
     if (not != 0) {
-      for (c = 0; c < limit; c++) {
+      for (c = 0; c < (int )limit; c++) {
         if (! ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
           BITSET_SET_BIT(cc->bs, c);
       }
@@ -4830,7 +4830,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
       ADD_ALL_MULTI_BYTE_RANGE(enc, cc->mbuf);
     }
     else {
-      for (c = 0; c < limit; c++) {
+      for (c = 0; c < (int )limit; c++) {
         if (ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
           BITSET_SET_BIT(cc->bs, c);
       }
@@ -4841,7 +4841,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
   case ONIGENC_CTYPE_PRINT:
   case ONIGENC_CTYPE_WORD:
     if (not != 0) {
-      for (c = 0; c < limit; c++) {
+      for (c = 0; c < (int )limit; c++) {
         if (ONIGENC_CODE_TO_MBCLEN(enc, c) > 0 /* check invalid code point */
             && ! ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
           BITSET_SET_BIT(cc->bs, c);
@@ -4852,7 +4852,7 @@ add_ctype_to_cc(CClassNode* cc, int ctype, int not, ScanEnv* env)
       }
     }
     else {
-      for (c = 0; c < limit; c++) {
+      for (c = 0; c < (int )limit; c++) {
         if (ONIGENC_IS_CODE_CTYPE(enc, (OnigCodePoint )c, ctype))
           BITSET_SET_BIT(cc->bs, c);
       }

diff --git a/src/regparse.h b/src/regparse.h
index d43828eff36d356ec5d19ac5c8f01555c64e6e52..99fe7c9b9fe448d1c09a318d7b2d4b5ceb9b1bf4 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -115,7 +115,7 @@ enum EnclosureType {
 #define STRING_AMBIG              (1<<1)
 #define STRING_DONT_GET_OPT_INFO  (1<<2)
 
-#define NODE_STRING_LEN(node)             ((node)->u.str.end - (node)->u.str.s)
+#define NODE_STRING_LEN(node)            (int )((node)->u.str.end - (node)->u.str.s)
 #define NODE_STRING_SET_RAW(node)          (node)->u.str.flag |= STRING_RAW
 #define NODE_STRING_CLEAR_RAW(node)        (node)->u.str.flag &= ~STRING_RAW
 #define NODE_STRING_SET_AMBIG(node)        (node)->u.str.flag |= STRING_AMBIG

diff --git a/src/regposix.c b/src/regposix.c
index 32b11b591a41320c25ffc34c2bc9a4f86c3795b2..0fdbcbb0229b63162758ef3a7f1f851840a15bc1 100644 (file)
--- a/src/regposix.c
+++ b/src/regposix.c
@@ -40,7 +40,7 @@
   if (ONIGENC_MBC_MINLEN(enc) == 1) { \
     UChar* tmps = (UChar* )(s); \
     while (*tmps != 0) tmps++; \
-    len = tmps - (UChar* )(s); \
+    len = (int )(tmps - (UChar* )(s));\
   } \
   else { \
     len = onigenc_str_bytelen_null(enc, (UChar* )s); \

diff --git a/src/sjis.c b/src/sjis.c
index 33784748275b15cf741ff188da4e981375147494..88b8d0299cbbfac59ffc45129904e676e8c76b5c 100644 (file)
--- a/src/sjis.c
+++ b/src/sjis.c
@@ -2,7 +2,7 @@
   sjis.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2016  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2017  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -156,7 +156,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf)
   if (enclen(ONIG_ENCODING_SJIS, buf) != (p - buf))
     return REGERR_INVALID_CODE_POINT_VALUE;
 #endif
-  return p - buf;
+  return (int )(p - buf);
 }
 
 static int
@@ -262,7 +262,7 @@ static int
 property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
   struct PropertyNameCtype* pc;
-  int len = end - p;
+  int len = (int )(end - p);
   char q[32];
 
   if (len < sizeof(q) - 1) {

diff --git a/src/unicode.c b/src/unicode.c
index 4afa72cfd73265c681285019aec938270606f3b4..61d79c19367f6cd470dfabd872ca3758a53223ad 100644 (file)
--- a/src/unicode.c
+++ b/src/unicode.c
@@ -743,7 +743,7 @@ onig_unicode_define_user_property(const char* name, OnigCodePoint* ranges)
   if (UserDefinedPropertyNum >= USER_DEFINED_PROPERTY_MAX_NUM)
     return ONIGERR_TOO_MANY_USER_DEFINED_OBJECTS;
 
-  len = strlen(name);
+  len = (int )strlen(name);
   if (len >= PROPERTY_NAME_MAX_SIZE)
     return ONIGERR_TOO_LONG_PROPERTY_NAME;
 

diff --git a/src/utf8.c b/src/utf8.c
index 1ad965311899cf224ae0c873de341bef66884598..e5e59b291484197d956bd3b499e0ce7a059fbe11 100644 (file)
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -2,7 +2,7 @@
   utf8.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2016  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2017  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -124,7 +124,7 @@ mbc_to_code(const UChar* p, const UChar* end)
   OnigCodePoint n;
 
   len = mbc_enc_len(p);
-  if (len > end - p) len = end - p;
+  if (len > (int )(end - p)) len = (int )(end - p);
 
   c = *p++;
   if (len > 1) {
@@ -216,7 +216,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf)
     }
 
     *p++ = UTF8_TRAIL0(code);
-    return p - buf;
+    return (int )(p - buf);
   }
 }