Merge pull request #280 from sjmulder/pr/sign-compare

Fix sign conversion and comparison warnings
This commit is contained in:
Mischievous Meerkat 2019-06-13 05:22:31 +05:30 committed by GitHub
commit 444cf4b9ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -766,11 +766,12 @@ static void appendfpath(const char *path, const size_t len)
} }
/* Write selected file paths to fd, linefeed separated */ /* Write selected file paths to fd, linefeed separated */
static ssize_t selectiontofd(int fd, uint *pcount) static size_t selectiontofd(int fd, uint *pcount)
{ {
uint lastpos, count = 0; uint lastpos, count = 0;
char *pbuf = pcopybuf; char *pbuf = pcopybuf;
ssize_t pos = 0, len, r; size_t pos = 0, len;
ssize_t r;
if (pcount) if (pcount)
*pcount = 0; *pcount = 0;
@ -785,7 +786,7 @@ static ssize_t selectiontofd(int fd, uint *pcount)
pos += len; pos += len;
r = write(fd, pbuf, len); r = write(fd, pbuf, len);
if (r != len) if (r != (ssize_t)len)
return pos; return pos;
if (pos <= lastpos) { if (pos <= lastpos) {
@ -806,7 +807,7 @@ static ssize_t selectiontofd(int fd, uint *pcount)
static void showcplist(void) static void showcplist(void)
{ {
int fd; int fd;
ssize_t pos; size_t pos;
if (!copybufpos) if (!copybufpos)
return; return;
@ -1938,7 +1939,7 @@ static int xlink(char *suffix, char *path, char *buf, int *presel, int type)
{ {
int count = 0; int count = 0;
char *pbuf = pcopybuf, *fname; char *pbuf = pcopybuf, *fname;
ssize_t pos = 0, len, r; size_t pos = 0, len, r;
int (*link_fn)(const char *, const char *) = NULL; int (*link_fn)(const char *, const char *) = NULL;
/* Check if selection is empty */ /* Check if selection is empty */