mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 15:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: the long goodbye

Browse Source 
long is 32 bits on windows, while it is 64 bits on other architectures.
This makes the type suboptimal for a codebase meant to be
cross-platform. Replace it with more appropriate integer types.
This commit is contained in:
dundargoc
2023-09-29 14:58:48 +02:00
committed by dundargoc
parent dacd34364f
commit 8e932480f6
52 changed files with 280 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/nvim/diff.c
View File

@@ -82,7 +82,7 @@ static bool diff_need_update = false; // ex_diffupdate needs to be called
#define ALL_WHITE_DIFF (DIFF_IWHITE | DIFF_IWHITEALL | DIFF_IWHITEEOL)
static int diff_flags = DIFF_INTERNAL | DIFF_FILLER | DIFF_CLOSE_OFF;
static long diff_algorithm = 0;
static int diff_algorithm = 0;
static int linematch_lines = 0;
#define LBUFLEN 50 // length of line in diff file
@@ -3402,7 +3402,7 @@ linenr_T diff_lnum_win(linenr_T lnum, win_T *wp)
///
static int parse_diff_ed(char *line, diffhunk_T *hunk)
{
long l1, l2;
int l1, l2;
// The line must be one of three formats:
// change: {first}[,{last}]c{first}[,{last}]
@@ -3412,7 +3412,7 @@ static int parse_diff_ed(char *line, diffhunk_T *hunk)
linenr_T f1 = getdigits_int32(&p, true, 0);
if (*p == ',') {
p++;
l1 = getdigits_long(&p, true, 0);
l1 = getdigits_int(&p, true, 0);
} else {
l1 = f1;
}
@@ -3420,10 +3420,10 @@ static int parse_diff_ed(char *line, diffhunk_T *hunk)
return FAIL; // invalid diff format
}
int difftype = (uint8_t)(*p++);
long f2 = getdigits_long(&p, true, 0);
int f2 = getdigits_int(&p, true, 0);
if (*p == ',') {
p++;
l2 = getdigits_long(&p, true, 0);
l2 = getdigits_int(&p, true, 0);
} else {
l2 = f2;
}
@@ -3448,31 +3448,29 @@ static int parse_diff_ed(char *line, diffhunk_T *hunk)
return OK;
}
///
/// Parses unified diff with zero(!) context lines.
/// Return FAIL if there is no diff information in "line".
///
static int parse_diff_unified(char *line, diffhunk_T *hunk)
{
// Parse unified diff hunk header:
// @@ -oldline,oldcount +newline,newcount @@
char *p = line;
if (*p++ == '@' && *p++ == '@' && *p++ == ' ' && *p++ == '-') {
long oldcount;
long newline;
long newcount;
long oldline = getdigits_long(&p, true, 0);
int oldcount;
linenr_T newline;
int newcount;
linenr_T oldline = getdigits_int32(&p, true, 0);
if (*p == ',') {
p++;
oldcount = getdigits_long(&p, true, 0);
oldcount = getdigits_int(&p, true, 0);
} else {
oldcount = 1;
}
if (*p++ == ' ' && *p++ == '+') {
newline = getdigits_long(&p, true, 0);
newline = getdigits_int(&p, true, 0);
if (*p == ',') {
p++;
newcount = getdigits_long(&p, true, 0);
newcount = getdigits_int(&p, true, 0);
} else {
newcount = 1;
}
@@ -3490,9 +3488,9 @@ static int parse_diff_unified(char *line, diffhunk_T *hunk)
newline = 1;
}
hunk->lnum_orig = (linenr_T)oldline;
hunk->lnum_orig = oldline;
hunk->count_orig = oldcount;
hunk->lnum_new = (linenr_T)newline;
hunk->lnum_new = newline;
hunk->count_new = newcount;
return OK;
@@ -3501,11 +3499,9 @@ static int parse_diff_unified(char *line, diffhunk_T *hunk)
return FAIL;
}
///
/// Callback function for the xdl_diff() function.
/// Stores the diff output in a grow array.
///
static int xdiff_out(long start_a, long count_a, long start_b, long count_b, void *priv)
static int xdiff_out(int start_a, int count_a, int start_b, int count_b, void *priv)
{
diffout_T *dout = (diffout_T *)priv;
GA_APPEND(diffhunk_T, &(dout->dout_ga), ((diffhunk_T){