summaryrefslogtreecommitdiff
path: root/sql/mf_iocache_encr.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-10-03 19:43:43 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-10-03 19:43:43 +0000
commit8d413c32dc50469d65185d6252014ef29b7b42c2 (patch)
tree707b0d82b49713267be24e9a1aafb4c6e8acdb18 /sql/mf_iocache_encr.cc
parent4732767981442cf2522088471ba211ecf9f542a2 (diff)
downloadmariadb-git-8d413c32dc50469d65185d6252014ef29b7b42c2.tar.gz
Fix several truncation and formatting warnings.
Diffstat (limited to 'sql/mf_iocache_encr.cc')
-rw-r--r--sql/mf_iocache_encr.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mf_iocache_encr.cc b/sql/mf_iocache_encr.cc
index 434fcd1f435..546e0fe03a0 100644
--- a/sql/mf_iocache_encr.cc
+++ b/sql/mf_iocache_encr.cc
@@ -92,7 +92,7 @@ static int my_b_encr_read(IO_CACHE *info, uchar *Buffer, size_t Count)
DBUG_RETURN(1);
}
- elength= wlength - (ebuffer - wbuffer);
+ elength= wlength - (uint)(ebuffer - wbuffer);
set_iv(iv, pos_in_file, crypt_data->inbuf_counter);
if (encryption_crypt(ebuffer, elength, info->buffer, &length,
@@ -184,7 +184,7 @@ static int my_b_encr_write(IO_CACHE *info, const uchar *Buffer, size_t Count)
my_errno= 1;
DBUG_RETURN(info->error= -1);
}
- wlength= elength + ebuffer - wbuffer;
+ wlength= elength + (uint)(ebuffer - wbuffer);
if (length == info->buffer_length)
{