Mercurial > vim
changeset 28966:fc7070c42d23 v8.2.5005
patch 8.2.5005: compiler warning for uninitialized variable
Commit: https://github.com/vim/vim/commit/5b529230f144028b67ed1d59207af098c18a1858
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 22 21:53:26 2022 +0100
patch 8.2.5005: compiler warning for uninitialized variable
Problem: Compiler warning for uninitialized variable. (John Marriott)
Solution: Initialize the pointer to NULL.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 22 May 2022 23:00:02 +0200 |
parents | 28d752b64734 |
children | 13d66390ef26 |
files | src/version.c src/vim9expr.c |
diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5005, +/**/ 5004, /**/ 5003,
--- a/src/vim9expr.c +++ b/src/vim9expr.c @@ -2635,8 +2635,6 @@ compile_expr5(char_u **arg, cctx_T *cctx char_u *next; int len = 2; int ppconst_used = ppconst->pp_used; - typval_T *tv1; - typval_T *tv2; isn_T *isn; // get the first variable @@ -2662,8 +2660,7 @@ compile_expr5(char_u **arg, cctx_T *cctx // Handle a bitwise left or right shift operator if (ppconst->pp_used == ppconst_used + 1) { - tv1 = &ppconst->pp_tv[ppconst->pp_used - 1]; - if (tv1->v_type != VAR_NUMBER) + if (ppconst->pp_tv[ppconst->pp_used - 1].v_type != VAR_NUMBER) { // left operand should be a number emsg(_(e_bitshift_ops_must_be_number)); @@ -2702,8 +2699,10 @@ compile_expr5(char_u **arg, cctx_T *cctx if (ppconst->pp_used == ppconst_used + 2) { + typval_T *tv1 = &ppconst->pp_tv[ppconst->pp_used - 2]; + typval_T *tv2 = &ppconst->pp_tv[ppconst->pp_used - 1]; + // Both sides are a constant, compute the result now. - tv2 = &ppconst->pp_tv[ppconst->pp_used - 1]; if (tv2->v_type != VAR_NUMBER || tv2->vval.v_number < 0) { // right operand should be a positive number @@ -2825,7 +2824,7 @@ compile_expr4(char_u **arg, cctx_T *cctx if (ppconst->pp_used == ppconst_used + 2) { - typval_T * tv1 = &ppconst->pp_tv[ppconst->pp_used - 2]; + typval_T *tv1 = &ppconst->pp_tv[ppconst->pp_used - 2]; typval_T *tv2 = &ppconst->pp_tv[ppconst->pp_used - 1]; int ret;