thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0381: variable declaration not at start of block

Browse Source 
Problem:    Variable declaration not at start of block.
Solution:   Fix line ordering.
This commit is contained in:
Bram Moolenaar
2018-09-13 17:32:07 +02:00
parent 32d19c1820
commit 5c6f574bd1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -794,6 +794,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 */
/**/
381,
/**/ /**/
380, 380,
/**/ /**/

9
src/xdiff/xpatience.c
View File

@@ -209,11 +209,6 @@ static struct entry *find_longest_common_sequence(struct hashmap *map)
struct entry **sequence = (struct entry **)xdl_malloc(map->nr * sizeof(struct entry *)); struct entry **sequence = (struct entry **)xdl_malloc(map->nr * sizeof(struct entry *));
int longest = 0, i; int longest = 0, i;
struct entry *entry; struct entry *entry;
/* Added to silence Coverity. */
if (sequence == NULL)
return map->first;
/* /*
* If not -1, this entry in sequence must never be overridden. * If not -1, this entry in sequence must never be overridden.
* Therefore, overriding entries before this has no effect, so * Therefore, overriding entries before this has no effect, so
@@ -221,6 +216,10 @@ static struct entry *find_longest_common_sequence(struct hashmap *map)
*/ */
int anchor_i = -1; int anchor_i = -1;
/* Added to silence Coverity. */
if (sequence == NULL)
return map->first;
for (entry = map->first; entry; entry = entry->next) { for (entry = map->first; entry; entry = entry->next) {
if (!entry->line2 || entry->line2 == NON_UNIQUE) if (!entry->line2 || entry->line2 == NON_UNIQUE)
continue; continue;