0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

patch 8.2.5005: compiler warning for uninitialized variable

Problem:    Compiler warning for uninitialized variable. (John Marriott)
Solution:   Initialize the pointer to NULL.
This commit is contained in:
Bram Moolenaar
2022-05-22 21:53:26 +01:00
parent 338bf58eba
commit 5b529230f1
2 changed files with 7 additions and 6 deletions

View File

@@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5005,
/**/ /**/
5004, 5004,
/**/ /**/

View File

@@ -2635,8 +2635,6 @@ compile_expr5(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
char_u *next; char_u *next;
int len = 2; int len = 2;
int ppconst_used = ppconst->pp_used; int ppconst_used = ppconst->pp_used;
typval_T *tv1;
typval_T *tv2;
isn_T *isn; isn_T *isn;
// get the first variable // get the first variable
@@ -2662,8 +2660,7 @@ compile_expr5(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
// Handle a bitwise left or right shift operator // Handle a bitwise left or right shift operator
if (ppconst->pp_used == ppconst_used + 1) if (ppconst->pp_used == ppconst_used + 1)
{ {
tv1 = &ppconst->pp_tv[ppconst->pp_used - 1]; if (ppconst->pp_tv[ppconst->pp_used - 1].v_type != VAR_NUMBER)
if (tv1->v_type != VAR_NUMBER)
{ {
// left operand should be a number // left operand should be a number
emsg(_(e_bitshift_ops_must_be_number)); emsg(_(e_bitshift_ops_must_be_number));
@@ -2702,8 +2699,10 @@ compile_expr5(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
if (ppconst->pp_used == ppconst_used + 2) 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. // 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) if (tv2->v_type != VAR_NUMBER || tv2->vval.v_number < 0)
{ {
// right operand should be a positive number // right operand should be a positive number
@@ -2825,7 +2824,7 @@ compile_expr4(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
if (ppconst->pp_used == ppconst_used + 2) 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]; typval_T *tv2 = &ppconst->pp_tv[ppconst->pp_used - 1];
int ret; int ret;