diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 12:55:58 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-06 12:55:58 +0000 |
| commit | 6c279ad6a71c63cb595fde7c951aadb31c3dbebc (patch) | |
| tree | 3603f88e1b3bd1e622edb182cccd882dd31ddc8a /storage/maria/ma_loghandler.c | |
| parent | f271100836d8a91a775894ec36b869a66a3145e5 (diff) | |
| download | mariadb-git-6c279ad6a71c63cb595fde7c951aadb31c3dbebc.tar.gz | |
MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from 'size_t' to 'type', possible loss of data)
Handle string length as size_t, consistently (almost always:))
Change function prototypes to accept size_t, where in the past
ulong or uint were used. change local/member variables to size_t
when appropriate.
This fix excludes rocksdb, spider,spider, sphinx and connect for now.
Diffstat (limited to 'storage/maria/ma_loghandler.c')
| -rw-r--r-- | storage/maria/ma_loghandler.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 778a98f7cc9..c81c7735df5 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -5373,7 +5373,7 @@ static void translog_relative_LSN_encode(struct st_translog_parts *parts, /* collect all LSN(s) in one chunk if it (they) is (are) divided */ if (part->length < lsns_len) { - uint copied= part->length; + size_t copied= part->length; LEX_CUSTRING *next_part; DBUG_PRINT("info", ("Using buffer:%p", compressed_LSNs)); memcpy(buffer, part->str, part->length); @@ -5394,7 +5394,7 @@ static void translog_relative_LSN_encode(struct st_translog_parts *parts, } else { - uint len= lsns_len - copied; + size_t len= lsns_len - copied; memcpy(buffer + copied, next_part->str, len); copied= lsns_len; next_part->str+= len; @@ -5430,11 +5430,12 @@ static void translog_relative_LSN_encode(struct st_translog_parts *parts, ref= lsn_korr(src_ptr); dst_ptr= translog_put_LSN_diff(base_lsn, ref, dst_ptr); } - part->length= (uint)((compressed_LSNs + + part->length= (size_t)((compressed_LSNs + (MAX_NUMBER_OF_LSNS_PER_RECORD * COMPRESSED_LSN_MAX_STORE_SIZE)) - dst_ptr); - parts->record_length-= (economy= lsns_len - part->length); + economy= lsns_len - (uint)part->length; + parts->record_length-= economy; DBUG_PRINT("info", ("new length of LSNs: %lu economy: %d", (ulong)part->length, economy)); parts->total_record_length-= economy; @@ -6302,7 +6303,7 @@ my_bool translog_write_record(LSN *lsn, #ifndef DBUG_OFF { uint i; - uint len= 0; + size_t len= 0; #ifdef HAVE_valgrind ha_checksum checksum= 0; #endif |