Commit f12ded49 authored by unknown's avatar unknown
Browse files

ctype-big5.c: 

ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:

  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.


strings/ctype-big5.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-cp932.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-gbk.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-mb.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-simple.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-sjis.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-ucs2.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-ujis.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
strings/ctype-utf8.c:
  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
parent d66d45ef

strings/ctype-big5.c

+1 −1
Original line number Diff line number Diff line
@@ -6309,7 +6309,7 @@ uint my_well_formed_len_big5(CHARSET_INFO *cs __attribute__((unused)), 
      break;

    }

  }

  return b - b0;

  return (uint) (b - b0);

}

strings/ctype-cp932.c

+2 −2
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static int my_strnncoll_cp932_internal(CHARSET_INFO *cs, 
      uint a_char= cp932code(*a, *(a+1));

      uint b_char= cp932code(*b, *(b+1));

      if (a_char != b_char)

	return a_char - b_char;

	return (int) a_char - (int) b_char;

      a += 2;

      b += 2;

    } else
@@ -5449,7 +5449,7 @@ uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)), 
      break;

    }

  }

  return b - b0;

  return (uint) (b - b0);

}

strings/ctype-gbk.c

+1 −1
Original line number Diff line number Diff line
@@ -9956,7 +9956,7 @@ uint my_well_formed_len_gbk(CHARSET_INFO *cs __attribute__((unused)), 
      break;

    }

  }

  return b - b0;

  return (uint) (b - b0);

}

































strings/ctype-mb.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -260,7 +260,7 @@ uint my_charpos_mb(CHARSET_INFO *cs __attribute__((unused)),







    pos+= (mblen= my_ismbchar(cs, pos, end)) ? mblen : 1;









    length--;









  }









  return length ? end+2-start : pos-start;









  return length ? (uint) (end + 2 - start) : (uint) (pos - start);









}




























@@ -282,7 +282,7 @@ uint my_well_formed_len_mb(CHARSET_INFO *cs, const char *b, const char *e,







    b+= mblen;









    pos--;









  }









  return b - b_start;









  return (uint) (b - b_start);









}




















































strings/ctype-simple.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -1051,7 +1051,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)







    if (*str == '.')









    {









      for(str++ ; str != end && *str == '0' ; str++);









      return str-str0;









      return (ulong) (str - str0);









    }









    return 0;


















@@ -1061,7 +1061,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)







      if (!my_isspace(cs,*str))









        break;









    }









    return str-str0;









    return (ulong) (str - str0);









  default:









    return 0;









  }








@@ -1078,14 +1078,14 @@ void my_fill_8bit(CHARSET_INFO *cs __attribute__((unused)),







uint my_numchars_8bit(CHARSET_INFO *cs __attribute__((unused)),









		      const char *b, const char *e)









{









  return e-b;









  return (uint) (e - b);









}





























uint my_numcells_8bit(CHARSET_INFO *cs __attribute__((unused)),









		      const char *b, const char *e)









{









  return e-b;









  return (uint) (e - b);









}