mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-07 00:50:50 +00:00
libdiff: Fix type issues.
MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D45077
This commit is contained in:
parent
ea2d874cca
commit
0549218b43
|
@ -54,7 +54,8 @@ diff_chunk_type(const struct diff_chunk *chunk)
|
||||||
static int
|
static int
|
||||||
read_at(FILE *f, off_t at_pos, unsigned char *buf, size_t len)
|
read_at(FILE *f, off_t at_pos, unsigned char *buf, size_t len)
|
||||||
{
|
{
|
||||||
int r;
|
ssize_t r;
|
||||||
|
|
||||||
if (fseeko(f, at_pos, SEEK_SET) == -1)
|
if (fseeko(f, at_pos, SEEK_SET) == -1)
|
||||||
return errno;
|
return errno;
|
||||||
r = fread(buf, sizeof(char), len, f);
|
r = fread(buf, sizeof(char), len, f);
|
||||||
|
@ -153,7 +154,7 @@ diff_atom_cmp(int *cmp,
|
||||||
unsigned char buf_left[chunksz], buf_right[chunksz];
|
unsigned char buf_left[chunksz], buf_right[chunksz];
|
||||||
const uint8_t *p_left, *p_right;
|
const uint8_t *p_left, *p_right;
|
||||||
off_t n_left, n_right;
|
off_t n_left, n_right;
|
||||||
ssize_t r;
|
int r;
|
||||||
|
|
||||||
if (!remain_right) {
|
if (!remain_right) {
|
||||||
*cmp = 1;
|
*cmp = 1;
|
||||||
|
|
Loading…
Reference in a new issue