Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2349 05/07/26 16:38:10 bar@stripped +9 -0
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-utf8.c
1.87 05/07/26 16:36:41 bar@stripped +1 -1
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-ujis.c
1.63 05/07/26 16:36:40 bar@stripped +5 -5
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-ucs2.c
1.42 05/07/26 16:36:38 bar@stripped +4 -4
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-sjis.c
1.79 05/07/26 16:36:31 bar@stripped +2 -2
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-simple.c
1.65 05/07/26 16:36:29 bar@stripped +4 -4
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-mb.c
1.40 05/07/26 16:36:27 bar@stripped +2 -2
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-gbk.c
1.70 05/07/26 16:36:25 bar@stripped +1 -1
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-cp932.c
1.5 05/07/26 16:36:22 bar@stripped +2 -2
Adding explicit cast to return type
in pointer substructions to avoid
warnings from some compilers.
strings/ctype-big5.c
1.75 05/07/26 16:35:24 bar@stripped +1 -1
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.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: bar
# Host: bar.intranet.mysql.r18.ru
# Root: /usr/home/bar/mysql-4.1
--- 1.74/strings/ctype-big5.c 2005-07-06 17:13:57 +05:00
+++ 1.75/strings/ctype-big5.c 2005-07-26 16:35:24 +05:00
@@ -6309,7 +6309,7 @@
break;
}
}
- return b - b0;
+ return (uint) (b - b0);
}
--- 1.69/strings/ctype-gbk.c 2005-07-22 21:04:37 +05:00
+++ 1.70/strings/ctype-gbk.c 2005-07-26 16:36:25 +05:00
@@ -9956,7 +9956,7 @@
break;
}
}
- return b - b0;
+ return (uint) (b - b0);
}
--- 1.78/strings/ctype-sjis.c 2005-07-06 17:13:58 +05:00
+++ 1.79/strings/ctype-sjis.c 2005-07-26 16:36:31 +05:00
@@ -213,7 +213,7 @@
uint a_char= sjiscode(*a, *(a+1));
uint b_char= sjiscode(*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
@@ -4605,7 +4605,7 @@
break;
}
}
- return b - b0;
+ return (uint) (b - b0);
}
--- 1.62/strings/ctype-ujis.c 2005-04-06 11:53:09 +05:00
+++ 1.63/strings/ctype-ujis.c 2005-07-26 16:36:40 +05:00
@@ -8270,7 +8270,7 @@
if (b >= (uchar *) end) /* need more bytes */
{
*error= 1;
- return chbeg - beg; /* unexpected EOL */
+ return (uint) (chbeg - beg); /* unexpected EOL */
}
if (ch == 0x8E) /* [x8E][xA0-xDF] */
@@ -8278,7 +8278,7 @@
if (*b >= 0xA0 && *b <= 0xDF)
continue;
*error= 1;
- return chbeg - beg; /* invalid sequence */
+ return (uint) (chbeg - beg); /* invalid sequence */
}
if (ch == 0x8F) /* [x8F][xA1-xFE][xA1-xFE] */
@@ -8287,7 +8287,7 @@
if (b >= (uchar*) end)
{
*error= 1;
- return chbeg - beg; /* unexpected EOL */
+ return (uint) (chbeg - beg);/* unexpected EOL */
}
}
@@ -8295,9 +8295,9 @@
*b >= 0xA1 && *b <= 0xFE) /* [xA1-xFE][xA1-xFE] */
continue;
*error= 1;
- return chbeg - beg; /* invalid sequence */
+ return (uint) (chbeg - beg); /* invalid sequence */
}
- return b - (uchar *) beg;
+ return (uint) (b - (uchar *) beg);
}
--- 1.41/strings/ctype-ucs2.c 2005-06-28 14:58:58 +05:00
+++ 1.42/strings/ctype-ucs2.c 2005-07-26 16:36:38 +05:00
@@ -215,7 +215,7 @@
s+=s_res;
t+=t_res;
}
- return t_is_prefix ? t-te : ((se-s) - (te-t));
+ return t_is_prefix ? (int) (t - te) : (int) ((se - s) - (te - t));
}
/*
@@ -326,7 +326,7 @@
s+=s_res;
t+=t_res;
}
- return ( (se-s) - (te-t) );
+ return (int) ( (se-s) - (te-t) );
}
@@ -1349,7 +1349,7 @@
s+=s_res;
t+=t_res;
}
- return t_is_prefix ? t-te : ((se-s) - (te-t));
+ return t_is_prefix ? (int) (t - te) : (int) ((se-s) - (te-t));
}
static int my_strnncollsp_ucs2_bin(CHARSET_INFO *cs,
@@ -1494,7 +1494,7 @@
if (str[0] != '\0' || str[1] != ' ')
break;
}
- return str - str0;
+ return (ulong) (str - str0);
default:
return 0;
}
--- 1.39/strings/ctype-mb.c 2005-04-06 15:12:35 +05:00
+++ 1.40/strings/ctype-mb.c 2005-07-26 16:36:27 +05:00
@@ -260,7 +260,7 @@
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 @@
b+= mblen;
pos--;
}
- return b - b_start;
+ return (uint) (b - b_start);
}
--- 1.64/strings/ctype-simple.c 2005-07-06 17:13:58 +05:00
+++ 1.65/strings/ctype-simple.c 2005-07-26 16:36:29 +05:00
@@ -1051,7 +1051,7 @@
if (*str == '.')
{
for(str++ ; str != end && *str == '0' ; str++);
- return str-str0;
+ return (ulong) (str - str0);
}
return 0;
@@ -1061,7 +1061,7 @@
if (!my_isspace(cs,*str))
break;
}
- return str-str0;
+ return (ulong) (str - str0);
default:
return 0;
}
@@ -1078,14 +1078,14 @@
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);
}
--- 1.86/strings/ctype-utf8.c 2005-07-19 16:47:11 +05:00
+++ 1.87/strings/ctype-utf8.c 2005-07-26 16:36:41 +05:00
@@ -2008,7 +2008,7 @@
s+=s_res;
t+=t_res;
}
- return t_is_prefix ? t-te : ((se-s) - (te-t));
+ return t_is_prefix ? (int) (t-te) : (int) ((se-s) - (te-t));
}
--- 1.4/strings/ctype-cp932.c 2005-07-21 13:09:45 +05:00
+++ 1.5/strings/ctype-cp932.c 2005-07-26 16:36:22 +05:00
@@ -213,7 +213,7 @@
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 @@
break;
}
}
- return b - b0;
+ return (uint) (b - b0);
}
| Thread |
|---|
| • bk commit into 4.1 tree (bar:1.2349) | bar | 26 Jul |
