aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorEliseo Martínez <eliseomarmol@gmail.com>2015-03-21 20:34:35 +0100
committerEliseo Martínez <eliseomarmol@gmail.com>2015-04-07 12:56:28 +0200
commitfa2fcf13aaf67919fdcfb9c736b883aba73c3cc2 (patch)
tree5d0b585e88afc41294a7d41032071098b2a1965b /src/nvim/option.c
parentc5d7fa615d5c091345ebe2e3472404ef04feda2e (diff)
downloadrneovim-fa2fcf13aaf67919fdcfb9c736b883aba73c3cc2.tar.gz
rneovim-fa2fcf13aaf67919fdcfb9c736b883aba73c3cc2.tar.bz2
rneovim-fa2fcf13aaf67919fdcfb9c736b883aba73c3cc2.zip
Enable -Wconversion: fold.c.
Refactor summary: - foldinfo_T.fi_lnum: int --> linenr_T Reorder field for optimal packing. - foldAddMarker(..., markerlen): int --> size_t * foldstartmarkerlen: int --> size_t - foldDelMarker(..., markerlen): int --> size_t * foldendmarkerlen: int --> size_t Helped-by: oni-link <knil.ino@gmail.com>
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 2d016d8350..929b96a3f8 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -7653,18 +7653,22 @@ int check_ff_value(char_u *p)
* Return the effective shiftwidth value for current buffer, using the
* 'tabstop' value when 'shiftwidth' is zero.
*/
-long get_sw_value(buf_T *buf)
+int get_sw_value(buf_T *buf)
{
- return buf->b_p_sw ? buf->b_p_sw : buf->b_p_ts;
+ long result = buf->b_p_sw ? buf->b_p_sw : buf->b_p_ts;
+ assert(result >= 0 && result <= INT_MAX);
+ return (int)result;
}
/*
* Return the effective softtabstop value for the current buffer, using the
* 'tabstop' value when 'softtabstop' is negative.
*/
-long get_sts_value(void)
+int get_sts_value(void)
{
- return curbuf->b_p_sts < 0 ? get_sw_value(curbuf) : curbuf->b_p_sts;
+ long result = curbuf->b_p_sts < 0 ? get_sw_value(curbuf) : curbuf->b_p_sts;
+ assert(result >= 0 && result <= INT_MAX);
+ return (int)result;
}
/*