patch 9.0.2138: Overflow logic requires long long

Problem:  Overflow logic requires long long
Solution: Define vimlong_T data type to make life easier
          for porters

closes: #13598

Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/cindent.c b/src/cindent.c
index a9b813f6d80ce46f44b00b17e52cebfaf23114af..62894228b16d4c65dceb5e6c959dc1bd99779904 100644 (file)
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -1730,7 +1730,7 @@ parse_cino(buf_T *buf)
     char_u     *p;
     char_u     *l;
     char_u     *digits;
-    long long  n;
+    vimlong_T  n;
     int                divider;
     int                fraction = 0;
     int                sw;
@@ -1902,7 +1902,7 @@ parse_cino(buf_T *buf)
            {
                n *= sw;
                if (divider)
-                   n += ((long long)sw * fraction + divider / 2) / divider;
+                   n += ((vimlong_T)sw * fraction + divider / 2) / divider;
            }
            ++p;
        }

diff --git a/src/misc1.c b/src/misc1.c
index e83ec66f7068820e836b03b5dd226f45b031b280..bf70e3847885ce31d4d3c3c1ef719c2d6114ce87 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2843,7 +2843,7 @@ vim_append_digit_long(long *value, int digit)
 
 // Return something that fits into an int.
     int
-trim_to_int(long long x)
+trim_to_int(vimlong_T x)
 {
     return x > INT_MAX ? INT_MAX : x < INT_MIN ? INT_MIN : x;
 }

diff --git a/src/ops.c b/src/ops.c
index e30fea7e063ac8cb6713754ea4fa270d2bd5fc15..46101a43597a72b59a97348e84effb45b6264a82 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -229,11 +229,11 @@ shift_line(
     int        amount,
     int call_changed_bytes)    // call changed_bytes()
 {
-    long long  count;
+    vimlong_T  count;
     int                i, j;
     int                sw_val = trim_to_int(get_sw_value_indent(curbuf));
 
-    count = (long long)get_indent();   // get current indent
+    count = get_indent();      // get current indent
 
     if (round)                 // round off indent
     {
@@ -249,18 +249,18 @@ shift_line(
        }
        else
            i += amount;
-       count = (long long)i * (long long)sw_val;
+       count = (vimlong_T)i * (vimlong_T)sw_val;
     }
     else               // original vi indent
     {
        if (left)
        {
-           count -= (long long)sw_val * (long long)amount;
+           count -= (vimlong_T)sw_val * (vimlong_T)amount;
            if (count < 0)
                count = 0;
        }
        else
-           count += (long long)sw_val * (long long)amount;
+           count += (vimlong_T)sw_val * (vimlong_T)amount;
     }
 
     // Set new indent

diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro
index c602b0ebeb84eca16440210ca30a013a597d8483..e76bf75d0feea84cc2626d4592182de1f197c051 100644 (file)
--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@@ -55,5 +55,5 @@ void restore_v_event(dict_T *v_event, save_v_event_T *sve);
 void may_trigger_modechanged(void);
 int vim_append_digit_int(int *value, int digit);
 int vim_append_digit_long(long *value, int digit);
-int trim_to_int(long long x);
+int trim_to_int(vimlong_T x);
 /* vim: set ft=c : */

diff --git a/src/version.c b/src/version.c
index 1476f981bd7a35e4bb08b6fddfe51345cff32b1b..81128a3de021e645ed5864a8ea4faa7a3a3c7229 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2138,
 /**/
     2137,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 6fb897822429fbb56fe9115225e1bea9e55266d1..7d0d128ae27fa70c55c80f4e87ff62f40ca8687b 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -435,6 +435,12 @@ typedef unsigned short sattr_T;
  */
 typedef unsigned int u8char_T; // int is 32 bits or more
 
+/*
+ * The vimlong_T has sizeof(vimlong_T) >= 2 * sizeof(int).
+ * One use is simple handling of overflow in int calculations.
+ */
+typedef long long vimlong_T;
+
 #ifndef UNIX               // For Unix this is included in os_unix.h
 # include <stdio.h>
 # include <ctype.h>