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: Fix GCC -Wconversion warnings in srni_flags definitions

Browse Source
This commit is contained in:
ZyX 2015-08-06 23:01:28 +03:00
parent 278de872f7
commit 82934e8797
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/nvim/shada.c
View File

@ -1099,25 +1099,26 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
&& (force || oldfiles_list == NULL && (force || oldfiles_list == NULL
|| oldfiles_list->lv_len == 0)); || oldfiles_list->lv_len == 0));
const bool want_marks = flags & kShaDaWantMarks; const bool want_marks = flags & kShaDaWantMarks;
const unsigned srni_flags = ((flags & kShaDaWantInfo const unsigned srni_flags = (unsigned) (
? (kSDReadUndisableableData (flags & kShaDaWantInfo
| kSDReadRegisters ? (kSDReadUndisableableData
| kSDReadGlobalMarks | kSDReadRegisters
| (p_hi ? kSDReadHistory : 0) | kSDReadGlobalMarks
| (find_shada_parameter('!') != NULL | (p_hi ? kSDReadHistory : 0)
? kSDReadVariables | (find_shada_parameter('!') != NULL
: 0) ? kSDReadVariables
| (find_shada_parameter('%') != NULL : 0)
&& ARGCOUNT == 0 | (find_shada_parameter('%') != NULL
? kSDReadBufferList && ARGCOUNT == 0
: 0)) ? kSDReadBufferList
: 0) : 0))
| (want_marks && get_shada_parameter('\'') > 0 : 0)
? kSDReadLocalMarks | kSDReadChanges | (want_marks && get_shada_parameter('\'') > 0
: 0) ? kSDReadLocalMarks | kSDReadChanges
| (get_old_files : 0)
? kSDReadLocalMarks | (get_old_files
: 0)); ? kSDReadLocalMarks
: 0));
if (srni_flags == 0) { if (srni_flags == 0) {
// Nothing to do. // Nothing to do.
return; return;
@ -2039,7 +2040,7 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
} }
} }
const unsigned srni_flags = ( const unsigned srni_flags = (unsigned) (
kSDReadUndisableableData kSDReadUndisableableData
| kSDReadUnknown | kSDReadUnknown
| (dump_history ? kSDReadHistory : 0) | (dump_history ? kSDReadHistory : 0)