IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

shada: Add more size_t casts

Browse Source 
As usual, GCC is overparanoid with -Wconversion.
This commit is contained in:
ZyX 2015-07-06 20:12:18 +03:00
parent 8663983cc4
commit 45ad810341
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/nvim/shada.c
View File

@ -1156,19 +1156,19 @@ static void shada_pack_entry(msgpack_packer *const packer,
const size_t map_size = (size_t) ( const size_t map_size = (size_t) (
1 // Search pattern is always present 1 // Search pattern is always present
// Following items default to true: // Following items default to true:
+ !entry.data.search_pattern.magic + (size_t) !entry.data.search_pattern.magic
+ !entry.data.search_pattern.is_last_used + (size_t) !entry.data.search_pattern.is_last_used
// Following items default to false: // Following items default to false:
+ entry.data.search_pattern.smartcase + (size_t) entry.data.search_pattern.smartcase
+ entry.data.search_pattern.has_line_offset + (size_t) entry.data.search_pattern.has_line_offset
+ entry.data.search_pattern.place_cursor_at_end + (size_t) entry.data.search_pattern.place_cursor_at_end
+ entry.data.search_pattern.is_substitute_pattern + (size_t) entry.data.search_pattern.is_substitute_pattern
// offset defaults to zero: // offset defaults to zero:
+ (entry.data.search_pattern.offset != 0) + (size_t) (entry.data.search_pattern.offset != 0)
// finally, additional data: // finally, additional data:
+ (entry.data.search_pattern.additional_data + (size_t) (entry.data.search_pattern.additional_data
? entry.data.search_pattern.additional_data->size ? entry.data.search_pattern.additional_data->size
: 0) : 0)
); );
msgpack_pack_map(spacker, map_size); msgpack_pack_map(spacker, map_size);
PACK_STATIC_STR("pat"); PACK_STATIC_STR("pat");
@ -1211,17 +1211,17 @@ static void shada_pack_entry(msgpack_packer *const packer,
const size_t map_size = (size_t) ( const size_t map_size = (size_t) (
1 // File name 1 // File name
// Line: defaults to 1 // Line: defaults to 1
+ (entry.data.filemark.mark.lnum != 1) + (size_t) (entry.data.filemark.mark.lnum != 1)
// Column: defaults to zero: // Column: defaults to zero:
+ (entry.data.filemark.mark.col != 0) + (size_t) (entry.data.filemark.mark.col != 0)
// Mark name: defaults to '"' // Mark name: defaults to '"'
+ (entry.type != kSDItemJump + (size_t) (entry.type != kSDItemJump
&& entry.type != kSDItemChange && entry.type != kSDItemChange
&& entry.data.filemark.name != '"') && entry.data.filemark.name != '"')
// Additional entries, if any: // Additional entries, if any:
+ (entry.data.filemark.additional_data == NULL + (size_t) (entry.data.filemark.additional_data == NULL
? 0 ? 0
: entry.data.filemark.additional_data->size) : entry.data.filemark.additional_data->size)
); );
msgpack_pack_map(spacker, map_size); msgpack_pack_map(spacker, map_size);
PACK_STATIC_STR("file"); PACK_STATIC_STR("file");
@ -1255,13 +1255,13 @@ static void shada_pack_entry(msgpack_packer *const packer,
const size_t map_size = (size_t) ( const size_t map_size = (size_t) (
2 // Register contents and name 2 // Register contents and name
// Register type: defaults to MCHAR // Register type: defaults to MCHAR
+ (entry.data.reg.type != MCHAR) + (size_t) (entry.data.reg.type != MCHAR)
// Register width: defaults to zero // Register width: defaults to zero
+ (entry.data.reg.width != 0) + (size_t) (entry.data.reg.width != 0)
// Additional entries, if any: // Additional entries, if any:
+ (entry.data.reg.additional_data == NULL + (size_t) (entry.data.reg.additional_data == NULL
? 0 ? 0
: entry.data.reg.additional_data->size) : entry.data.reg.additional_data->size)
); );
msgpack_pack_map(spacker, map_size); msgpack_pack_map(spacker, map_size);
PACK_STATIC_STR("contents"); PACK_STATIC_STR("contents");
@ -1297,13 +1297,14 @@ static void shada_pack_entry(msgpack_packer *const packer,
const size_t map_size = (size_t) ( const size_t map_size = (size_t) (
1 // Buffer name 1 // Buffer name
// Line number: defaults to 1 // Line number: defaults to 1
+ (entry.data.buffer_list.buffers[i].pos.lnum != 1) + (size_t) (entry.data.buffer_list.buffers[i].pos.lnum != 1)
// Column number: defaults to 0 // Column number: defaults to 0
+ (entry.data.buffer_list.buffers[i].pos.col != 0) + (size_t) (entry.data.buffer_list.buffers[i].pos.col != 0)
// Additional entries, if any: // Additional entries, if any:
+ (entry.data.buffer_list.buffers[i].additional_data == NULL + (size_t) (
? 0 entry.data.buffer_list.buffers[i].additional_data == NULL
: entry.data.buffer_list.buffers[i].additional_data->size) ? 0
: entry.data.buffer_list.buffers[i].additional_data->size)
); );
msgpack_pack_map(spacker, map_size); msgpack_pack_map(spacker, map_size);
PACK_STATIC_STR("file"); PACK_STATIC_STR("file");