From b7633611611eeb5f14f8fd598afa687964e23f23 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 10 Feb 2019 21:48:25 +0100 Subject: [PATCH] patch 8.1.0886: compiler warning for NULL pointer and condition always true Problem: Compiler warning for adding to NULL pointer and a condition that is always true. Solution: Check for NULL pointer before adding. Remove useless "if". (Friedirch, closes #3913) --- src/dosinst.c | 9 +++++---- src/search.c | 18 +++++++----------- src/version.c | 2 ++ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/dosinst.c b/src/dosinst.c index 5b0559887..7025eb618 100644 --- a/src/dosinst.c +++ b/src/dosinst.c @@ -291,16 +291,17 @@ findoldfile(char **destination) { char *bp = *destination; size_t indir_l = strlen(installdir); - char *cp = bp + indir_l; + char *cp; char *tmpname; char *farname; /* * No action needed if exe not found or not in this directory. */ - if (bp == NULL - || strnicmp(bp, installdir, indir_l) != 0 - || strchr("/\\", *cp++) == NULL + if (bp == NULL || strnicmp(bp, installdir, indir_l) != 0) + return; + cp = bp + indir_l; + if (strchr("/\\", *cp++) == NULL || strchr(cp, '\\') != NULL || strchr(cp, '/') != NULL) return; diff --git a/src/search.c b/src/search.c index 4b3f8532a..df7067b08 100644 --- a/src/search.c +++ b/src/search.c @@ -4732,18 +4732,14 @@ current_search( VIsual_active = TRUE; VIsual_mode = 'v'; - if (VIsual_active) + redraw_curbuf_later(INVERTED); /* update the inversion */ + if (*p_sel == 'e') { - redraw_curbuf_later(INVERTED); /* update the inversion */ - if (*p_sel == 'e') - { - /* Correction for exclusive selection depends on the direction. */ - if (forward && LTOREQ_POS(VIsual, curwin->w_cursor)) - inc_cursor(); - else if (!forward && LTOREQ_POS(curwin->w_cursor, VIsual)) - inc(&VIsual); - } - + /* Correction for exclusive selection depends on the direction. */ + if (forward && LTOREQ_POS(VIsual, curwin->w_cursor)) + inc_cursor(); + else if (!forward && LTOREQ_POS(curwin->w_cursor, VIsual)) + inc(&VIsual); } #ifdef FEAT_FOLDING diff --git a/src/version.c b/src/version.c index 641d8020c..aa17e0afa 100644 --- a/src/version.c +++ b/src/version.c @@ -783,6 +783,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 886, /**/ 885, /**/ -- 2.50.1