diff options
| author | bell@sanja.is.com.ua <> | 2005-02-09 11:35:22 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2005-02-09 11:35:22 +0200 |
| commit | 7df94d5e9b8dfc817afccf8abab4852034d87ba7 (patch) | |
| tree | efddb0ebd8ec9b101083b5d5690ce8ed839be169 /strings/decimal.c | |
| parent | 96558f6ad3ed107b6ff0645db4b496b62ca049e9 (diff) | |
| download | mariadb-git-7df94d5e9b8dfc817afccf8abab4852034d87ba7.tar.gz | |
fixed C++ syntax in C code
fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory
Diffstat (limited to 'strings/decimal.c')
| -rw-r--r-- | strings/decimal.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index 937ceb2f59b..da704280189 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -686,12 +686,13 @@ int decimal_shift(decimal *dec, int shift) { /* need to move digits */ int d_shift; + dec1 *to, *barier; if (new_front > 0) { /* move left */ d_shift= new_front / DIG_PER_DEC1; - dec1 *to= dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift); - dec1 *barier= dec->buf + (ROUND_UP(end) - 1 - d_shift); + to= dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift); + barier= dec->buf + (ROUND_UP(end) - 1 - d_shift); DBUG_ASSERT(to >= dec->buf); DBUG_ASSERT(barier + d_shift < dec->buf + dec->len); for(; to <= barier; to++) @@ -704,8 +705,8 @@ int decimal_shift(decimal *dec, int shift) { /* move right */ d_shift= (1 - new_front) / DIG_PER_DEC1; - dec1 *to= dec->buf + ROUND_UP(end) - 1 + d_shift; - dec1 *barier= dec->buf + ROUND_UP(beg + 1) - 1 + d_shift; + to= dec->buf + ROUND_UP(end) - 1 + d_shift; + barier= dec->buf + ROUND_UP(beg + 1) - 1 + d_shift; DBUG_ASSERT(to < dec->buf + dec->len); DBUG_ASSERT(barier - d_shift >= dec->buf); for(; to >= barier; to--) |